-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5061 from dnnsoftware/v9.11.0/dependabot/github_a…
…ctions/peter-evans/create-pull-request-4-f6c8203d43050c7ee54fbde20da98bbd8a9a1c33 v9.11.0 Bump peter-evans/create-pull-request from 3.14.0 to 4
- Loading branch information
Showing
7 changed files
with
161 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,79 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information | ||
| namespace DotNetNuke.UI.Skins.Controls | ||
| { | ||
| using System; | ||
| namespace DotNetNuke.UI.Skins.Controls | ||
| { | ||
| using System; | ||
|
|
||
| using DotNetNuke.Abstractions; | ||
| using DotNetNuke.Common; | ||
| using DotNetNuke.Common.Utilities; | ||
| using DotNetNuke.Services.Exceptions; | ||
| using DotNetNuke.Services.Localization; | ||
| using DotNetNuke.Abstractions; | ||
| using DotNetNuke.Common; | ||
| using DotNetNuke.Common.Utilities; | ||
| using DotNetNuke.Services.Exceptions; | ||
| using DotNetNuke.Services.Localization; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
|
|
||
| /// ----------------------------------------------------------------------------- | ||
| /// <summary></summary> | ||
| /// <returns></returns> | ||
| /// <remarks></remarks> | ||
| /// ----------------------------------------------------------------------------- | ||
| public partial class Privacy : SkinObjectBase | ||
| { | ||
| private const string MyFileName = "Privacy.ascx"; | ||
| private readonly INavigationManager _navigationManager; | ||
|
|
||
| public Privacy() | ||
| { | ||
| this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>(); | ||
| } | ||
|
|
||
| public string Text { get; set; } | ||
|
|
||
| public string CssClass { get; set; } | ||
|
|
||
| protected override void OnInit(EventArgs e) | ||
| { | ||
| base.OnInit(e); | ||
|
|
||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| protected override void OnLoad(EventArgs e) | ||
| { | ||
| base.OnLoad(e); | ||
| try | ||
| { | ||
| if (!string.IsNullOrEmpty(this.CssClass)) | ||
| { | ||
| this.hypPrivacy.CssClass = this.CssClass; | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(this.Text)) | ||
| { | ||
| this.hypPrivacy.Text = this.Text; | ||
| } | ||
| else | ||
| { | ||
| this.hypPrivacy.Text = Localization.GetString("Privacy", Localization.GetResourceFile(this, MyFileName)); | ||
| } | ||
|
|
||
| this.hypPrivacy.NavigateUrl = this.PortalSettings.PrivacyTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Privacy") : this._navigationManager.NavigateURL(this.PortalSettings.PrivacyTabId); | ||
| this.hypPrivacy.Attributes["rel"] = "nofollow"; | ||
| } | ||
| catch (Exception exc) | ||
| { | ||
| Exceptions.ProcessModuleLoadException(this, exc); | ||
| } | ||
| } | ||
|
|
||
| private void InitializeComponent() | ||
| { | ||
| } | ||
| } | ||
| } | ||
| /// ----------------------------------------------------------------------------- | ||
| /// <summary></summary> | ||
| /// <returns></returns> | ||
| /// <remarks></remarks> | ||
| /// ----------------------------------------------------------------------------- | ||
| public partial class Privacy : SkinObjectBase | ||
| { | ||
| private const string MyFileName = "Privacy.ascx"; | ||
| private readonly INavigationManager _navigationManager; | ||
|
|
||
| public Privacy() | ||
| { | ||
| this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>(); | ||
| } | ||
|
|
||
| public string Text { get; set; } | ||
|
|
||
| public string CssClass { get; set; } | ||
|
|
||
| public string Rel { get; set; } = "nofollow"; | ||
|
|
||
| protected override void OnInit(EventArgs e) | ||
| { | ||
| base.OnInit(e); | ||
|
|
||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| protected override void OnLoad(EventArgs e) | ||
| { | ||
| base.OnLoad(e); | ||
| try | ||
| { | ||
| if (!string.IsNullOrEmpty(this.CssClass)) | ||
| { | ||
| this.hypPrivacy.CssClass = this.CssClass; | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(this.Text)) | ||
| { | ||
| this.hypPrivacy.Text = this.Text; | ||
| } | ||
| else | ||
| { | ||
| this.hypPrivacy.Text = Localization.GetString("Privacy", Localization.GetResourceFile(this, MyFileName)); | ||
| } | ||
|
|
||
| this.hypPrivacy.NavigateUrl = this.PortalSettings.PrivacyTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Privacy") : this._navigationManager.NavigateURL(this.PortalSettings.PrivacyTabId); | ||
| if (!string.IsNullOrWhiteSpace(this.Rel)) | ||
| { | ||
| this.hypPrivacy.Attributes["rel"] = this.Rel; | ||
| } | ||
|
|
||
| } | ||
| catch (Exception exc) | ||
| { | ||
| Exceptions.ProcessModuleLoadException(this, exc); | ||
| } | ||
| } | ||
|
|
||
| private void InitializeComponent() | ||
| { | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,79 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information | ||
| namespace DotNetNuke.UI.Skins.Controls | ||
| { | ||
| using System; | ||
| namespace DotNetNuke.UI.Skins.Controls | ||
| { | ||
| using System; | ||
|
|
||
| using DotNetNuke.Abstractions; | ||
| using DotNetNuke.Common; | ||
| using DotNetNuke.Common.Utilities; | ||
| using DotNetNuke.Services.Exceptions; | ||
| using DotNetNuke.Services.Localization; | ||
| using DotNetNuke.Abstractions; | ||
| using DotNetNuke.Common; | ||
| using DotNetNuke.Common.Utilities; | ||
| using DotNetNuke.Services.Exceptions; | ||
| using DotNetNuke.Services.Localization; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
|
|
||
| /// ----------------------------------------------------------------------------- | ||
| /// <summary></summary> | ||
| /// <returns></returns> | ||
| /// <remarks></remarks> | ||
| /// ----------------------------------------------------------------------------- | ||
| public partial class Terms : SkinObjectBase | ||
| { | ||
| private const string MyFileName = "Terms.ascx"; | ||
| private readonly INavigationManager _navigationManager; | ||
|
|
||
| public Terms() | ||
| { | ||
| this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>(); | ||
| } | ||
|
|
||
| public string Text { get; set; } | ||
|
|
||
| public string CssClass { get; set; } | ||
|
|
||
| protected override void OnInit(EventArgs e) | ||
| { | ||
| base.OnInit(e); | ||
|
|
||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| protected override void OnLoad(EventArgs e) | ||
| { | ||
| base.OnLoad(e); | ||
| try | ||
| { | ||
| if (!string.IsNullOrEmpty(this.CssClass)) | ||
| { | ||
| this.hypTerms.CssClass = this.CssClass; | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(this.Text)) | ||
| { | ||
| this.hypTerms.Text = this.Text; | ||
| } | ||
| else | ||
| { | ||
| this.hypTerms.Text = Localization.GetString("Terms", Localization.GetResourceFile(this, MyFileName)); | ||
| } | ||
|
|
||
| this.hypTerms.NavigateUrl = this.PortalSettings.TermsTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Terms") : this._navigationManager.NavigateURL(this.PortalSettings.TermsTabId); | ||
|
|
||
| this.hypTerms.Attributes["rel"] = "nofollow"; | ||
| } | ||
| catch (Exception exc) | ||
| { | ||
| Exceptions.ProcessModuleLoadException(this, exc); | ||
| } | ||
| } | ||
|
|
||
| private void InitializeComponent() | ||
| { | ||
| } | ||
| } | ||
| } | ||
| /// ----------------------------------------------------------------------------- | ||
| /// <summary></summary> | ||
| /// <returns></returns> | ||
| /// <remarks></remarks> | ||
| /// ----------------------------------------------------------------------------- | ||
| public partial class Terms : SkinObjectBase | ||
| { | ||
| private const string MyFileName = "Terms.ascx"; | ||
| private readonly INavigationManager _navigationManager; | ||
|
|
||
| public Terms() | ||
| { | ||
| this._navigationManager = Globals.DependencyProvider.GetRequiredService<INavigationManager>(); | ||
| } | ||
|
|
||
| public string Text { get; set; } | ||
|
|
||
| public string CssClass { get; set; } | ||
|
|
||
| public string Rel { get; set; } = "nofollow"; | ||
|
|
||
| protected override void OnInit(EventArgs e) | ||
| { | ||
| base.OnInit(e); | ||
|
|
||
| this.InitializeComponent(); | ||
| } | ||
|
|
||
| protected override void OnLoad(EventArgs e) | ||
| { | ||
| base.OnLoad(e); | ||
| try | ||
| { | ||
| if (!string.IsNullOrEmpty(this.CssClass)) | ||
| { | ||
| this.hypTerms.CssClass = this.CssClass; | ||
| } | ||
|
|
||
| if (!string.IsNullOrEmpty(this.Text)) | ||
| { | ||
| this.hypTerms.Text = this.Text; | ||
| } | ||
| else | ||
| { | ||
| this.hypTerms.Text = Localization.GetString("Terms", Localization.GetResourceFile(this, MyFileName)); | ||
| } | ||
|
|
||
| this.hypTerms.NavigateUrl = this.PortalSettings.TermsTabId == Null.NullInteger ? this._navigationManager.NavigateURL(this.PortalSettings.ActiveTab.TabID, "Terms") : this._navigationManager.NavigateURL(this.PortalSettings.TermsTabId); | ||
| if (!string.IsNullOrWhiteSpace(this.Rel)) | ||
| { | ||
| this.hypTerms.Attributes["rel"] = this.Rel; | ||
| } | ||
|
|
||
| } | ||
| catch (Exception exc) | ||
| { | ||
| Exceptions.ProcessModuleLoadException(this, exc); | ||
| } | ||
| } | ||
|
|
||
| private void InitializeComponent() | ||
| { | ||
| } | ||
| } | ||
| } |