# HG changeset patch # User Christophe Lincoln # Date 1302575075 -7200 # Node ID 7ac8e561d0a5f12df45a56d7ce0206f994b00b6d # Parent 1780ef64bcd5e9fcaabe12daf4ba7ea87c858495 Show Panel activity and log a few more things to test (we need date in log() and reverse output on main page) diff -r 1780ef64bcd5 -r 7ac8e561d0a5 boot.cgi --- a/boot.cgi Tue Apr 12 03:52:19 2011 +0200 +++ b/boot.cgi Tue Apr 12 04:24:35 2011 +0200 @@ -94,8 +94,16 @@ gettext "Busybox DHCP server" ;; syslogd|klogd) gettext "Linux Kernel log daemon" ;; - crond|dnsd|tftpd|inetd|zcip) - gettext "Daemon powered by BusyBox" ;; + crond) + gettext "Execute scheduled commands" ;; + dnsd) + gettext "Small static DNS server daemon" ;; + tftpd) + gettext "Transfer a file on tftp request" ;; + inetd) + gettext "Listen for network connections and launch programs" ;; + zcip) + gettext "Manage a ZeroConf IPv4 link-local address" ;; *) # Descrition from receipt [ -d "$LOCALSTATE/installed/$name" ] && pkg=$name diff -r 1780ef64bcd5 -r 7ac8e561d0a5 index.cgi --- a/index.cgi Tue Apr 12 03:52:19 2011 +0200 +++ b/index.cgi Tue Apr 12 04:24:35 2011 +0200 @@ -46,7 +46,6 @@ echo "

$WANT

" echo '
'
 		# Handle file type by extension as a Web Server does it.
-		# HTML entities: -e 's|&|\&|g' -e 's|<|\<|g' -e 's|>|\>|g'
 		case "$WANT" in
 			*.conf|*.lst)
 				cat $WANT | syntax_highlighter conf ;;
@@ -123,6 +122,11 @@
 `df -h | grep ^/dev`
 
+

`gettext "Panel Activity"`

+
+$(cat $LOG_FILE | tail -n 6)
+
+

`gettext "Panel settings"`

diff -r 1780ef64bcd5 -r 7ac8e561d0a5 lib/libtazpanel --- a/lib/libtazpanel Tue Apr 12 03:52:19 2011 +0200 +++ b/lib/libtazpanel Tue Apr 12 04:24:35 2011 +0200 @@ -38,6 +38,7 @@ } # Syntax highlighting for config file and SHell scripts +# HTML entities: -e 's|&|\&|g' -e 's|<|\<|g' -e 's|>|\>|g' syntax_highlighter() { case $1 in conf) diff -r 1780ef64bcd5 -r 7ac8e561d0a5 network.cgi --- a/network.cgi Tue Apr 12 03:52:19 2011 +0200 +++ b/network.cgi Tue Apr 12 04:24:35 2011 +0200 @@ -23,10 +23,10 @@ start) # Here we sleep a bit to let udhcp get the lease before reloading # page with status - /etc/init.d/network.sh start >/dev/null + /etc/init.d/network.sh start | log sleep 2 ;; stop) - /etc/init.d/network.sh stop >/dev/null ;; + /etc/init.d/network.sh stop | log ;; *) continue ;; esac diff -r 1780ef64bcd5 -r 7ac8e561d0a5 pkgs.cgi --- a/pkgs.cgi Tue Apr 12 03:52:19 2011 +0200 +++ b/pkgs.cgi Tue Apr 12 04:24:35 2011 +0200 @@ -287,6 +287,7 @@
 EOT
+		echo "$(date +%Y%M%d-%H:%M) Recharging packages list" | log
 		tazpkg recharge | filter_tazpkg_msgs
 		cat << EOT
 
diff -r 1780ef64bcd5 -r 7ac8e561d0a5 styles/default/style.css --- a/styles/default/style.css Tue Apr 12 03:52:19 2011 +0200 +++ b/styles/default/style.css Tue Apr 12 04:24:35 2011 +0200 @@ -183,7 +183,7 @@ /* syntax_highlighter */ span.conf-comment { color: #666; } -span.conf-var { color: #1f1500; } +span.conf-var { color: #392600; } span.conf-val, span.sh-val { color: #f35a00; } span.sh-comment { color: #b20000; }