Apply itemprop="copy" just once,

obsolete UseObrnadzorMicrodata config option
r7-labs · Mar 29, 2021 · 90e1a08 · 90e1a08
1 parent e23cfc3
commit 90e1a08
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/R7.Epsilon/Components/EpsilonPortalConfig.cs b/R7.Epsilon/Components/EpsilonPortalConfig.cs
@@ -51,6 +51,7 @@ public class EpsilonPortalConfig
 
         public bool DisablePageAudit { get; set; }
 
+        [Obsolete]
         public bool UseObrnadzorMicrodata { get; set; }
 
         public List<SocialGroupConfig> SocialGroups { get; set; } = new List<SocialGroupConfig> ();

diff --git a/R7.Epsilon/Skins/Blocks/Header.ascx b/R7.Epsilon/Skins/Blocks/Header.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="C#" AutoEventWireup="false" EnableViewState="false" Inherits="R7.Epsilon.Skins.SkinObjects.EpsilonSkinObjectBase" %>
-<%@ Import Namespace="DnnGlobals=DotNetNuke.Common.Globals" %>
 <%@ Register TagPrefix="dnn" TagName="LOGO" Src="~/Admin/Skins/Logo.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="USER" Src="~/Admin/Skins/User.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="LOGIN" Src="~/Admin/Skins/Login.ascx" %>
@@ -13,7 +12,7 @@
 <%@ Register TagPrefix="skin" TagName="CUSTOMCONTENT" Src="~/Portals/_default/Skins/R7.Epsilon/SkinObjects/CustomContent.ascx" %>
 <div class="container">
 	<div class="row">
-		<a href='<%= DnnGlobals.NavigateURL ("", "a11y", "true") %>' class="sr-only sr-only-focusable" itemprop="copy"><%: T.GetString ("A11yWebsiteVersion.Text") %></a>
+		<a href='<%= DotNetNuke.Common.Globals.NavigateURL ("", "a11y", "true") %>' class="sr-only sr-only-focusable"><%: T.GetString ("A11yWebsiteVersion.Text") %></a>
 		<a href="#content" class="sr-only sr-only-focusable"><%: T.GetString ("SkipToContent.Text") %></a>
     </div>
     <div class="row">

diff --git a/R7.Epsilon/Skins/SkinObjects/A11yFunctions.ascx b/R7.Epsilon/Skins/SkinObjects/A11yFunctions.ascx
@@ -1,6 +1,5 @@
 <%@ Control Language="C#" AutoEventWireup="false" EnableViewState="false" Inherits="R7.Epsilon.Skins.SkinObjects.EpsilonSkinObjectBase" %>
 <%@ Import Namespace="R7.Epsilon.Components" %>
-<%@ Import Namespace="DnnGlobals=DotNetNuke.Common.Globals" %>
 <div class="dropdown d-inline-block">
 	<button type="button" class="btn btn-lg skin-btn-unstyled dropdown-toggle skin-a11y-btn"
 		data-toggle="dropdown"