# HG changeset patch # User Christophe Lincoln # Date 1302132127 -7200 # Node ID a7b1d69663c34fb497f0299275dbf8ff98feebf8 # Parent 167a97495e1c9ab16116a25409f12fac4e33cda1 Add settings.cgi and split user config from index.cgi, add need CSS stuff and up POT diff -r 167a97495e1c -r a7b1d69663c3 Makefile --- a/Makefile Wed Apr 06 19:02:07 2011 +0200 +++ b/Makefile Thu Apr 07 01:22:07 2011 +0200 @@ -3,7 +3,7 @@ PREFIX?=/usr SYSCONFDIR?=/etc/slitaz DESTDIR?= -LINGUAS?=pt +LINGUAS?=fr PANEL?=/var/www/tazpanel VERSION:=$(shell grep ^VERSION tazpanel | cut -d '=' -f 2) @@ -20,7 +20,7 @@ msgmerge: @for l in $(LINGUAS); do \ echo -n "Updating $$l po file."; \ - msgmerge -U po/$$l.po po/tazpanel-pkgs.pot; \ + msgmerge -U po/$$l.po po/tazpanel.pot; \ done; msgfmt: @@ -46,4 +46,5 @@ clean: rm -rf po/mo + rm -f po/*.*~ diff -r 167a97495e1c -r a7b1d69663c3 index.cgi --- a/index.cgi Wed Apr 06 19:02:07 2011 +0200 +++ b/index.cgi Thu Apr 07 01:22:07 2011 +0200 @@ -4,6 +4,8 @@ # command so we are faster and dont load unneeded function. If nececarry # you can use the lib/ dir to handle external resources. # +# Copyright (C) 2011 SliTaz GNU/Linux - GNU gpl v3 +# echo "Content-Type: text/html" echo "" @@ -43,95 +45,6 @@ EOT ;; - users|user=*) - # - # Manage system user accounts - # - TITLE="- Users" - xhtml_header - cmdline=`echo ${QUERY_STRING#user*=} | sed s'/&/ /g'` - # Parse cmdline - for opt in $cmdline - do - case $opt in - adduser=*) - user=${opt#adduser=} - cmd=adduser ;; - deluser=*) - user=${opt#deluser=} - deluser $user ;; - passwd=*) - pass=${opt#passwd=} ;; - esac - done - case "$cmd" in - adduser) - echo "$user" - echo $pass - adduser -D $user - echo "$pass" | chpasswd - for g in audio cdrom floppy video - do - addgroup $user $g - done ;; - *) continue ;; - esac - cat << EOT -
-

`gettext "Manage users"`

-

`gettext "Manage human users on your SliTaz system"`

-
-
-EOT - table_start - cat << EOT - - `gettext "Login"` - `gettext "User ID"` - `gettext "Name"` - `gettext "Home"` - `gettext "SHell"` - -EOT - for i in `cat /etc/passwd | cut -d ":" -f 1` - do - if [ -d /home/$i ]; then - login=$i - uid=`cat /etc/passwd | grep $i | cut -d ":" -f 3` - gid=`cat /etc/passwd | grep $i | cut -d ":" -f 4` - name=`cat /etc/passwd | grep $i | cut -d ":" -f 5 | \ - sed s/,,,//` - home=`cat /etc/passwd | grep $i | cut -d ":" -f 6` - shell=`cat /etc/passwd | grep $i | cut -d ":" -f 7` - echo '' - echo " - - $login" - echo "$uid:$gid" - echo "$name" - echo "$home" - echo "$shell" - echo '' - fi - done - table_end - cat << EOT -
- -
-
- -

`gettext "Add a new user"`

-
- -

`gettext "User login:"`

-

-

`gettext "User password:"`

-

- -
-EOT - ;; hardware) # # Hardware drivers, devices, filesystem, screen @@ -159,6 +72,12 @@ # Default xHTML content # xhtml_header + case "$QUERY_STRING" in + gen-locale=*) + new_locale=${QUERY_STRING#gen-locale=} ;; + rdate) + echo "" ;; + esac cat << EOT

`gettext "Host:"` `hostname`

