From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 6 Oct 2015 11:29:43 +0000 (+0200)
Subject: Globally convert headline anchors into name attributes.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5e9da8240f475a227c2897f4947397a74f36b2c3;p=oweals%2Fluci.git

Globally convert headline anchors into name attributes.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---

diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
index 70f986c5b..6de7ba122 100644
--- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialplans.htm
@@ -64,7 +64,7 @@
 	</div>
 
 <div class="cbi-map" id="cbi-asterisk">
-	<h2><a id="content" name="content">Outgoing Call Routing</a></h2>
+	<h2 name="content">Outgoing Call Routing</h2>
 	<div class="cbi-map-descr">
 		Here you can manage your dial plans which are used to route outgoing calls from your local extensions.<br /><br />
 		Related tasks:<br />
diff --git a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
index ac527918b..c867bc186 100644
--- a/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
+++ b/applications/luci-app-asterisk/luasrc/view/asterisk/dialzones.htm
@@ -55,7 +55,7 @@
 	</div>
 
 <div class="cbi-map" id="cbi-asterisk">
-	<h2><a id="content" name="content">Dial Zone Management</a></h2>
+	<h2 name="content">Dial Zone Management</h2>
 	<div class="cbi-map-descr">
 		<a href="<%=luci.dispatcher.build_url("admin/asterisk/dialplans")%>" class="cbi-title-ref">Back to dialplan overview</a><br /><br />
 		Here you can manage your dial zones. The zones are used to route outgoing calls to the destination.
diff --git a/applications/luci-app-commands/luasrc/view/commands.htm b/applications/luci-app-commands/luasrc/view/commands.htm
index 72f1e1dab..e548757d6 100644
--- a/applications/luci-app-commands/luasrc/view/commands.htm
+++ b/applications/luci-app-commands/luasrc/view/commands.htm
@@ -135,7 +135,7 @@
 
 <form method="get" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
 	<div class="cbi-map">
-		<h2><a id="content" name="content"><%:Custom Commands%></a></h2>
+		<h2 name="content"><%:Custom Commands%></h2>
 
 		<fieldset class="cbi-section">
 			<% local _, command; for _, command in ipairs(commands) do %>
diff --git a/applications/luci-app-diag-core/luasrc/view/diag/index.htm b/applications/luci-app-diag-core/luasrc/view/diag/index.htm
index 328c4eccb..c66776771 100644
--- a/applications/luci-app-diag-core/luasrc/view/diag/index.htm
+++ b/applications/luci-app-diag-core/luasrc/view/diag/index.htm
@@ -4,7 +4,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+<h2 name="content"><%:Diagnostics%></h2>
 <p><%:The entries in the menu allow you to perform diagnostic tests on your system to aid in troubleshooting.%></p>
 <p><%:The diagnostics available under this menu depend on what modules you have installed on your device.%></p>
 <%+footer%>
diff --git a/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm b/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm
index 595cc5f5f..3d01453e4 100644
--- a/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm
+++ b/applications/luci-app-diag-core/luasrc/view/diag/network_config_index.htm
@@ -4,7 +4,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+<h2 name="content"><%:Diagnostics%></h2>
 <p><%:With this menu you can configure network diagnostics, such as network device scans and ping tests.%></p>
 <p><%:The diagnostics available under this menu depend on what modules you have installed on your device.%></p>
 <%+footer%>
diff --git a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
index 2f4914e5d..ef3342e74 100644
--- a/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
+++ b/applications/luci-app-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm
@@ -55,7 +55,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 
 <form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
 	<div class="cbi-map">
-		<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+		<h2 name="content"><%:Diagnostics%></h2>
 
 		<fieldset class="cbi-section">
 			<legend><%:Network Utilities%></legend>
diff --git a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
index 0e59c6125..476150dd2 100644
--- a/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
+++ b/applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm
@@ -149,7 +149,7 @@ end
 
 
 
