# HG changeset patch # User Christophe Lincoln # Date 1302569220 -7200 # Node ID 95dc2475f4ae905ec5f69034f93a3ec9426a6970 # Parent 8f60cbb66259c773a506493f08ba4b985859826c remove debug_info and put code in header diff -r 8f60cbb66259 -r 95dc2475f4ae boot.cgi --- a/boot.cgi Tue Apr 12 02:40:59 2011 +0200 +++ b/boot.cgi Tue Apr 12 02:47:00 2011 +0200 @@ -44,7 +44,7 @@ . /etc/rcS.conf TITLE="- Boot" xhtml_header - debug_info + cat << EOT

`gettext "Manage daemons"`

@@ -138,7 +138,7 @@ . /etc/rcS.conf TITLE="- Boot" xhtml_header - debug_info + cat << EOT

`gettext "Boot & Start services"`

diff -r 8f60cbb66259 -r 95dc2475f4ae hardware.cgi --- a/hardware.cgi Tue Apr 12 02:40:59 2011 +0200 +++ b/hardware.cgi Tue Apr 12 02:47:00 2011 +0200 @@ -75,7 +75,7 @@ # Default to summary with mounted filesystem, loaded modules # xhtml_header - debug_info + cat << EOT

`gettext "Drivers & Devices"`

diff -r 8f60cbb66259 -r 95dc2475f4ae index.cgi --- a/index.cgi Tue Apr 12 02:40:59 2011 +0200 +++ b/index.cgi Tue Apr 12 02:47:00 2011 +0200 @@ -92,7 +92,7 @@ # Default xHTML content # xhtml_header - debug_info + case "$QUERY_STRING" in gen-locale=*) new_locale=${QUERY_STRING#gen-locale=} ;; diff -r 8f60cbb66259 -r 95dc2475f4ae lib/libtazpanel --- a/lib/libtazpanel Tue Apr 12 02:40:59 2011 +0200 +++ b/lib/libtazpanel Tue Apr 12 02:47:00 2011 +0200 @@ -36,13 +36,6 @@ done } -# DEBUG mode -debug_info() { - if [ $DEBUG == "1" ]; then - echo "
$REQUEST_METHOD ${QUERY_STRING}
" - fi -} - # LOG activities log() { grep ^[a-zA-Z0-9] | sed s'/\.*\]//' >> $LOG_FILE @@ -105,6 +98,9 @@ xhtml_header() { cat ${PANEL}$HEADER | sed s/'- %TITLE%'/"$TITLE"/ + if [ $DEBUG == "1" ]; then + echo "
$REQUEST_METHOD ${QUERY_STRING}
" + fi } xhtml_footer() { diff -r 8f60cbb66259 -r 95dc2475f4ae network.cgi --- a/network.cgi Tue Apr 12 02:40:59 2011 +0200 +++ b/network.cgi Tue Apr 12 02:47:00 2011 +0200 @@ -39,7 +39,7 @@ eth) # Wired connections settings xhtml_header - debug_info + cat << EOT

`gettext "Ethernet connection`

@@ -50,7 +50,7 @@
 	wifi)
 		# Wireless connections settings
 		xhtml_header
-		debug_info
+		
 		cat << EOT
 

`gettext "Wireless connection`

@@ -61,7 +61,7 @@
 	*)
 		# Main Network page starting with a summary
 		xhtml_header
-		debug_info
+		
 		cat << EOT
 

`gettext "Networking`

diff -r 8f60cbb66259 -r 95dc2475f4ae pkgs.cgi --- a/pkgs.cgi Tue Apr 12 02:40:59 2011 +0200 +++ b/pkgs.cgi Tue Apr 12 02:47:00 2011 +0200 @@ -24,7 +24,7 @@ # xHTML 5 header with special side bar fo categories. TITLE="- Packages" xhtml_header | sed 's/id="content"/id="content-sidebar"/' -debug_info + # We need packages information for list and search parse_packages_desc() { diff -r 8f60cbb66259 -r 95dc2475f4ae settings.cgi --- a/settings.cgi Tue Apr 12 02:40:59 2011 +0200 +++ b/settings.cgi Tue Apr 12 02:47:00 2011 +0200 @@ -79,7 +79,7 @@ # Default xHTML content # xhtml_header -debug_info + cat << EOT

`gettext "System settings"`

diff -r 8f60cbb66259 -r 95dc2475f4ae tazpanel.conf --- a/tazpanel.conf Tue Apr 12 02:40:59 2011 +0200 +++ b/tazpanel.conf Tue Apr 12 02:47:00 2011 +0200 @@ -13,7 +13,7 @@ FOOTER="/styles/$STYLE/footer.html" # Display some debug messages -DEBUG="0" +DEBUG="1" # Activity log file LOG_FILE="/var/log/slitaz/tazpanel.log"