diff -r 167a97495e1c -r a7b1d69663c3 network.cgi --- a/network.cgi Wed Apr 06 19:02:07 2011 +0200 +++ b/network.cgi Thu Apr 07 01:22:07 2011 +0200 @@ -16,6 +16,8 @@ TEXTDOMAIN='tazpanel' export TEXTDOMAIN +TITLE="- Network" + # Actions commands before page is displayed case "$QUERY_STRING" in start) diff -r 167a97495e1c -r a7b1d69663c3 po/fr.mo Binary file po/fr.mo has changed diff -r 167a97495e1c -r a7b1d69663c3 po/fr.po --- a/po/fr.po Wed Apr 06 19:02:07 2011 +0200 +++ b/po/fr.po Thu Apr 07 01:22:07 2011 +0200 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: TazPanel 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-06 06:09+0200\n" -"PO-Revision-Date: 2011-04-06 06:11+0200\n" -"Last-Translator: Linux User \n" +"POT-Creation-Date: 2011-04-06 20:37+0200\n" +"PO-Revision-Date: 2011-04-06 20:40+0100\n" +"Last-Translator: Christophe Lincoln \n" "Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ #: tazpanel:33 msgid "TazPanel Authentication" -msgstr "" +msgstr "Mot de passe de TazPanel" #: tazpanel:36 msgid "Stopping TazPanel web server..." @@ -41,245 +41,271 @@ msgid "Usage:" msgstr "" -#: index.cgi:38 -msgid "Interface" -msgstr "" - -#: index.cgi:39 index.cgi:133 pkgs.cgi:117 -msgid "Name" -msgstr "" - -#: index.cgi:40 -msgid "Status" -msgstr "" - -#: index.cgi:41 -msgid "IP Address" -msgstr "" - -#: index.cgi:76 +#: index.cgi:43 msgid "Boot & startup" msgstr "" -#: index.cgi:78 +#: index.cgi:45 msgid "Everything that appends before user login." msgstr "" -#: index.cgi:82 +#: index.cgi:49 msgid "Kernel cmdline" msgstr "" -#: index.cgi:123 +#: index.cgi:90 msgid "Manage users" msgstr "" -#: index.cgi:124 +#: index.cgi:91 msgid "Manage human users on your SliTaz system" msgstr "" -#: index.cgi:131 +#: index.cgi:98 msgid "Login" msgstr "" -#: index.cgi:132 +#: index.cgi:99 msgid "User ID" msgstr "" -#: index.cgi:134 +#: index.cgi:100 +#: pkgs.cgi:118 +#: lib/libtazpanel:40 +msgid "Name" +msgstr "Nom" + +#: index.cgi:101 msgid "Home" msgstr "" -#: index.cgi:135 +#: index.cgi:102 msgid "SHell" msgstr "" -#: index.cgi:162 +#: index.cgi:129 msgid "Delete selected user" msgstr "" -#: index.cgi:166 +#: index.cgi:133 msgid "Add a new user" msgstr "" -#: index.cgi:169 +#: index.cgi:136 msgid "User login:" msgstr "" -#: index.cgi:171 +#: index.cgi:138 msgid "User password:" msgstr "" -#: index.cgi:173 +#: index.cgi:140 msgid "Create user" -msgstr "" +msgstr "Creer un utilisateur" -#: index.cgi:185 network.cgi:32 -msgid "Networking" -msgstr "" - -#: index.cgi:186 network.cgi:33 -msgid "Manage network connection and services" -msgstr "" - -#: index.cgi:205 +#: index.cgi:152 msgid "Drivers & Devices" msgstr "" -#: index.cgi:206 +#: index.cgi:153 msgid "Manage your computer hardware" msgstr "" -#: index.cgi:226 +#: index.cgi:179 msgid "Host:" msgstr "" -#: index.cgi:227 +#: index.cgi:180 msgid "SliTaz administration et configuration Panel" msgstr "" -#: index.cgi:230 pkgs.cgi:390 +#: index.cgi:183 +#: pkgs.cgi:476 msgid "Summary" -msgstr "" +msgstr "Resume" -#: index.cgi:233 +#: index.cgi:186 msgid "Uptime:" msgstr "" -#: index.cgi:236 +#: index.cgi:189 msgid "Memory in Mb" msgstr "" -#: index.cgi:243 +#: index.cgi:196 msgid "Network status" msgstr "" -#: index.cgi:246 +#: index.cgi:199 msgid "Filesystem usage statistics" msgstr "" -#: pkgs.cgi:63 +#: index.cgi:204 +msgid "System language" +msgstr "" + +#: index.cgi:215 +#, sh-format +msgid "" +"You must logout and login again your current\n" +"\t\t\t\tsession to use $new_locale language." +msgstr "" + +#: index.cgi:218 +#, sh-format +msgid "Current system locales: " +msgstr "" + +#: index.cgi:224 +msgid "Avalaible locales:" +msgstr "" + +#: index.cgi:229 +msgid "Generated and use" +msgstr "" + +#: pkgs.cgi:64 msgid "Last recharge : " msgstr "" -#: pkgs.cgi:73 +#: pkgs.cgi:74 msgid "Installed packages : " msgstr "" -#: pkgs.cgi:75 +#: pkgs.cgi:76 msgid "Mirrored packages : " msgstr "" -#: pkgs.cgi:77 +#: pkgs.cgi:78 msgid "Upgradeable packages : " msgstr "" -#: pkgs.cgi:79 +#: pkgs.cgi:80 msgid "Installed files : " msgstr "" -#: pkgs.cgi:81 +#: pkgs.cgi:82 msgid "Blocked packages : " msgstr "" -#: pkgs.cgi:107 +#: pkgs.cgi:108 msgid "Search" msgstr "" -#: pkgs.cgi:118 +#: pkgs.cgi:119 msgid "Version" msgstr "" -#: pkgs.cgi:119 +#: pkgs.cgi:120 msgid "Description" msgstr "" -#: pkgs.cgi:120 +#: pkgs.cgi:121 msgid "Web" msgstr "" -#: pkgs.cgi:128 pkgs.cgi:182 +#: pkgs.cgi:152 +#: pkgs.cgi:167 +#: pkgs.cgi:185 +#: pkgs.cgi:204 +msgid "Selection:" +msgstr "" + +#: pkgs.cgi:156 +#: pkgs.cgi:172 +#: pkgs.cgi:191 +#: pkgs.cgi:210 +msgid "List:" +msgstr "" + +#: pkgs.cgi:176 +#: pkgs.cgi:195 +#: pkgs.cgi:213 +#: pkgs.cgi:230 +#: pkgs.cgi:312 +#: pkgs.cgi:369 +#: pkgs.cgi:400 +#: pkgs.cgi:484 msgid "My packages" msgstr "" -#: pkgs.cgi:129 pkgs.cgi:213 -msgid "All packages" +#: pkgs.cgi:188 +#: pkgs.cgi:207 +msgid "Toogle all" msgstr "" -#: pkgs.cgi:130 +#: pkgs.cgi:265 +msgid "Category:" +msgstr "" + +#: pkgs.cgi:284 +msgid "Search packages" +msgstr "" + +#: pkgs.cgi:300 +msgid "Recharge" +msgstr "" + +#: pkgs.cgi:305 +msgid "" +"Recharge will check for new or updated packages...\n" +"please wait" +msgstr "" + +#: pkgs.cgi:321 +msgid "Packages lists are up-to-date" +msgstr "" + +#: pkgs.cgi:328 +msgid "Upgradeable packages" +msgstr "" + +#: pkgs.cgi:363 +msgid "Performing task on packages... please wait" +msgstr "" + +#: pkgs.cgi:390 +msgid "Package" +msgstr "" + +#: pkgs.cgi:394 +msgid "Remove" +msgstr "" + +#: pkgs.cgi:416 +msgid "Installed files:" +msgstr "" + +#: pkgs.cgi:440 +#: pkgs.cgi:490 +msgid "Configuration" +msgstr "" + +#: pkgs.cgi:442 +msgid "Tazpkg configuration and settings" +msgstr "" + +#: pkgs.cgi:447 +msgid "Packages in the cache:" +msgstr "" + +#: pkgs.cgi:454 +msgid "Current mirror list" +msgstr "" + +#: pkgs.cgi:478 +msgid "Overview of all installed and mirrored packages" +msgstr "" + +#: pkgs.cgi:486 msgid "Recharge list" msgstr "" -#: pkgs.cgi:131 -msgid "Upgrade" +#: pkgs.cgi:488 +msgid "Check upgrade" msgstr "" -#: pkgs.cgi:132 pkgs.cgi:354 -msgid "Configuration" -msgstr "" - -#: pkgs.cgi:141 pkgs.cgi:151 pkgs.cgi:162 -msgid "Selection:" -msgstr "" - -#: pkgs.cgi:165 -msgid "Toogle all" -msgstr "" - -#: pkgs.cgi:232 -msgid "Search packages" -msgstr "" - -#: pkgs.cgi:248 -msgid "Recharge" -msgstr "" - -#: pkgs.cgi:252 -msgid "" -"Recharge will check for new or updated packages...\n" -"\t\tplease wait" -msgstr "" - -#: pkgs.cgi:261 -msgid "Packages lists are up-to-date" -msgstr "" - -#: pkgs.cgi:268 -msgid "Upgradeable packages" -msgstr "" - -#: pkgs.cgi:297 -msgid "Performing task on packages" -msgstr "" - -#: pkgs.cgi:314 -msgid "Package info" -msgstr "" - -#: pkgs.cgi:316 -msgid "Detailled information on:" -msgstr "" - -#: pkgs.cgi:330 -msgid "Installed files" -msgstr "" - -#: pkgs.cgi:356 -msgid "Tazpkg configuration and settings" -msgstr "" - -#: pkgs.cgi:361 -msgid "Packages in the cache:" -msgstr "" - -#: pkgs.cgi:368 -msgid "Current mirror list" -msgstr "" - -#: pkgs.cgi:392 -msgid "Overview of all installed and mirrored packages" -msgstr "" - -#: pkgs.cgi:397 +#: pkgs.cgi:492 msgid "Latest log entries" msgstr "" @@ -337,3 +363,48 @@ #: live.cgi:99 msgid "generate" msgstr "" + +#: network.cgi:41 +msgid "Ethernet connection" +msgstr "" + +#: network.cgi:51 +msgid "Wireless connection" +msgstr "" + +#: network.cgi:61 +msgid "Networking" +msgstr "" + +#: network.cgi:63 +msgid "Manage network connection and services" +msgstr "" + +#: network.cgi:67 +msgid "Connection:" +msgstr "" + +#: network.cgi:68 +msgid "Start" +msgstr "" + +#: network.cgi:69 +msgid "Stop" +msgstr "" + +#: network.cgi:75 +msgid "Output of ifconfig" +msgstr "" + +#: lib/libtazpanel:39 +msgid "Interface" +msgstr "" + +#: lib/libtazpanel:41 +msgid "Status" +msgstr "" + +#: lib/libtazpanel:42 +msgid "IP Address" +msgstr "" + diff -r 167a97495e1c -r a7b1d69663c3 po/tazpanel.pot --- a/po/tazpanel.pot Wed Apr 06 19:02:07 2011 +0200 +++ b/po/tazpanel.pot Thu Apr 07 01:22:07 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazPanel 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-06 06:15+0200\n" +"POT-Creation-Date: 2011-04-06 20:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,225 +41,254 @@ msgid "Usage:" msgstr "" -#: index.cgi:34 +#: index.cgi:43 msgid "Boot & startup" msgstr "" -#: index.cgi:36 +#: index.cgi:45 msgid "Everything that appends before user login." msgstr "" -#: index.cgi:40 +#: index.cgi:49 msgid "Kernel cmdline" msgstr "" -#: index.cgi:81 +#: index.cgi:90 msgid "Manage users" msgstr "" -#: index.cgi:82 +#: index.cgi:91 msgid "Manage human users on your SliTaz system" msgstr "" -#: index.cgi:89 +#: index.cgi:98 msgid "Login" msgstr "" -#: index.cgi:90 +#: index.cgi:99 msgid "User ID" msgstr "" -#: index.cgi:91 pkgs.cgi:117 lib/libtazpanel:40 +#: index.cgi:100 pkgs.cgi:118 lib/libtazpanel:40 msgid "Name" msgstr "" -#: index.cgi:92 +#: index.cgi:101 msgid "Home" msgstr "" -#: index.cgi:93 +#: index.cgi:102 msgid "SHell" msgstr "" -#: index.cgi:120 +#: index.cgi:129 msgid "Delete selected user" msgstr "" -#: index.cgi:124 +#: index.cgi:133 msgid "Add a new user" msgstr "" -#: index.cgi:127 +#: index.cgi:136 msgid "User login:" msgstr "" -#: index.cgi:129 +#: index.cgi:138 msgid "User password:" msgstr "" -#: index.cgi:131 +#: index.cgi:140 msgid "Create user" msgstr "" -#: index.cgi:143 +#: index.cgi:152 msgid "Drivers & Devices" msgstr "" -#: index.cgi:144 +#: index.cgi:153 msgid "Manage your computer hardware" msgstr "" -#: index.cgi:164 +#: index.cgi:179 msgid "Host:" msgstr "" -#: index.cgi:165 +#: index.cgi:180 msgid "SliTaz administration et configuration Panel" msgstr "" -#: index.cgi:168 pkgs.cgi:390 +#: index.cgi:183 pkgs.cgi:476 msgid "Summary" msgstr "" -#: index.cgi:171 +#: index.cgi:186 msgid "Uptime:" msgstr "" -#: index.cgi:174 +#: index.cgi:189 msgid "Memory in Mb" msgstr "" -#: index.cgi:181 +#: index.cgi:196 msgid "Network status" msgstr "" -#: index.cgi:184 +#: index.cgi:199 msgid "Filesystem usage statistics" msgstr "" -#: pkgs.cgi:63 +#: index.cgi:204 +msgid "System language" +msgstr "" + +#: index.cgi:215 +#, sh-format +msgid "" +"You must logout and login again your current\n" +"\t\t\t\tsession to use $new_locale language." +msgstr "" + +#: index.cgi:218 +#, sh-format +msgid "Current system locales: " +msgstr "" + +#: index.cgi:224 +msgid "Avalaible locales:" +msgstr "" + +#: index.cgi:229 +msgid "Generated and use" +msgstr "" + +#: pkgs.cgi:64 msgid "Last recharge : " msgstr "" -#: pkgs.cgi:73 +#: pkgs.cgi:74 msgid "Installed packages : " msgstr "" -#: pkgs.cgi:75 +#: pkgs.cgi:76 msgid "Mirrored packages : " msgstr "" -#: pkgs.cgi:77 +#: pkgs.cgi:78 msgid "Upgradeable packages : " msgstr "" -#: pkgs.cgi:79 +#: pkgs.cgi:80 msgid "Installed files : " msgstr "" -#: pkgs.cgi:81 +#: pkgs.cgi:82 msgid "Blocked packages : " msgstr "" -#: pkgs.cgi:107 +#: pkgs.cgi:108 msgid "Search" msgstr "" -#: pkgs.cgi:118 +#: pkgs.cgi:119 msgid "Version" msgstr "" -#: pkgs.cgi:119 +#: pkgs.cgi:120 msgid "Description" msgstr "" -#: pkgs.cgi:120 +#: pkgs.cgi:121 msgid "Web" msgstr "" -#: pkgs.cgi:128 pkgs.cgi:182 +#: pkgs.cgi:152 pkgs.cgi:167 pkgs.cgi:185 pkgs.cgi:204 +msgid "Selection:" +msgstr "" + +#: pkgs.cgi:156 pkgs.cgi:172 pkgs.cgi:191 pkgs.cgi:210 +msgid "List:" +msgstr "" + +#: pkgs.cgi:176 pkgs.cgi:195 pkgs.cgi:213 pkgs.cgi:230 pkgs.cgi:312 +#: pkgs.cgi:369 pkgs.cgi:400 pkgs.cgi:484 msgid "My packages" msgstr "" -#: pkgs.cgi:129 pkgs.cgi:213 -msgid "All packages" +#: pkgs.cgi:188 pkgs.cgi:207 +msgid "Toogle all" msgstr "" -#: pkgs.cgi:130 +#: pkgs.cgi:265 +msgid "Category:" +msgstr "" + +#: pkgs.cgi:284 +msgid "Search packages" +msgstr "" + +#: pkgs.cgi:300 +msgid "Recharge" +msgstr "" + +#: pkgs.cgi:305 +msgid "" +"Recharge will check for new or updated packages...\n" +"please wait" +msgstr "" + +#: pkgs.cgi:321 +msgid "Packages lists are up-to-date" +msgstr "" + +#: pkgs.cgi:328 +msgid "Upgradeable packages" +msgstr "" + +#: pkgs.cgi:363 +msgid "Performing task on packages... please wait" +msgstr "" + +#: pkgs.cgi:390 +msgid "Package" +msgstr "" + +#: pkgs.cgi:394 +msgid "Remove" +msgstr "" + +#: pkgs.cgi:416 +msgid "Installed files:" +msgstr "" + +#: pkgs.cgi:440 pkgs.cgi:490 +msgid "Configuration" +msgstr "" + +#: pkgs.cgi:442 +msgid "Tazpkg configuration and settings" +msgstr "" + +#: pkgs.cgi:447 +msgid "Packages in the cache:" +msgstr "" + +#: pkgs.cgi:454 +msgid "Current mirror list" +msgstr "" + +#: pkgs.cgi:478 +msgid "Overview of all installed and mirrored packages" +msgstr "" + +#: pkgs.cgi:486 msgid "Recharge list" msgstr "" -#: pkgs.cgi:131 -msgid "Upgrade" +#: pkgs.cgi:488 +msgid "Check upgrade" msgstr "" -#: pkgs.cgi:132 pkgs.cgi:354 -msgid "Configuration" -msgstr "" - -#: pkgs.cgi:141 pkgs.cgi:151 pkgs.cgi:162 -msgid "Selection:" -msgstr "" - -#: pkgs.cgi:165 -msgid "Toogle all" -msgstr "" - -#: pkgs.cgi:232 -msgid "Search packages" -msgstr "" - -#: pkgs.cgi:248 -msgid "Recharge" -msgstr "" - -#: pkgs.cgi:252 -msgid "" -"Recharge will check for new or updated packages...\n" -"\t\tplease wait" -msgstr "" - -#: pkgs.cgi:261 -msgid "Packages lists are up-to-date" -msgstr "" - -#: pkgs.cgi:268 -msgid "Upgradeable packages" -msgstr "" - -#: pkgs.cgi:297 -msgid "Performing task on packages" -msgstr "" - -#: pkgs.cgi:314 -msgid "Package info" -msgstr "" - -#: pkgs.cgi:316 -msgid "Detailled information on:" -msgstr "" - -#: pkgs.cgi:330 -msgid "Installed files" -msgstr "" - -#: pkgs.cgi:356 -msgid "Tazpkg configuration and settings" -msgstr "" - -#: pkgs.cgi:361 -msgid "Packages in the cache:" -msgstr "" - -#: pkgs.cgi:368 -msgid "Current mirror list" -msgstr "" - -#: pkgs.cgi:392 -msgid "Overview of all installed and mirrored packages" -msgstr "" - -#: pkgs.cgi:397 +#: pkgs.cgi:492 msgid "Latest log entries" msgstr "" @@ -318,14 +347,38 @@ msgid "generate" msgstr "" -#: network.cgi:32 +#: network.cgi:41 +msgid "Ethernet connection" +msgstr "" + +#: network.cgi:51 +msgid "Wireless connection" +msgstr "" + +#: network.cgi:61 msgid "Networking" msgstr "" -#: network.cgi:33 +#: network.cgi:63 msgid "Manage network connection and services" msgstr "" +#: network.cgi:67 +msgid "Connection:" +msgstr "" + +#: network.cgi:68 +msgid "Start" +msgstr "" + +#: network.cgi:69 +msgid "Stop" +msgstr "" + +#: network.cgi:75 +msgid "Output of ifconfig" +msgstr "" + #: lib/libtazpanel:39 msgid "Interface" msgstr "" diff -r 167a97495e1c -r a7b1d69663c3 settings.cgi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/settings.cgi Thu Apr 07 01:22:07 2011 +0200 @@ -0,0 +1,187 @@ +#!/bin/sh +# +# System settings CGI interface: user, locale, keyboard, date. Since we +# dont have multiple page here there is only one case used to get commands +# values and the full content is following directly. +# +# +echo "Content-Type: text/html" +echo "" + +# Common functions from libtazpanel +. lib/libtazpanel +get_config + +# Include gettext helper script. +. /usr/bin/gettext.sh + +# Export package name for gettext. +TEXTDOMAIN='tazpanel' +export TEXTDOMAIN + +TITLE="- Settings" + +# Get the list of system locales +list_locales() { + cd /usr/share/i18n/locales + for locale in `ls -1 [a-z][a-z]_[A-Z][A-Z]` + do + echo "" + done +} + +# +# Commands executed before page loading. +# + +case "$QUERY_STRING" in + users|user=*) + # + # Manage system user accounts + # + cmdline=`echo ${QUERY_STRING#user*=} | sed s'/&/ /g'` + # Parse cmdline + for opt in $cmdline + do + case $opt in + adduser=*) + user=${opt#adduser=} + cmd=adduser ;; + deluser=*) + user=${opt#deluser=} + deluser $user ;; + passwd=*) + pass=${opt#passwd=} ;; + esac + done + case "$cmd" in + adduser) + adduser -D $user + echo "$pass" | chpasswd + for g in audio cdrom floppy video + do + addgroup $user $g + done ;; + *) continue ;; + esac ;; + gen-locale=*) + new_locale=${QUERY_STRING#gen-locale=} ;; + rdate) + rdate -s tick.greyware.com ;; + hwclock) + hwclock -w ;; + *) + continue ;; +esac + +# +# Default xHTML content +# +xhtml_header +cat << EOT +
+