-	<h2><a id="content" name="content"><%:Services%></a></h2>
+	<h2 name="content"><%:Services%></h2>
 
 	<fieldset class="cbi-section">
 	<legend><%:Internal services%></legend>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
index d9976701f..eb41219c7 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:OLSR Daemon%></a></h2>
+<h2 name="content"><%:OLSR Daemon%></h2>
 <p class="error"><%:Unable to connect to the OLSR daemon!%></p>
 <p><%:Make sure that OLSRd is running, the "jsoninfo" plugin is loaded, configured on port 9090 and accepts connections from "127.0.0.1".%></p>
 <%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
index 89e4436f7..5ea7b74e4 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
@@ -73,7 +73,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
 );
 //]]></script>
 
-<h2><a id="content" name="content"><%:Active host net announcements%></a></h2>
+<h2 name="content"><%:Active host net announcements%></h2>
 
 <div id="togglebuttons"></div>
 <fieldset class="cbi-section">
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
index 3fb3a58e9..81d0a3dd3 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
@@ -11,7 +11,7 @@ local i = 1
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Interfaces%></a></h2>
+<h2 name="content"><%:Interfaces%></h2>
 
 <div id="togglebuttons"></div>
 
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
index 3c10bd66a..f658288fc 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
@@ -10,7 +10,7 @@ local i = 1
 %>
 
 <%+header%>
-<h2><a id="content" name="content"><%:Active MID announcements%></a></h2>
+<h2 name="content"><%:Active MID announcements%></h2>
 
 <div id="togglebuttons"></div> 
 <fieldset class="cbi-section">
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
index 9ad0d8f89..31dd7d05a 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
@@ -105,7 +105,7 @@ end
 //]]></script>
 
 
-<h2><a id="content" name="content"><%:OLSR connections%></a></h2>
+<h2 name="content"><%:OLSR connections%></h2>
 
 <div id="togglebuttons"></div>
 
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
index fa3231528..61e17b3b2 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
@@ -155,7 +155,7 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { },
 
 <div id="error" class="error"></div>
 
-<h2><a id="content" name="content">OLSR <%:Overview%></a></h2>
+<h2 name="content">OLSR <%:Overview%></h2>
 
 <fieldset class="cbi-section">
         <legend><%:Network%></legend>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
