# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1420297874 -7200
# Node ID 106b85c1951cd64dc8faef3c67eb43ee7b73a305
# Parent  d9576ab0e512d83a06207fea77568401e2b7d7a4
Small improvements: no need HTML "meta charset" (it's done in HTTP headers); no need "$SCRIPT_NAME" in links; use HTML "&amp;" in links; hide Wi-Fi password in the page; fix month selector in the date settings; use HTML5 plain "header" and "footer"; use "printf"'s loop nature; fix "1" message in page loading break.

diff -r d9576ab0e512 -r 106b85c1951c boot.cgi
--- a/boot.cgi	Wed Dec 31 02:25:01 2014 +0200
+++ b/boot.cgi	Sat Jan 03 17:11:14 2015 +0200
@@ -173,14 +173,14 @@
 					set -- $i
 					case "$1" in
 					edit)	cat <<EOT
-<a href="index.cgi?file=${3:-/etc/$name.conf}&action=edit">
+<a href="index.cgi?file=${3:-/etc/$name.conf}&amp;action=edit">
 <img title="${2:-$name Configuration}" src="$IMAGES/edit.png" /></a>
 EOT
 						;;
 					options)
 						key=$(echo $name | tr [a-z] [A-Z])_OPTIONS
 						cat <<EOT
-<a href="index.cgi?file=/etc/daemons.conf&action=setvar&var=$key&default=$3">
+<a href="index.cgi?file=/etc/daemons.conf&amp;action=setvar&amp;var=$key&amp;default=$3">
 <img title="${2:-$key}" src="$IMAGES/tux.png" /></a>
 EOT
 						;;
@@ -206,19 +206,19 @@
 			if [ "$pid" ]; then
 				cat << EOT
 <td><img src="$IMAGES/started.png" alt="Started" title="$(gettext 'Started')" /></td>
-<td><a href="$SCRIPT_NAME?daemons=stop=$name">
+<td><a href="?daemons=stop=$name">
 	<img src="$IMAGES/stop.png" alt="Stop" title="$(gettext 'Stop')" /></a></td>
 <td>
 EOT
 				for i in $pid; do
 					cat << EOT
-<a href="$SCRIPT_NAME?daemons=pid=$i">$i</a>
+<a href="?daemons=pid=$i">$i</a>
 EOT
 				done
 			else
 				cat << EOT
 <td><img src="$IMAGES/stopped.png" alt="Stopped" title="$(gettext 'Stopped')" /></td>
-<td><a href="$SCRIPT_NAME?daemons=start=$name">
+<td><a href="?daemons=start=$name">
     <img src="$IMAGES/start.png" alt="Start" title="$(gettext 'Start')" /></a></td>
 <td>-----
 EOT
@@ -250,7 +250,7 @@
 	<p>$(gettext 'The first application started when the computer powers on')</p>
 </div>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="grub" />
 <table>
 <tr><td>$(gettext 'Default entry:')</td>
@@ -301,11 +301,11 @@
 	<p>$(gettext 'Everything that happens before user login')</p>
 </div>
 <div>
-	<a class="button" href="$SCRIPT_NAME?log">
+	<a class="button" href="?log">
 		<img src="$IMAGES/text.png" />$(gettext 'Boot logs')</a>
-	<a class="button" href="$SCRIPT_NAME?daemons">
+	<a class="button" href="?daemons">
 		<img src="$IMAGES/recharge.png" />$(gettext 'Manage daemons')</a>
-	<a class="button" href="$SCRIPT_NAME?grub">$(gettext 'Boot loader')</a>
+	<a class="button" href="?grub">$(gettext 'Boot loader')</a>
 </div>
 
 <h3>$(gettext 'Configuration files')</h3>
diff -r d9576ab0e512 -r 106b85c1951c hardware.cgi
--- a/hardware.cgi	Wed Dec 31 02:25:01 2014 +0200
+++ b/hardware.cgi	Sat Jan 03 17:11:14 2015 +0200
@@ -78,7 +78,7 @@
 <div id="wrapper">
 	<h2>$(gettext 'Kernel modules')</h2>
 	<div class="float-right">
-		<form method="get" action="$SCRIPT_NAME">
+		<form method="get" action="">
 			<input type="hidden" name="modules" />
 			<input type="search" placeholder="$(gettext 'Modules search')" name="search" />
 		</form>
@@ -110,7 +110,7 @@
 			do
 				name=$(basename $line)
 				mod=${name%.ko.gz}
