# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1441008565 -10800
# Node ID 71e797397c584a6b3a2e8f55dadcbd2769dd3976
# Parent  082b622cb7819eb45981557f6d95cd480f2ef52d
html header cache: change title as well as sub-title

diff -r 082b622cb781 -r 71e797397c58 lib/libtazpanel
--- a/lib/libtazpanel	Sun Aug 30 23:46:37 2015 +0300
+++ b/lib/libtazpanel	Mon Aug 31 11:09:25 2015 +0300
@@ -260,7 +260,6 @@
 
 	# Cache header
 	if [ ! -f "$header" ]; then
-		SUBTITLE='@@SUBTITLE@@'
 		. ${PANEL}$HEADER > "$header"
 		cat >> "$header" <<EOT
 <script type="text/javascript">
@@ -269,7 +268,7 @@
 </script>
 EOT
 	fi
-	sed "s|@@SUBTITLE@@|$subtitle|" "$header"
+	sed "s|@@TITLE@@|$TITLE|; s|@@SUBTITLE@@|$subtitle|" "$header"
 
 	# Show debug output
 	if [ "$DEBUG" -eq 1 ]; then
diff -r 082b622cb781 -r 71e797397c58 styles/default/header.html
--- a/styles/default/header.html	Sun Aug 30 23:46:37 2015 +0300
+++ b/styles/default/header.html	Mon Aug 31 11:09:25 2015 +0300
@@ -35,8 +35,8 @@
 <div id="confirmBreak" style="display:none">$(_ 'Confirm break')</div>
 
 <header>
-	<h1 data-icon="tazpanel">$TITLE </h1>
-	<div>$SUBTITLE</div>
+	<h1 data-icon="tazpanel">@@TITLE@@ </h1>
+	<div>@@SUBTITLE@@</div>
 </header>
 
 <nav id="toolbar">
@@ -55,7 +55,7 @@
    <span>$(_ 'Network')</span>
    <menu>
     <li><a data-icon="info" href="network.cgi">$(_ 'Summary')</a></li>
-    <li><a data-icon="conf" href="index.cgi?file=/etc/network.conf&action=edit">$(_ 'Config file')</a></li>
+    <li><a data-icon="conf" href="index.cgi?file=/etc/network.conf&amp;action=edit">$(_ 'Config file')</a></li>
     <li><a data-icon="eth"  href="network.cgi?eth">$(_ 'Ethernet')</a></li>
     <li><a data-icon="wifi" href="network.cgi?wifi">$(_ 'Wireless')</a></li>
     $(extra_menu network)