index d2b0c1be8..8e46daa02 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
@@ -89,7 +89,7 @@ XHR.poll(20, '<%=REQUEST_URI%>', { status: 1 },
 
 
 
-<h2><a id="content" name="content"><%:Known OLSR routes%></a></h2>
+<h2 name="content"><%:Known OLSR routes%></h2>
 
 <div id="togglebuttons"></div>
 
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
index 45f651533..6aa7a7546 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
@@ -86,7 +86,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:SmartGW announcements%></a></h2>
+<h2 name="content"><%:SmartGW announcements%></h2>
 
 <div id="togglebuttons"></div>
 
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
index ee69f72d7..b3abeaecb 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
@@ -11,7 +11,7 @@ local olsrtools = require "luci.tools.olsr"
 %>
 
 <%+header%>
-<h2><a id="content" name="content"><%:Active OLSR nodes%></a></h2>
+<h2 name="content"><%:Active OLSR nodes%></h2>
 
 <div id="togglebuttons"></div>
 
diff --git a/applications/luci-app-polipo/luasrc/view/polipo_status.htm b/applications/luci-app-polipo/luasrc/view/polipo_status.htm
index c2695ca82..007d2d5e4 100644
--- a/applications/luci-app-polipo/luasrc/view/polipo_status.htm
+++ b/applications/luci-app-polipo/luasrc/view/polipo_status.htm
@@ -9,7 +9,7 @@ local port = uci:get("polipo", "general", "proxyPort") or "8123"
 <%+header%>
 
 <div class="cbi-map">
-	<h2><a id="content" name="content"><%:Polipo Status%></a></h2>
+	<h2 name="content"><%:Polipo Status%></h2>
 	<div class="cbi-section">
 		<iframe id="sf" src="http://<%=luci.http.getenv('SERVER_NAME')%>:<%=port%>/polipo/" style="width:100%; height:350px; border:none"></iframe>
 	</div>
diff --git a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
index 831fa75f6..23982d449 100644
--- a/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/admin_status/splash.htm
@@ -210,7 +210,7 @@ end
 
 
 <div id="cbi-splash-leases" class="cbi-map">
-	<h2><a id="content" name="content"><%:Client-Splash%></a></h2>
+	<h2 name="content"><%:Client-Splash%></h2>
 	<fieldset id="cbi-table-table" class="cbi-section">
 		<legend><%:Active Clients%></legend>
 		<div class="cbi-section-node">
diff --git a/applications/luci-app-splash/luasrc/view/splash/blocked.htm b/applications/luci-app-splash/luasrc/view/splash/blocked.htm
index 406139b51..c27e2fab6 100644
--- a/applications/luci-app-splash/luasrc/view/splash/blocked.htm
+++ b/applications/luci-app-splash/luasrc/view/splash/blocked.htm
@@ -9,7 +9,7 @@ local contacturl = luci.dispatcher.build_url("freifunk", "contact")
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Blocked%></a></h2>
+<h2 name="content"><%:Blocked%></h2>
 
 <p><%:Your access to this network has been blocked, most likely because you did something that our rules explicitly forbid.%></p>
 <p><%:To ask for the reason why you have been blocked or ask for access again you can try to contact the owner of this access point:%> <a href="<%=contacturl%>"><%:Contact%></a></p>
diff --git a/applications/luci-app-splash/luasrc/view/splash/splash.htm b/applications/luci-app-splash/luasrc/view/splash/splash.htm
index 7626b600d..8d84463ef 100644
--- a/applications/luci-app-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-app-splash/luasrc/view/splash/splash.htm
@@ -72,7 +72,7 @@ if has_custom_splash then
 
 <% else %>
 
-	<h2><a id="content" name="content"><%:Welcome%></a></h2>
+	<h2 name="content"><%:Welcome%></h2>
 
 	<p><%:You are now connected to the free wireless mesh network%> <a href="<%=homepage%>"><%=community%></a>.
 	<%:Please note that we are not an internet service provider but an experimental community network.%></p>
diff --git a/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
index 0fb3d5637..38271995e 100644
--- a/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
+++ b/applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Statistics%></a></h2>
+<h2 name="content"><%:Statistics%></h2>
 
 <p><%_The statistics package uses <a href="https://collectd.org/">Collectd</a>
 to gather data and <a href="http://oss.oetiker.ch/rrdtool/">RRDtool</a> to
diff --git a/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
index 77169518d..ebc78badb 100644
--- a/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
+++ b/applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Statistics%></a></h2>
+<h2 name="content"><%:Statistics%></h2>
 
 <form action="" method="get">
 	<select name="host">
diff --git a/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm b/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm
index c85a206bd..d43a887b0 100644
--- a/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm
+++ b/applications/luci-app-tinyproxy/luasrc/view/tinyproxy_status.htm
@@ -41,7 +41,7 @@ end
 <%+header%>
 
 <div class="cbi-map">
-	<h2><a id="content" name="content"><%:Tinyproxy Status%></a></h2>
+	<h2 name="content"><%:Tinyproxy Status%></h2>
 	<div class="cbi-section">
 		<iframe src="<%=REQUESTURL%>?frame=1" style="width:100%; height:350px; border:none"></iframe>
 	</div>
diff --git a/applications/luci-app-vnstat/luasrc/view/vnstat.htm b/applications/luci-app-vnstat/luasrc/view/vnstat.htm
index 2b502559b..2b8d9ff9c 100644
--- a/applications/luci-app-vnstat/luasrc/view/vnstat.htm
+++ b/applications/luci-app-vnstat/luasrc/view/vnstat.htm
@@ -56,7 +56,7 @@ dbdir = dbdir or "/var/lib/vnstat"
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:VnStat Graphs%></a></h2>
+<h2 name="content"><%:VnStat Graphs%></h2>
 
 <form action="" method="get">
 
diff --git a/applications/luci-app-voice-core/luasrc/view/luci_voice/index.htm b/applications/luci-app-voice-core/luasrc/view/luci_voice/index.htm
index a3503f8bd..e14862e7d 100644
--- a/applications/luci-app-voice-core/luasrc/view/luci_voice/index.htm
+++ b/applications/luci-app-voice-core/luasrc/view/luci_voice/index.htm
@@ -4,7 +4,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content">Voice</a></h2>
+<h2 name="content">Voice</h2>
 <p>Here you can control OpenWRT voice-related settings and see
   voice-related information from OpenWRT</p>
 <p>In particular Asterisk configuration and information is displayed
diff --git a/applications/luci-app-voice-core/luasrc/view/luci_voice/phone_index.htm b/applications/luci-app-voice-core/luasrc/view/luci_voice/phone_index.htm
index e3e88b370..c4466cbf0 100644
--- a/applications/luci-app-voice-core/luasrc/view/luci_voice/phone_index.htm
+++ b/applications/luci-app-voice-core/luasrc/view/luci_voice/phone_index.htm
@@ -4,7 +4,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content">Phones</a></h2>
+<h2 name="content">Phones</h2>
 <p>Here you can control phone configuration and information in OpenWRT</p>
 <p>You can control the setup of phone clients and servers and see
   information such as diagnostics related to phone devices from this menu.
diff --git a/applications/luci-app-voice-diag/luasrc/view/luci_voice/diag_index.htm b/applications/luci-app-voice-diag/luasrc/view/luci_voice/diag_index.htm
index 15ccc39e4..e324fabd4 100644
--- a/applications/luci-app-voice-diag/luasrc/view/luci_voice/diag_index.htm
+++ b/applications/luci-app-voice-diag/luasrc/view/luci_voice/diag_index.htm
@@ -4,7 +4,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+<h2 name="content"><%:Diagnostics%></h2>
 <p><%:Under this menu are options that allow you to configure and perform tests on the voice operations of your system.  These are known as diagnostics.%></p>
 <p><%:The diagnostics available on your device depend on the modules that you have installed.%></p>
 <%+footer%>
diff --git a/modules/luci-base/luasrc/view/cbi/error.htm b/modules/luci-base/luasrc/view/cbi/error.htm
index 2acb96924..75ec1082a 100644
--- a/modules/luci-base/luasrc/view/cbi/error.htm
+++ b/modules/luci-base/luasrc/view/cbi/error.htm
@@ -1,5 +1,5 @@
 <div class="cbi-map" id="cbi-<%=self.config%>">
-	<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
+	<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
 	<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
 
 	<p class="alert-message danger">
diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm
index 053220d18..e90c3f589 100644
--- a/modules/luci-base/luasrc/view/cbi/map.htm
+++ b/modules/luci-base/luasrc/view/cbi/map.htm
@@ -5,7 +5,7 @@
 <%-+cbi/apply_xhr-%>
 
 <div class="cbi-map" id="cbi-<%=self.config%>">
-	<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
+	<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
 	<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
 	<%- if firstmap and applymap then cbi_apply_xhr(self.config, parsechain, redirect) end -%>
 	<%- self:render_children() %>
diff --git a/modules/luci-base/luasrc/view/cbi/simpleform.htm b/modules/luci-base/luasrc/view/cbi/simpleform.htm
index 5216cd50f..437a07a8b 100644
--- a/modules/luci-base/luasrc/view/cbi/simpleform.htm
+++ b/modules/luci-base/luasrc/view/cbi/simpleform.htm
@@ -6,7 +6,7 @@
 	</div>
 <% end %>
 	<div class="cbi-map" id="cbi-<%=self.config%>">
-		<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
+		<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
 		<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
 		<% self:render_children() %>
 		<br />
diff --git a/modules/luci-base/luasrc/view/error404.htm b/modules/luci-base/luasrc/view/error404.htm
index c2be29ed5..bc7422683 100644
--- a/modules/luci-base/luasrc/view/error404.htm
+++ b/modules/luci-base/luasrc/view/error404.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content">404 <%:Not Found%></a></h2>
+<h2 name="content">404 <%:Not Found%></h2>
 <p><%:Sorry, the object you requested was not found.%></p>
 <tt><%:Unable to dispatch%>: <%=luci.http.request.env.PATH_INFO%></tt>
 <%+footer%>
diff --git a/modules/luci-base/luasrc/view/error500.htm b/modules/luci-base/luasrc/view/error500.htm
index 8fb18ed07..34a52cda8 100644
--- a/modules/luci-base/luasrc/view/error500.htm
+++ b/modules/luci-base/luasrc/view/error500.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content">500 <%:Internal Server Error%></a></h2>
+<h2 name="content">500 <%:Internal Server Error%></h2>
 <p><%:Sorry, the server encountered an unexpected error.%></p>
 <pre class="error500"><%=message%></pre>
 <%+footer%>
diff --git a/modules/luci-base/luasrc/view/sysauth.htm b/modules/luci-base/luasrc/view/sysauth.htm
index 7f0f0a622..e20750491 100644
--- a/modules/luci-base/luasrc/view/sysauth.htm
+++ b/modules/luci-base/luasrc/view/sysauth.htm
@@ -8,7 +8,7 @@
 
 <form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
 	<div class="cbi-map">
-		<h2><a id="content" name="content"><%:Authorization Required%></a></h2>
+		<h2 name="content"><%:Authorization Required%></h2>
 		<div class="cbi-map-descr">
 			<%:Please enter your username and password.%>
 			<%- if fuser then %>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
index 05c866128..8a6c90fc2 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -55,7 +55,7 @@ local has_traceroute6 = fs.access("/usr/bin/traceroute6")
 
 <form method="post" action="<%=pcdata(luci.http.getenv("REQUEST_URI"))%>">
 	<div class="cbi-map">
-		<h2><a id="content" name="content"><%:Diagnostics%></a></h2>
+		<h2 name="content"><%:Diagnostics%></h2>
 
 		<fieldset class="cbi-section">
 			<legend><%:Network Utilities%></legend>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
index 90cc4c03e..431afb579 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -87,7 +87,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Join Network: Wireless Scan%></a></h2>
+<h2 name="content"><%:Join Network: Wireless Scan%></h2>
 
 <div class="cbi-map">
 	<fieldset class="cbi-section">
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
index 4fc268e66..ca1f20bae 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -348,7 +348,7 @@
 	);
 //]]></script>
 
