# HG changeset patch # User Aleksej Bobylev # Date 1337255535 -10800 # Node ID 42367a53cf50f0a3959d983ef674621fec9643cf # Parent 3e9acc16f7282786486abe612ac0eaa39a325b35 add visual sections to pages diff -r 3e9acc16f728 -r 42367a53cf50 index.cgi --- a/index.cgi Thu May 17 14:02:41 2012 +0300 +++ b/index.cgi Thu May 17 14:52:15 2012 +0300 @@ -41,13 +41,14 @@ break done } + + # OK status in table ok_status_t() { echo " [ OK ]" } - # # Things to do before displaying the page # @@ -119,6 +120,7 @@ echo '' fi ;; + *\ terminal\ *|*\ cmd\ *) # Cmdline terminal. commands='cat du help ls ping pwd who wget' @@ -126,6 +128,7 @@ TITLE=$(gettext 'TazPanel - Terminal') xhtml_header cat << EOT +
root@$(hostname):~# @@ -157,7 +160,10 @@ eval_gettext 'Unknown command: $cmd' && echo eval_gettext 'Commands: $commands' ;; esac - echo '' ;; + echo '
' + ;; + + *\ top\ *) TITLE=$(gettext 'TazPanel - Process activity') xhtml_header @@ -184,6 +190,7 @@ -e s"#PID.*\([^']\)#\0#"g echo '' ;; + *\ debug\ *) TITLE=$(gettext 'TazPanel - Debug') xhtml_header @@ -194,6 +201,7 @@ EOT ;; + *\ report\ *) TITLE=$(gettext 'TazPanel - System report') [ -d /var/cache/slitaz ] || mkdir -p /var/cache/slitaz @@ -319,6 +327,8 @@ bugs.slitaz.org

EOT ;; + + *) # # Default xHTML content @@ -341,6 +351,7 @@ $(gettext 'Create a report') +

$(gettext 'Summary')

@@ -363,10 +374,14 @@
+
+

$(gettext 'Network status')

$(list_network_interfaces) +
+

$(gettext 'Filesystem usage statistics')

EOT # Disk stats (management is done as hardware.cgi) @@ -396,15 +411,14 @@ cat << EOT -EOT +
- - cat << EOT +

$(gettext 'Panel Activity')

 $(cat $LOG_FILE | tail -n 8 | sort -r | syntax_highlighter activity)
 
