WebUI: Fix XHTML conformity in public files

Submitted by Adrian Schmutzler on July 2, 2017, 4:49 p.m.

Details

Message ID 1499014145-1850-1-git-send-email-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler July 2, 2017, 4:49 p.m.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../fff/fff-web/files/www/public/cgi-bin/status.html   |  8 ++++----
 src/packages/fff/fff-web/files/www/public/index.html   | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 src/packages/fff/fff-web/files/www/public/index.html

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
index 968d816..ae58260 100755
--- a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
+++ b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
@@ -17,15 +17,15 @@  contact="$(uci -q get system.@system[0].contact)"
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<title><%= ${HOSTNAME} %></title>
 	<link href="/style.css" rel="stylesheet" type="text/css" media="screen" />
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="expires" content="0">
+	<meta http-equiv="cache-control" content="no-cache" />
+	<meta http-equiv="pragma" content="no-cache" />
+	<meta http-equiv="expires" content="0" />
 </head>
 <body>
 	<div id="header" style="position: relative;">
 		<h1><%= ${HOSTNAME} %></h1>
 		<h2>Freifunk Franken Router</h2>
-		<img src="/freifunk.svg" style="position: absolute; top: 1px; right: 42px;" />
+		<img src="/freifunk.svg" style="position: absolute; top: 1px; right: 42px;" alt="" />
 	</div>
 	<div style="height: 30px; background-color: #ffb400; position: relative;">
 		<div style="position: absolute; top: 20%; bottom: 20%; left: 40px; width: 20em; text-align: left;">
diff --git a/src/packages/fff/fff-web/files/www/public/index.html b/src/packages/fff/fff-web/files/www/public/index.html
old mode 100644
new mode 100755
index c09da1d..75eae58
--- a/src/packages/fff/fff-web/files/www/public/index.html
+++ b/src/packages/fff/fff-web/files/www/public/index.html
@@ -1,13 +1,15 @@ 
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta charset="utf-8"/>
-	<meta http-equiv="refresh" content="0; URL=/cgi-bin/status.html">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">
-	<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
-	<meta http-equiv="pragma" content="no-cache">
+	<title>Freifunk Franken</title>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta http-equiv="refresh" content="0; URL=/cgi-bin/status.html" />
+	<meta http-equiv="cache-control" content="no-cache" />
+	<meta http-equiv="expires" content="0" />
+	<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
+	<meta http-equiv="pragma" content="no-cache" />
 </head>
 <body>
-	<a href="/cgi-bin/status.html">Redirecting...</a>
+	<p><a href="/cgi-bin/status.html">Redirecting...</a></p>
 </body>
 </html>

Comments

Tim Niemeyer July 9, 2017, 10:33 a.m.
Hi

Schaut für mich schlüssig aus:
Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim

Am Sonntag, den 02.07.2017, 18:49 +0200 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  .../fff/fff-web/files/www/public/cgi-bin/status.html   |  8 ++++----
>  src/packages/fff/fff-web/files/www/public/index.html   | 18 ++++++++++--------
>  2 files changed, 14 insertions(+), 12 deletions(-)
>  mode change 100644 => 100755 src/packages/fff/fff-web/files/www/public/index.html
> 
> diff --git a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
> index 968d816..ae58260 100755
> --- a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
> +++ b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html
> @@ -17,15 +17,15 @@ contact="$(uci -q get system.@system[0].contact)"
>  	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
>  	<title><%= ${HOSTNAME} %></title>
>  	<link href="/style.css" rel="stylesheet" type="text/css" media="screen" />
> -	<meta http-equiv="cache-control" content="no-cache">
> -	<meta http-equiv="pragma" content="no-cache">
> -	<meta http-equiv="expires" content="0">
> +	<meta http-equiv="cache-control" content="no-cache" />
> +	<meta http-equiv="pragma" content="no-cache" />
> +	<meta http-equiv="expires" content="0" />
>  </head>
>  <body>
>  	<div id="header" style="position: relative;">
>  		<h1><%= ${HOSTNAME} %></h1>
>  		<h2>Freifunk Franken Router</h2>
> -		<img src="/freifunk.svg" style="position: absolute; top: 1px; right: 42px;" />
> +		<img src="/freifunk.svg" style="position: absolute; top: 1px; right: 42px;" alt="" />
>  	</div>
>  	<div style="height: 30px; background-color: #ffb400; position: relative;">
>  		<div style="position: absolute; top: 20%; bottom: 20%; left: 40px; width: 20em; text-align: left;">
> diff --git a/src/packages/fff/fff-web/files/www/public/index.html b/src/packages/fff/fff-web/files/www/public/index.html
> old mode 100644
> new mode 100755
> index c09da1d..75eae58
> --- a/src/packages/fff/fff-web/files/www/public/index.html
> +++ b/src/packages/fff/fff-web/files/www/public/index.html
> @@ -1,13 +1,15 @@
> -<html>
> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
> +<html xmlns="http://www.w3.org/1999/xhtml">
>  <head>
> -	<meta charset="utf-8"/>
> -	<meta http-equiv="refresh" content="0; URL=/cgi-bin/status.html">
> -	<meta http-equiv="cache-control" content="no-cache">
> -	<meta http-equiv="expires" content="0">
> -	<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT">
> -	<meta http-equiv="pragma" content="no-cache">
> +	<title>Freifunk Franken</title>
> +	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
> +	<meta http-equiv="refresh" content="0; URL=/cgi-bin/status.html" />
> +	<meta http-equiv="cache-control" content="no-cache" />
> +	<meta http-equiv="expires" content="0" />
> +	<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
> +	<meta http-equiv="pragma" content="no-cache" />
>  </head>
>  <body>
> -	<a href="/cgi-bin/status.html">Redirecting...</a>
> +	<p><a href="/cgi-bin/status.html">Redirecting...</a></p>
>  </body>
>  </html>
> -- 
> 2.7.4
>