-<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
+<h2 name="content"><%:Wireless Overview%></h2>
 
 <fieldset class="cbi-section" style="display:none">
 	<legend><%:Reconnecting interface%></legend>
@@ -410,7 +410,7 @@
 	<% end %>
 
 
-	<h2><a id="content" name="content"><%:Associated Stations%></a></h2>
+	<h2 name="content"><%:Associated Stations%></h2>
 
 	<fieldset class="cbi-section">
 		<table class="cbi-section-table" style="margin:10px" id="iw-assoclist">
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
index dbcf06bee..04da3c123 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -264,7 +264,7 @@
 	);
 //]]></script>
 
-<h2><a id="content" name="content"><%:Realtime Traffic%></a></h2>
+<h2 name="content"><%:Realtime Traffic%></h2>
 
 <ul class="cbi-tabmenu">
 	<% for _, dev in ipairs(devices) do %>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
index 64b950e24..0b2e52e05 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
@@ -312,7 +312,7 @@
 	);
 //]]></script>
 
-<h2><a id="content" name="content"><%:Realtime Connections%></a></h2>
+<h2 name="content"><%:Realtime Connections%></h2>
 
 <div class="cbi-map-descr"><%:This page gives an overview over currently active network connections.%></div>
 
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
index a63bb7112..c119b5729 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/dmesg.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:Kernel Log%></a></h2>
+<h2 name="content"><%:Kernel Log%></h2>
 <div id="content_syslog">
 <textarea readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
 </div>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index a98d79080..62188e45e 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -552,7 +552,7 @@
 	);
 //]]></script>
 