- +
EOT ;; esac diff -r 3e9acc16f728 -r 42367a53cf50 installer.cgi --- a/installer.cgi Thu May 17 14:02:41 2012 +0300 +++ b/installer.cgi Thu May 17 14:52:15 2012 +0300 @@ -151,7 +151,7 @@ select_install() { cat < +

$(gettext 'Install')

$(gettext "Install SliTaz on a partition of your hard disk drive. If you \ @@ -162,25 +162,27 @@

$(gettext "Before installation, you may need to create or resize partitions \ on your hard disk drive in order to make space for SliTaz GNU/Linux. You can \ graphically manage your partitions with Gparted")

- -

$(gettext "Install \ + +$(gettext "Install \ SliTaz") +

EOT } select_upgrade() { cat < +

$(gettext 'Upgrade')

$(gettext "Upgrade an already installed SliTaz system on your hard disk \ drive. Your /home /etc /var/www directories will be kept, all other \ directories will be removed. Any additional packages added to your old Slitaz \ system will be updated as long you have an active internet connection.")

- -

$(gettext "Upgrade \ -SliTaz")

+ +$(gettext "Upgrade \ +SliTaz") +
EOT } diff -r 3e9acc16f728 -r 42367a53cf50 network.cgi --- a/network.cgi Thu May 17 14:02:41 2012 +0300 +++ b/network.cgi Thu May 17 14:52:15 2012 +0300 @@ -147,6 +147,7 @@

$(gettext "Here you can configure a wired connection using DHCP to \ automatically get a random IP or configure a static/fixed IP")

+

$(gettext 'Configuration')

@@ -184,7 +185,9 @@ +
+

$(gettext 'Configuration file')

$(gettext "These values are the ethernet settings in the main \ @@ -194,6 +197,7 @@ $(gettext 'Manual Edit') +

EOT ;; *\ wifi\ *) @@ -237,6 +241,7 @@ WIFI_KEY_TYPE="$(GET keytype)" fi cat << EOT +

$(gettext 'Connection')

@@ -262,7 +267,9 @@ $(table_end)
+
+

$(gettext 'Configuration file')

$(gettext "These values are the wifi settings in the main /etc/network.conf \ @@ -272,10 +279,13 @@ $(gettext 'Manual Edit') +

+

$(gettext 'Output of iwconfig')

$(iwconfig)
+
EOT ;; *) @@ -287,6 +297,7 @@

$(gettext 'Manage network connections and services')

+
+

$(gettext 'Hosts')

$(cat /etc/hosts)
$(gettext 'Edit hosts') +
+

$(gettext 'Hostname')

+
- +

$(gettext 'Output of ifconfig')

$(ifconfig)
+
+

$(gettext 'Routing table')

$(route -n)
+
+

$(gettext 'Domain name resolution')

$(cat /etc/resolv.conf)
+
+

$(gettext 'ARP table')

$(arp)
+
+

$(gettext 'IP Connections')

 $(netstat -anp 2> /dev/null | sed -e '/UNIX domain sockets/,$d' \
 -e 's#\([0-9]*\)/#\1/#')
 
+
EOT ;; esac diff -r 3e9acc16f728 -r 42367a53cf50 settings.cgi --- a/settings.cgi Thu May 17 14:02:41 2012 +0300 +++ b/settings.cgi Thu May 17 14:52:15 2012 +0300 @@ -146,6 +146,7 @@

+

$(gettext 'Add a new user')

@@ -159,14 +160,19 @@
+
+

$(gettext 'Current user sessions')

$(who)
+
+

$(gettext 'Last user sessions')

$(last)
+
EOT ;; *) @@ -183,6 +189,7 @@ $(gettext 'Manage users') +

$(gettext 'System time')

@@ -192,11 +199,13 @@
$(gettext 'Sync online') $(gettext 'Set hardware clock') +
EOT # # Locale settings # cat << EOT +

$(gettext 'System language')

EOT @@ -224,7 +233,9 @@ +

+

$(gettext 'Console keymap')

EOT @@ -270,7 +281,9 @@ +

+

$(gettext 'Panel configuration')

@@ -300,6 +313,7 @@ $(gettext 'TazPanel provides a debuging mode and page:') debug

+
EOT ;; esac diff -r 3e9acc16f728 -r 42367a53cf50 styles/default/style.css --- a/styles/default/style.css Thu May 17 14:02:41 2012 +0300 +++ b/styles/default/style.css Thu May 17 14:52:15 2012 +0300 @@ -144,6 +144,7 @@ #sidebar h4 { margin: 0 0 2px 12px; } #sidebar ul { list-style-type: none; padding: 0; } + /* Content */ #content { margin: 20px; } @@ -221,6 +222,7 @@ float: right; } + /* Table */ table { @@ -344,9 +346,9 @@ /* Round corner */ #loading, table, pre, input[type=submit], .debug, .box, -.button, div.scroll, .outbox { - /*-moz-border-radius: 4px; - -webkit-border-radius: 4px; */ +.button, div.scroll, .outbox, section { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; border-radius: 4px; } @@ -399,3 +401,17 @@ -ms-transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out; } + +section { + margin: 20pt -0.7em; + padding: 0.7em; + background-color: #fdfdfd; + border: 1px solid #ddd; + border-radius: 1em; + /*box-shadow: 0 0 3pt 2pt #eee;*/ +} +section h4 { + margin: 0 0 0.5em 0; +} +section h3 { + margin: 0 0 0.5em 0;