`gettext "System settings"`

+

`gettext "Manage system time, users or language settings"`

+

+ +
+`gettext "Time zome      :"` `cat /etc/TZ`
+`gettext "System time    :"` `date`
+`gettext "Hardware clock :"` `hwclock -r`
+
+`gettext "Sync online"` +`gettext "Set harware clock"` +EOT +# +# Users management +# + +cat <`gettext "Users"` +
+EOT +table_start +cat << EOT + + `gettext "Login"` + `gettext "User ID"` + `gettext "Name"` + `gettext "Home"` + `gettext "SHell"` + +EOT +for i in `cat /etc/passwd | cut -d ":" -f 1` +do + if [ -d /home/$i ]; then + login=$i + uid=`cat /etc/passwd | grep $i | cut -d ":" -f 3` + gid=`cat /etc/passwd | grep $i | cut -d ":" -f 4` + name=`cat /etc/passwd | grep $i | cut -d ":" -f 5 | \ + sed s/,,,//` + home=`cat /etc/passwd | grep $i | cut -d ":" -f 6` + shell=`cat /etc/passwd | grep $i | cut -d ":" -f 7` + echo '' + echo " + + $login" + echo "$uid:$gid" + echo "$name" + echo "$home" + echo "$shell" + echo '' + fi +done +table_end +cat << EOT +
+ +
+
+ +