-<h2><a id="content" name="content"><%:Status%></a></h2>
+<h2 name="content"><%:Status%></h2>
 
 <fieldset class="cbi-section">
 	<legend><%:System%></legend>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
index ba2933ade..c1f982d16 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/iptables.htm
@@ -59,7 +59,7 @@
 	}
 </style>
 
-<h2><a id="content" name="content"><%:Firewall Status%></a></h2>
+<h2 name="content"><%:Firewall Status%></h2>
 
 <% if has_ip6tables then %>
 <ul class="cbi-tabmenu">
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
index d095948e5..97a2f5ed5 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/load.htm
@@ -242,7 +242,7 @@
 	);
 //]]></script>
 
-<h2><a id="content" name="content"><%:Realtime Load%></a></h2>
+<h2 name="content"><%:Realtime Load%></h2>
 
 <embed id="bwsvg" style="width:100%; height:300px; border:1px solid #000000; background-color:#FFFFFF" src="<%=resource%>/load.svg" />
 <div style="text-align:right"><small id="scale">-</small></div>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
index 82dd3a7df..5f2c07493 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/routes.htm
@@ -33,7 +33,7 @@
 <%+header%>
 
 <div class="cbi-map" id="cbi-network">
-	<h2><a id="content" name="content"><%:Routes%></a></h2>
+	<h2 name="content"><%:Routes%></h2>
 	<div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div>
 
 	<fieldset class="cbi-section">
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
index 40032a142..b87f21d08 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/syslog.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:System Log%></a></h2>
+<h2 name="content"><%:System Log%></h2>
 <div id="content_syslog">
 <textarea readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
 </div>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
