diff --git a/R7.Epsilon/R7.Epsilon.development.yml b/R7.Epsilon/R7.Epsilon.development.yml index 6fc88053..bdb7e7ac 100644 --- a/R7.Epsilon/R7.Epsilon.development.yml +++ b/R7.Epsilon/R7.Epsilon.development.yml @@ -129,7 +129,7 @@ search-engines: permalink-formats: - - "/tabid/{tabid}{?language}" + - "/tabid/{tabid}{?ctl}{?mid}{?entryid}" - "/default.aspx?tabid={tabid}{?forumid}{?threadid}{?scope}" - "/linkclick.aspx?link={tabid}&portalid={portalid}" diff --git a/R7.Epsilon/Skins/Edit.ascx b/R7.Epsilon/Skins/Edit.ascx index 0baf0e49..aaa2ea49 100644 --- a/R7.Epsilon/Skins/Edit.ascx +++ b/R7.Epsilon/Skins/Edit.ascx @@ -8,7 +8,8 @@ <%@ Register TagPrefix="skin" TagName="END" Src="~/Portals/_default/Skins/R7.Epsilon/Blocks/End.ascx" %> <% Options.DisableSocialShare = true; -Options.DisablePageInfo = true; +Options.DisablePageTags = true; +Options.DisablePageAudit = true; %>
diff --git a/R7.Epsilon/Skins/EpsilonSkinOptions.cs b/R7.Epsilon/Skins/EpsilonSkinOptions.cs index c361a9a0..0571c45f 100644 --- a/R7.Epsilon/Skins/EpsilonSkinOptions.cs +++ b/R7.Epsilon/Skins/EpsilonSkinOptions.cs @@ -1,23 +1,4 @@ -// -// File: EpsilonSkinOptions.cs -// Project: R7.Epsilon -// -// Author: Roman M. Yagodin -// -// Copyright (c) 2019 Roman M. Yagodin, R7.Labs -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . +using System; namespace R7.Epsilon.Skins { @@ -29,8 +10,15 @@ public class EpsilonSkinOptions public bool DisableLogin { get; set; } + [Obsolete] public bool DisablePageInfo { get; set; } + public bool DisablePageTags { get; set; } + + public bool DisablePageAudit { get; set; } + + public bool DisablePermalinks { get; set; } + public bool DisableLazyAds { get; set; } public bool DisableRangy { get; set; } diff --git a/R7.Epsilon/Skins/ErrorSkin.ascx b/R7.Epsilon/Skins/ErrorSkin.ascx index 75a7403e..4c941267 100644 --- a/R7.Epsilon/Skins/ErrorSkin.ascx +++ b/R7.Epsilon/Skins/ErrorSkin.ascx @@ -10,7 +10,9 @@ Options.DisableSocialShare = true; Options.DisableBreadCrumb = true; Options.DisableLogin = true; -Options.DisablePageInfo = true; +Options.DisablePageTags = true; +Options.DisablePageAudit = true; +Options.DisablePermalinks = true; %>
diff --git a/R7.Epsilon/Skins/Home.ascx b/R7.Epsilon/Skins/Home.ascx index 44174699..8495eaae 100644 --- a/R7.Epsilon/Skins/Home.ascx +++ b/R7.Epsilon/Skins/Home.ascx @@ -8,7 +8,9 @@ <%@ Register TagPrefix="skin" TagName="END" Src="~/Portals/_default/Skins/R7.Epsilon/Blocks/End.ascx" %> <% Options.DisableBreadCrumb = true; -Options.DisablePageInfo = true; +Options.DisablePageTags = true; +Options.DisablePageAudit = true; +Options.DisablePermalinks = true; %>
diff --git a/R7.Epsilon/Skins/SkinObjects/PageInfo.ascx b/R7.Epsilon/Skins/SkinObjects/PageInfo.ascx index 6ef9e5c4..cadc2306 100644 --- a/R7.Epsilon/Skins/SkinObjects/PageInfo.ascx +++ b/R7.Epsilon/Skins/SkinObjects/PageInfo.ascx @@ -1,30 +1,34 @@ <%@ Control Language="C#" AutoEventWireup="false" EnableViewState="false" Inherits="R7.Epsilon.Skins.SkinObjects.PageInfo" %> <%@ Register TagPrefix="dnn" TagName="TAGS" Src="~/Admin/Skins/Tags.ascx" %> -<% if (!Skin.Options.DisablePageInfo) { %> +<% if (!Skin.Options.DisablePageTags || !Skin.Options.DisablePageAudit || !Skin.Options.DisablePermalinks) { %>
- <% if (ActiveTab.Terms != null && ActiveTab.Terms.Count > 0) { %> + <% if (!Skin.Options.DisablePageTags && ActiveTab.Terms != null && ActiveTab.Terms.Count > 0) { %>

<% } %>
    -
  • - <%: T.GetString ("PublishedDate.Text") %> <%: PublishedOnDateString %> -
  • -
  • - <%: T.GetString ("LastModifiedDate.Text") %> <%: LastModifiedOnDateString %> -
  • -
  • - <%: LastContentModifiedByUserName %> -
  • -
  • - -
  • + <% if (!Skin.Options.DisablePageAudit) { %> +
  • + <%: T.GetString ("PublishedDate.Text") %> <%: PublishedOnDateString %> +
  • +
  • + <%: T.GetString ("LastModifiedDate.Text") %> <%: LastModifiedOnDateString %> +
  • +
  • + <%: LastContentModifiedByUserName %> +
  • + <% } %> + <% if (!Skin.Options.DisablePermalinks) { %> +
  • + +
  • + <% } %>
<% } %>