# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1372579005 -7200
# Node ID 6e181d55abdc5c87709b47b726f5cd8e28a985a0
# Parent  d821006e027967c8d716da70ba657e87bb5dfa91
Reorder boot & network menus

diff -r d821006e0279 -r 6e181d55abdc boot.cgi
--- a/boot.cgi	Sat Jun 29 21:29:35 2013 +0200
+++ b/boot.cgi	Sun Jun 30 09:56:45 2013 +0200
@@ -107,6 +107,7 @@
 			cfg=""
 			grep -qi "^${name}_OPTIONS=" /etc/daemons.conf && cfg="options|$cfg"
 			[ -s /etc/$name.conf ] && cfg="edit|$cfg"
+			[ -s /etc/$name/$name.conf ] && cfg="edit::/etc/$name/$name.conf|$cfg"
 			[ -n "$(which $name)" ] && cfg="man|help|$cfg"
 			case "$name" in
 				firewall)
diff -r d821006e0279 -r 6e181d55abdc styles/default/header.html
--- a/styles/default/header.html	Sat Jun 29 21:29:35 2013 +0200
+++ b/styles/default/header.html	Sun Jun 30 09:56:45 2013 +0200
@@ -41,12 +41,12 @@
 		</li>
 		<li><a href="/network.cgi">$(gettext 'Network')</a>
 			<ul>
+				<li><a href="/index.cgi?file=/etc/network.conf"><img
+					src="/styles/default/images/edit.png" />$(gettext 'Config file')</a></li>
 				<li><a href="/network.cgi?eth"><img
 					src="/styles/default/images/ethernet.png" />$(gettext 'Ethernet')</a></li>
 				<li><a href="/network.cgi?wifi"><img
 					src="/styles/default/images/wireless.png" />$(gettext 'Wireless')</a></li>
-				<li><a href="/index.cgi?file=/etc/network.conf"><img
-					src="/styles/default/images/edit.png" />$(gettext 'Config file')</a></li>
 				$(for i in menu.d/network/* ; do [ -f $i ] && . $i menu $i ; done)
 			</ul>
 		</li>
@@ -61,12 +61,12 @@
 		</li>
 		<li><a href="/boot.cgi">$(gettext 'Boot')</a>
 			<ul>
+				<li><a href="/boot.cgi?grub"><img
+					src="/styles/default/images/tux.png" />$(gettext 'Boot loader')</a></li>
 				<li><a href="/boot.cgi?log"><img
 					src="/styles/default/images/text.png" />$(gettext 'Boot logs')</a></li>
 				<li><a href="/boot.cgi?daemons"><img
 					src="/styles/default/images/recharge.png" />$(gettext 'Manage daemons')</a></li>
-				<li><a href="/boot.cgi?grub"><img
-					src="/styles/default/images/tux.png" />$(gettext 'Boot loader')</a></li>
 				$(for i in menu.d/boot/* ; do [ -f $i ] && . $i menu $i ; done)
 			</ul>
 		</li>