index 025fece90..f18592610 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
@@ -314,7 +314,7 @@
 	);
 //]]></script>
 
-<h2><a id="content" name="content"><%:Realtime Wireless%></a></h2>
+<h2 name="content"><%:Realtime Wireless%></h2>
 
 <ul class="cbi-tabmenu">
 	<% for _, dev in ipairs(devices) do %>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
index 15c96e34d..e722a4809 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -25,7 +25,7 @@
 	<body>
 		<div id="maincontainer">
 			<div id="maincontent">
-				<h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></a></h2>
+				<h2 name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></h2>
 				<fieldset class="cbi-section">
 					<p>
 						<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
index bea565aa0..bc8bcf488 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Flash operations%></a></h2>
+<h2 name="content"><%:Flash operations%></h2>
 
 <ul class="cbi-tabmenu">
 	<li class="cbi-tab"><a href="#"><%:Actions%></a></li>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
index fe2fe0436..ef9591990 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/packages.htm
@@ -44,7 +44,7 @@ end
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Software%></a></h2>
+<h2 name="content"><%:Software%></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
index 80768119f..aa7441d13 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/reboot.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2 name="content"><%:System%></h2>
 <h3><%:Reboot%></h3>
 <p><%:Reboots the operating system of your device%></p>
 <%-
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
index b9d42357b..198505882 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2>
+<h2 name="content"><%:Flash Firmware%> - <%:Verify%></h2>
 <p>
 	<%_ The flash image was uploaded.
 		Below is the checksum and file size listed,
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
index 4284b44d3..370027e51 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Configuration%> / <%:Apply%></a></h2>
+<h2 name="content"><%:Configuration%> / <%:Apply%></h2>
 
 <% if changes then %>
 	<%+cbi/apply_xhr%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