-				echo "$(gettext 'Module:') <a href='$SCRIPT_NAME?modinfo=$mod'>$mod</a>"
+				echo "$(gettext 'Module:') <a href='?modinfo=$mod'>$mod</a>"
 			done
 			echo '</pre>'
 		fi
@@ -128,7 +128,7 @@
 		do
 			cat << EOT
 		<tr>
-			<td><a href="$SCRIPT_NAME?modinfo=$MOD">$MOD</a></td>
+			<td><a href="?modinfo=$MOD">$MOD</a></td>
 			<td>$SIZE</td>
 			<td>$USED</td>
 			<td>$(echo $BY | sed s/","/" "/g)</td>
@@ -178,9 +178,9 @@
 	<p>$(gettext 'Manage your computer hardware')</p>
 </div>
 <div>
-	<a class="button" href="$SCRIPT_NAME?modules">
+	<a class="button" href="?modules">
 		<img src="$IMAGES/tux.png" />$(gettext 'Kernel modules')</a>
-	<a class="button" href="$SCRIPT_NAME?detect">
+	<a class="button" href="?detect">
 		<img src="$IMAGES/monitor.png" />$(gettext 'Detect PCI/USB')</a>
 </div>
 
@@ -235,7 +235,7 @@
 
 		if [ -n "$(ls /sys/devices/virtual/backlight/*/brightness 2> /dev/null)" ]; then
 			cat <<EOT
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 EOT
 			for dev in /sys/devices/virtual/backlight/*/brightness ; do
 				name=$(echo $dev | sed 's|.*/backlight/\([^/]*\).*|\1|')
@@ -302,7 +302,7 @@
 			$device ;;
 		esac
 		cat << EOT
-<form method="get" action="$SCRIPT_NAME#mount">
+<form method="get" action="#mount">
 <table id="mount" class="zebra outbox nowrap">
 EOT
 		df_thead
@@ -391,7 +391,7 @@
 	END{print "</tbody></table>"}'
 
 		cat << EOT
-<a class="button" href="index.cgi?file=/etc/fstab&action=edit">
+<a class="button" href="index.cgi?file=/etc/fstab&amp;action=edit">
 	<img src="$IMAGES/edit.png" />$(gettext 'Manual Edit')</a>
 
 
@@ -401,7 +401,7 @@
 		# Loop device management gui
 		#
 		cat << EOT
-<form method="get" action="$SCRIPT_NAME#loop">
+<form method="get" action="#loop">
 <table id="loop" class="zebra outbox nowrap">
 <thead>
 <tr><td>Device</td><td>Backing file</td><td>Access</td><td>Offset</td></tr>
diff -r d9576ab0e512 -r 106b85c1951c help.cgi
--- a/help.cgi	Wed Dec 31 02:25:01 2014 +0200
+++ b/help.cgi	Sat Jan 03 17:11:14 2015 +0200
@@ -14,7 +14,7 @@
 search_form() {
 	cat << EOT
 <div class="search">
-	<form method="get" action="$SCRIPT_NAME">
+	<form method="get" action="">
 		<p>
 			<input type="text" name="manual" size="20">
 			<input type="submit" class="radius" value="$(gettext 'Manual')">
diff -r d9576ab0e512 -r 106b85c1951c index.cgi
--- a/index.cgi	Wed Dec 31 02:25:01 2014 +0200
+++ b/index.cgi	Sat Jan 03 17:11:14 2015 +0200
@@ -34,7 +34,7 @@
 			rm -rf $tmp ;;
 		button)
 			cat <<EOT
-	<a class="button" href='$SCRIPT_NAME?file=$1&action=diff'>
+	<a class="button" href="?file=$1&amp;action=diff">
 		<img src="$IMAGES/help.png" />$(gettext 'Differences')</a>
 EOT
 		esac
@@ -88,10 +88,10 @@
 
 		if [ "$(GET action)" == "edit" ]; then
 			cat <<EOT
-<form method="post" action="$SCRIPT_NAME?file=$file">
+<form method="post" action="?file=$file">
 	<img src="$IMAGES/edit.png" />
 	<input type="submit" value="$(gettext 'Save')">
-		<a class="button" href='$SCRIPT_NAME?file=$file&action=diff'>
+		<a class="button" href="?file=$file&amp;action=diff">
 			<img src="$IMAGES/help.png" />$(gettext 'Differences')</a>
 		<textarea name="content" rows="30" style="width: 100%;">
 $(cat $file | htmlize)