`gettext "Add a new user"`

+
+ +

`gettext "User login:"`

+

+

`gettext "User password:"`

+

+ +
+EOT + +# +# Locale settings +# +cat << EOT + +

`gettext "System language"`

+

+EOT + # Check if a new locale was requested + if [ -n "$new_locale" ]; then + rm -rf /usr/lib/locale/$new_locale + localedef -i $new_locale -c -f UTF-8 \ + /usr/lib/locale/$new_locale + # System configuration + echo "LANG=$new_locale" > /etc/locale.conf + echo "LC_ALL=$new_locale" >> /etc/locale.conf + eval_gettext "You must logout and login again your current + session to use \$new_locale locale." + else + eval_gettext "Current system locales: " + locale -a + fi + cat << EOT +

+
+ `gettext "Avalaible locales:"` + + +
+EOT + +xhtml_footer +exit 0 diff -r 167a97495e1c -r a7b1d69663c3 styles/default/header.html --- a/styles/default/header.html Wed Apr 06 19:02:07 2011 +0200 +++ b/styles/default/header.html Thu Apr 07 01:22:07 2011 +0200 @@ -16,9 +16,9 @@ Panel Packages Network + Settings Live Boot - Users Hardware
diff -r 167a97495e1c -r a7b1d69663c3 styles/default/images/locale.png Binary file styles/default/images/locale.png has changed diff -r 167a97495e1c -r a7b1d69663c3 styles/default/style.css --- a/styles/default/style.css Wed Apr 06 19:02:07 2011 +0200 +++ b/styles/default/style.css Thu Apr 07 01:22:07 2011 +0200 @@ -17,7 +17,7 @@ h1 { color: #d66018; padding: 10px 0 0 40px;} h2 { color: #444; margin: 10px 0 10px; } h3 { color: #666; font-size: 140%; } -h4 { color: #888; font-size: 120%; } +h4 { color: #888; font-size: 120%; margin: 10px 0 5px; } img { border: 0pt none; vertical-align: middle; padding: 0px 6px 2px 0;} p { margin: 6px 0; } ul { list-style-type: none; padding: 0; } @@ -160,7 +160,7 @@ td.pkg { max-width: 160px; } td.desc { max-width: 300px; } -#thead, thead { +#thead, .thead, thead { height: 10px; font-weight: bold; } @@ -193,9 +193,12 @@ input[type=text] { height: 18px; } +div.scroll { height: 200px; overflow: auto; border: 1px solid #ddd; } +div.scroll table { border: 0px solid #fff; } + /* Round corner */ -table, pre, input[type=submit], .debug, .box, .button { +table, pre, input[type=submit], .debug, .box, .button, div.scroll { /*-moz-border-radius: 4px; -webkit-border-radius: 4px; */ border-radius: 4px;