index 84e22879e..865780ff0 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Configuration%> / <%:Changes%></a></h2>
+<h2 name="content"><%:Configuration%> / <%:Changes%></h2>
 
 <% if changes then %>
 	<%+admin_uci/changelog%>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
index d2bdc7a97..5da7281a8 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Configuration%> / <%:Revert%></a></h2>
+<h2 name="content"><%:Configuration%> / <%:Revert%></h2>
 
 <% if changes then %>
 	<%+cbi/apply_xhr%>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
index 4c536249a..d33a2ca29 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/applyreboot.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2 name="content"><%:System%></h2>
 <br />
 <p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p>
 <p><%:Please wait: Device rebooting...%></p>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
index b0f52f791..efc6aa72f 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/backup.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2 name="content"><%:System%></h2>
 <h3><%:Backup / Restore%></h3>
 <p><%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%></p>
 <br />
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
index 9fb03c3c6..5818a567f 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/index.htm
@@ -4,7 +4,7 @@
  Licensed to the public under the Apache License 2.0.
 -%>
 
-<h2><a id="content" name="content"><%:Hello!%></a></h2>
+<h2 name="content"><%:Hello!%></h2>
 <p><%_This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p>
 <p><%_<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt.%><br />
 <%:On the following pages you can adjust all important settings of this device.%></p>
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
index 0717f68d8..f70e7c92d 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/reboot.htm
@@ -5,7 +5,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2 name="content"><%:System%></h2>
 <h3><%:Reboot%></h3>
 <p><%:Reboots the operating system of your device%></p>
 <%-
diff --git a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
index 474c22037..ecd1e8a7a 100644
--- a/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/luci-mod-admin-mini/luasrc/view/mini/upgrade.htm
@@ -6,7 +6,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2 name="content"><%:System%></h2>
 <h3><%:Flash Firmware%></h3>
 
 <% if step == 1 then %>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
index 0c8cebc13..12c138c16 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/applyreboot.htm
@@ -25,7 +25,7 @@
 	<body>
 		<div id="maincontainer">
 			<div id="maincontent">
-				<h2><a id="content" name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></a></h2>
+				<h2 name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></h2>
 				<fieldset class="cbi-section">
 					<p>
 						<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
index 29c4d2d6f..3c8d11bb7 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/flashops.htm
@@ -7,7 +7,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Flash operations%></a></h2>
+<h2 name="content"><%:Flash operations%></h2>
 <fieldset class="cbi-section">
 	<legend><%:Flash new firmware image%></legend>
 	<% if upgrade_avail then %>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
index 189939afb..cbbe13b42 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/reboot.htm
@@ -6,7 +6,7 @@
 -%>
 
 <%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2 name="content"><%:System%></h2>
 <h3><%:Reboot%></h3>
 <p><%:Reboots the operating system of your device%></p>
 <%- if not reboot then -%>
diff --git a/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
index 619ed85de..3be9ae119 100644
--- a/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
+++ b/modules/luci-mod-failsafe/luasrc/view/failsafe/upgrade.htm
@@ -7,7 +7,7 @@
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:Flash Firmware%> - <%:Verify%></a></h2>
+<h2 name="content"><%:Flash Firmware%> - <%:Verify%></h2>
 <p>
 	<%_ The flash image was uploaded.
 		Below is the checksum and file size listed,
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
index f7cb4a92b..1add595c6 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
@@ -27,7 +27,7 @@ else
 end
 %>
 
-<h2><a id="content" name="content"><%:Contact%></a></h2>
+<h2 name="content"><%:Contact%></h2>
 
 <fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
 <legend><%:Operator%></legend>