@@ -103,7 +103,7 @@
 		elif [ "$(GET action)" == "setvar" ]; then
 			data="$(. $(GET file) ;eval echo \$$(GET var))"
 			cat <<EOT
-<form method="post" action="$SCRIPT_NAME?file=$file">
+<form method="post" action="?file=$file">
 	<img src="$IMAGES/edit.png" />
 	<input type="submit" value="$(gettext 'Save')">
 	$(GET var) : 
@@ -128,7 +128,7 @@
 			fi
 			cat <<EOT
 <div id="actions">
-	<a class="button" href='$SCRIPT_NAME?file=$file&action=edit'>
+	<a class="button" href="?file=$file&amp;action=edit">
 		<img src="$IMAGES/edit.png" />$(gettext 'Edit')</a>
 EOT
 			file_is_modified $file button
@@ -157,7 +157,7 @@
 		xhtml_header
 		cat << EOT
 <section>
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<div class="box">
 		root@$(hostname):~# <input autofocus type="text" name="cmd" style="width: 80%;" />
 	</div>
@@ -348,7 +348,7 @@
 	$(ok_status_t)
 </tbody>
 </table>
-<p><a class="button" href="$SCRIPT_NAME?file=$output">
+<p><a class="button" href="?file=$output">
 	<img src="/styles/default/images/browser.png" />
 	$(gettext 'View report')</a>
 	$(msg tip "$(gettext 'This report can be attached with a bug report on:')
@@ -371,11 +371,11 @@
 	<p>$(gettext 'SliTaz administration and configuration Panel')<p>
 </div>
 <div id="actions">
-	<a class="button" href="$SCRIPT_NAME?terminal">
+	<a class="button" href="?terminal">
 		<img src="$IMAGES/terminal.png" />$(gettext 'Terminal')</a>
-	<a class="button" href="$SCRIPT_NAME?top">
+	<a class="button" href="?top">
 		<img src="$IMAGES/monitor.png" />$(gettext 'Process activity')</a>
-	<a class="button" href="$SCRIPT_NAME?report">
+	<a class="button" href="?report">
 		<img src="$IMAGES/text.png" />$(gettext 'Create a report')</a>
 </div>
 
diff -r d9576ab0e512 -r 106b85c1951c network.cgi
--- a/network.cgi	Wed Dec 31 02:25:01 2014 +0200
+++ b/network.cgi	Sat Jan 03 17:11:14 2015 +0200
@@ -45,7 +45,7 @@
 				ENCRYPTION="WPA"
 			fi
 			if echo $SCAN | grep -q 'Mode:Managed'; then
-				AP="&ap=$(echo $SCAN | sed 's/.*Address: \([^ ]*\).*/\1/')"
+				AP="ap=$(echo $SCAN | sed 's/.*Address: \([^ ]*\).*/\1/')"
 			else
 				AP=""
 			fi
@@ -58,7 +58,7 @@
 				status="---"
 			fi
 			echo '<tr>'
-			echo "<td><a href=\"$SCRIPT_NAME?wifi&select=$ESSID&keytype=$ENCRYPTION&$AP\">
+			echo "<td><a href=\"?wifi&amp;select=$ESSID&amp;keytype=$ENCRYPTION&amp;$AP\">
 				<img src='$IMAGES/wireless.png' />$ESSID</a></td>"
 			echo "<td>$QUALITY</td><td>$ENCRYPTION</td><td>$status $ip</td>"
 			echo '</tr>'
@@ -152,7 +152,7 @@
 
 <section>
 <h3>$(gettext 'Configuration')</h3>
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="eth" />
 	<table>
 	<thead>
@@ -198,7 +198,7 @@
 <pre>
 $(grep ^[A-V] /etc/network.conf | syntax_highlighter conf)
 </pre>
-<a class="button" href="index.cgi?file=/etc/network.conf&action=edit">
+<a class="button" href="index.cgi?file=/etc/network.conf&amp;action=edit">
 	<img src="$IMAGES/edit.png" />$(gettext 'Manual Edit')</a>
 </section>
 EOT
@@ -212,11 +212,11 @@
 		cat << EOT
 <h2>$(gettext 'Wireless connection')</h2>
 <div id="actions">
-	<a class="button" href="$SCRIPT_NAME?wifi&start-wifi=start-wifi">
+	<a class="button" href="?wifi&amp;start-wifi=start-wifi">
 		<img src="$IMAGES/start.png" />$(gettext 'Start')</a>
-	<a class="button" href="$SCRIPT_NAME?wifi&stop=stop">
+	<a class="button" href="?wifi&amp;stop=stop">
 		<img src="$IMAGES/stop.png" />$(gettext 'Stop')</a>
-	<a class="button" href="$SCRIPT_NAME?wifi=scan">
+	<a class="button" href="?wifi=scan">
 		<img src="$IMAGES/recharge.png" />$(gettext 'Scan')</a>
 </div>
 $(detect_wifi_networks)
@@ -248,7 +248,7 @@
 	cat << EOT
 <section>
 <h3>$(gettext 'Connection')</h3>
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="connect-wifi" />
 	$(table_start)
 	<thead>
@@ -284,9 +284,10 @@
 <p>$(gettext "These values are the wifi settings in the main /etc/network.conf \
 configuration file")</p>
 
-<pre>$(grep ^WIFI /etc/network.conf | syntax_highlighter conf)</pre>
+<pre>$(grep ^WIFI /etc/network.conf | sed '/WIFI_KEY=/s|".*"|"********"|' | \
+syntax_highlighter conf)</pre>
 
-<a class="button" href="index.cgi?file=/etc/network.conf&action=edit">
+<a class="button" href="index.cgi?file=/etc/network.conf&amp;action=edit">
 	<img src="$IMAGES/edit.png" />$(gettext 'Manual Edit')</a>
 </section>
 
@@ -309,18 +310,18 @@
 <section>
 <div id="actions">
 	<div class="float-left">
-		<a class="button" href="$SCRIPT_NAME?start">
+		<a class="button" href="?start">
 			<img src="$IMAGES/start.png" />$(gettext 'Start')</a>
-		<a class="button" href="$SCRIPT_NAME?stop">
+		<a class="button" href="?stop">
 			<img src="$IMAGES/stop.png" />$(gettext 'Stop')</a>
-		<a class="button" href="$SCRIPT_NAME?restart">
+		<a class="button" href="?restart">
 			<img src="$IMAGES/recharge.png" />$(gettext 'Restart')</a>
 	</div>
 	<div class="float-right">
 		$(gettext 'Configuration:')
 		<a class="button" href="index.cgi?file=/etc/network.conf">network.conf</a>
-		<a class="button" href="$SCRIPT_NAME?eth">Ethernet</a>
-		<a class="button" href="$SCRIPT_NAME?wifi">Wireless</a>
+		<a class="button" href="?eth">Ethernet</a>
+		<a class="button" href="?wifi">Wireless</a>
 	</div>
 </div>
 
@@ -332,14 +333,14 @@
 
 <pre>$(cat /etc/hosts)</pre>
 
-<a class="button" href="index.cgi?file=/etc/hosts&action=edit">
+<a class="button" href="index.cgi?file=/etc/hosts&amp;action=edit">
 	<img src="$IMAGES/edit.png" />$(gettext 'Edit hosts')</a>
 </section>
 
 <section>
 <h3>$(gettext 'Hostname')</h3>
 
-<form method="get" name="$SCRIPT_NAME">
+<form method="get" name="">
 	<input type="text" name="hostname" value="$hostname" />
 	<input type="submit" value="$(gettext 'Change hostname')" />
 </form>
diff -r d9576ab0e512 -r 106b85c1951c settings.cgi
--- a/settings.cgi	Wed Dec 31 02:25:01 2014 +0200
+++ b/settings.cgi	Sat Jan 03 17:11:14 2015 +0200
@@ -119,7 +119,7 @@
 		cat <<EOT
 <h3 id="groups">$(gettext 'Manage groups')</h3>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="groups" />
 <div id="actions">
 	<div class="float-left">
@@ -162,7 +162,7 @@
 <section>
 <h4>$(gettext 'Add a new group')</h4>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="groups" />
 	<table>
 		<tr><td>$(gettext 'Group name:')</td>
@@ -176,7 +176,7 @@
 <section>
 <h4>$(gettext 'Manage group membership')</h4>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="groups" />
 	<table>
 		<tr><td>$(gettext 'Group name:')</td>
@@ -203,7 +203,7 @@
 		cat <<EOT
 <h3 id="users">$(gettext 'Manage users')</h3>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 <div id="actions">
 	<div class="float-left">
 		$(gettext 'Selection:')
@@ -266,7 +266,7 @@
 <section>
 <h4>$(gettext 'Add a new user')</h4>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<input type="hidden" name="user" />
 	<table>
 		<tr><td>$(gettext 'User login:')</td>
@@ -317,11 +317,11 @@
 		[ $? = 1 ] &&
 			msg tip $(gettext \
 			"Can't see your language?<br/>You can \
-<a href='/pkgs.cgi?do=Install&glibc-locale'>install glibc-locale</a> \
+<a href='/pkgs.cgi?do=Install&amp;glibc-locale'>install glibc-locale</a> \
 to see a larger list of available locales.")
 
 		cat << EOT
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<div class="outbox">
 	<table class="zebra fixed">
 	<thead>
@@ -377,16 +377,16 @@
 	<p>$(gettext 'Manage system time, users or language settings')<p>
 </div>
 <div id="actions">
-	<a class="button" href="$SCRIPT_NAME?users">
+	<a class="button" href="?users">
 		<img src="$IMAGES/user.png" />$(gettext 'Manage users')</a>
-	<a class="button" href="$SCRIPT_NAME?groups">
+	<a class="button" href="?groups">
 		<img src="$IMAGES/users.png" />$(gettext 'Manage groups')</a>
 </div>
 
 <section>
 <h3>$(gettext 'System time')</h3>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 <table>
 	<tr><td>$(gettext 'Time zone:')</td><td>
 		<select class="button" name="tz">
@@ -403,32 +403,23 @@
 	<tr><td>$(gettext 'Hardware clock:')</td><td>$(hwclock -r)</tr>
 </table>
 </form>
-<form method="get" action="$SCRIPT_NAME">
-<input type="submit" name="date" value="$(gettext 'Set date')" />
-<select class="button" name="day">
-$(for i in $(seq 1 31); do echo "<option>$i</option>"; done)
-</select>
-<select class="button" name="month">
-$(for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
-  date -d ${i}010101 '+%m %B' | \
-  sed 's|\(.*\) \(.*\)|<option value="\1">\2</option>|'
-done)
-</select>
-<select class="button" name="year">
-$(for i in $(seq 2010 2030); do echo "<option>$i</option>"; done)
-</select>
-- <select class="button" name="hour">
-$(for i in $(seq 0 23); do printf "<option>%02d</option>" $i; done)
-</select>
-: <select class="button" name="min">
-$(for i in $(seq 0 59); do printf "<option>%02d</option>" $i; done)
-</select>
-: <select class="button" name="sec">
-$(for i in $(seq 0 59); do printf "<option>%02d</option>" $i; done)
-</select>
+
+<form method="get" action="">
+	<input type="submit" name="date" value="$(gettext 'Set date')" />
+	<select class="button" name="day">$(printf '<option>%d</option>' $(seq 31))</select>
+	<select class="button" name="month">
+		$(for i in $(seq 12); do
+			printf '<option value="%s">%s</option>' $(date -d $i.01-01:01 '+%m %B')
+		done)
+	</select>
+	<select class="button" name="year">$(printf '<option>%d</option>' $(seq 2010 2030))</select>
+-	<select class="button" name="hour">$(printf '<option>%02d</option>' $(seq 0 23))</select>
+:	<select class="button" name="min">$(printf '<option>%02d</option>' $(seq 0 59))</select>
+:	<select class="button" name="sec">$(printf '<option>%02d</option>' $(seq 0 59))</select>
 </form>
-<a class="button" href="$SCRIPT_NAME?rdate">$(gettext 'Sync online')</a>
-<a class="button" href="$SCRIPT_NAME?hwclock">$(gettext 'Set hardware clock')</a>
+
+<a class="button" href="?rdate">$(gettext 'Sync online')</a>
+<a class="button" href="?hwclock">$(gettext 'Set hardware clock')</a>
 </section>
 EOT
 		#
@@ -454,7 +445,7 @@
 			locale | grep LANG | cut -d= -f2
 		fi
 		cat << EOT
-</strong> <a class="button" href="$SCRIPT_NAME?locale">$(gettext 'Change')</a></p>
+</strong> <a class="button" href="?locale">$(gettext 'Change')</a></p>
 </section>
 
 <section>
@@ -487,7 +478,7 @@
 			esac
 			keyboard_config=/etc/X11/xorg.conf.d/40-Keyboard.conf
 			cat << EOT
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	$(gettext 'Suggested keymap for Xorg:')
 	<input type="submit" name "apply_xorg_kbd" value="$keymap" />
 	<a class="button" href="index.cgi?file=$keyboard_config">
@@ -496,7 +487,7 @@
 EOT
 		fi
 		cat << EOT
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	$(gettext 'Available keymaps:')
 	<select class="button" name="gen_keymap">
 		$(list_keymaps)
@@ -508,7 +499,7 @@
 <section>
 <h2>$(gettext 'Panel configuration')</h2>
 
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<p>
 		$(gettext 'Style:')
 		<select class="button" name="style">
@@ -517,7 +508,7 @@
 		<input type="submit" value="$(gettext 'Activate')" />
 	</p>
 </form>
-<form method="get" action="$SCRIPT_NAME">
+<form method="get" action="">
 	<p>
 		$(gettext 'Panel password:')
 		<input type="password" name="panel_pass"/>
diff -r d9576ab0e512 -r 106b85c1951c styles/default/footer.html
--- a/styles/default/footer.html	Wed Dec 31 02:25:01 2014 +0200
+++ b/styles/default/footer.html	Sat Jan 03 17:11:14 2015 +0200
@@ -1,12 +1,13 @@
+export TEXTDOMAIN='tazpanel'
 cat << EOT
 <!-- End of content-->
 </div>
 
-<div id="footer">
+<footer>
 	$(gettext 'Copyright') &copy; $(date +%Y)
 	<a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
 	- <a href="/index.cgi?file=/usr/share/licenses/bsd.txt">$(gettext 'BSD License')</a>
-</div>
+</footer>
 
 <script type="text/javascript">
 	window.onbeforeunload = null;
diff -r d9576ab0e512 -r 106b85c1951c styles/default/header.html
--- a/styles/default/header.html	Wed Dec 31 02:25:01 2014 +0200
+++ b/styles/default/header.html	Sat Jan 03 17:11:14 2015 +0200
@@ -1,36 +1,23 @@
 cat << EOT
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="$(echo $LANG | cut -f1 -d_)">
+<html lang="${LANG%%_*}">
 <head>
 	<title>$TITLE</title>
-	<meta charset="utf-8" />
 	<link rel="shortcut icon" href="/styles/$STYLE/favicon.ico" />
-EOT
+$(printf '\t<link rel="stylesheet" type="text/css" href="/%s" />\n' \
+	$(cd /var/www/tazpanel; ls styles/$STYLE/*.css))
 
-for css in $(cd /var/www/tazpanel; find ./styles/$STYLE -iname '*.css' | sed 's|./|/|'); do
-	echo "	<link rel=\"stylesheet\" type=\"text/css\" href=\"$css\" />"
-done
-
-cat << EOT
-	<!-- Function to hide the loading message when page is generated. -->
 	<script type="text/javascript">
-		function showLoading(){
-			document.getElementById("loading").style.display='none';
-		}
-
-		//Ask confirmation on close window during load time
-		window.onbeforeunload =  confirmExit;
-		function confirmExit()
-		{
-			return 1;
-		}
+		function hideLoading(){document.getElementById("loading").style.display='none';}
+		window.onbeforeunload = confirmExit;
+		function confirmExit(){return "$(_ 'Confirm break')";}
 	</script>
 </head>
-<body onload="showLoading()">
+<body onload="hideLoading()">
 
-<div id="header">
+<header>
 	<h1>$TITLE</h1>
-</div>
+</header>
 
 <div id="toolbar">
 	<div id="icons">
diff -r d9576ab0e512 -r 106b85c1951c styles/default/style.css
--- a/styles/default/style.css	Wed Dec 31 02:25:01 2014 +0200
+++ b/styles/default/style.css	Sat Jan 03 17:11:14 2015 +0200
@@ -27,7 +27,7 @@
 
 /* Header and main title */
 
-#header {
+header {
 	height: 40px;
 	/*border-bottom: 4px solid #afafaf;*/
 	background: #222 url(images/logo.png) no-repeat left;
@@ -36,7 +36,7 @@
 	width: 100%;
 }
 
-#header h1 {
+header h1 {
 	margin: 0;
 	padding: 8px 0 0 42px;
 	font-style: italic;
@@ -132,7 +132,7 @@
 	cursor: progress;
 	position: fixed;
 	top: 76px;
-	right: 120px;
+	right: 140px;
 	width: 248px;
 	padding: 4px 4px 2px;
 }
@@ -367,7 +367,7 @@
 
 /* Footer */
 
-#footer {
+footer {
 	/* border-bottom: 1px solid #c1baad; */
 	height: 25px;
 	text-align: center;
@@ -376,8 +376,8 @@
 	color: #bbb;
 }
 
-#footer a { color: #bbb; }
-#footer a:hover { color: #555; }
+footer a { color: #bbb; }
+footer a:hover { color: #555; }
 
 /* HTML5 Meter */
 .meter {