tazpanel rev 42
Add settings.cgi and split user config from index.cgi, add need CSS stuff and up POT
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu Apr 07 01:22:07 2011 +0200 (2011-04-07) |
parents | 167a97495e1c |
children | af4b1f0b3110 |
files | Makefile index.cgi network.cgi po/fr.mo po/fr.po po/tazpanel.pot settings.cgi styles/default/header.html styles/default/images/locale.png styles/default/style.css |
line diff
1.1 --- a/Makefile Wed Apr 06 19:02:07 2011 +0200 1.2 +++ b/Makefile Thu Apr 07 01:22:07 2011 +0200 1.3 @@ -3,7 +3,7 @@ 1.4 PREFIX?=/usr 1.5 SYSCONFDIR?=/etc/slitaz 1.6 DESTDIR?= 1.7 -LINGUAS?=pt 1.8 +LINGUAS?=fr 1.9 PANEL?=/var/www/tazpanel 1.10 1.11 VERSION:=$(shell grep ^VERSION tazpanel | cut -d '=' -f 2) 1.12 @@ -20,7 +20,7 @@ 1.13 msgmerge: 1.14 @for l in $(LINGUAS); do \ 1.15 echo -n "Updating $$l po file."; \ 1.16 - msgmerge -U po/$$l.po po/tazpanel-pkgs.pot; \ 1.17 + msgmerge -U po/$$l.po po/tazpanel.pot; \ 1.18 done; 1.19 1.20 msgfmt: 1.21 @@ -46,4 +46,5 @@ 1.22 1.23 clean: 1.24 rm -rf po/mo 1.25 + rm -f po/*.*~ 1.26
2.1 --- a/index.cgi Wed Apr 06 19:02:07 2011 +0200 2.2 +++ b/index.cgi Thu Apr 07 01:22:07 2011 +0200 2.3 @@ -4,6 +4,8 @@ 2.4 # command so we are faster and dont load unneeded function. If nececarry 2.5 # you can use the lib/ dir to handle external resources. 2.6 # 2.7 +# Copyright (C) 2011 SliTaz GNU/Linux - GNU gpl v3 2.8 +# 2.9 echo "Content-Type: text/html" 2.10 echo "" 2.11 2.12 @@ -43,95 +45,6 @@ 2.13 </pre> 2.14 EOT 2.15 ;; 2.16 - users|user=*) 2.17 - # 2.18 - # Manage system user accounts 2.19 - # 2.20 - TITLE="- Users" 2.21 - xhtml_header 2.22 - cmdline=`echo ${QUERY_STRING#user*=} | sed s'/&/ /g'` 2.23 - # Parse cmdline 2.24 - for opt in $cmdline 2.25 - do 2.26 - case $opt in 2.27 - adduser=*) 2.28 - user=${opt#adduser=} 2.29 - cmd=adduser ;; 2.30 - deluser=*) 2.31 - user=${opt#deluser=} 2.32 - deluser $user ;; 2.33 - passwd=*) 2.34 - pass=${opt#passwd=} ;; 2.35 - esac 2.36 - done 2.37 - case "$cmd" in 2.38 - adduser) 2.39 - echo "$user" 2.40 - echo $pass 2.41 - adduser -D $user 2.42 - echo "$pass" | chpasswd 2.43 - for g in audio cdrom floppy video 2.44 - do 2.45 - addgroup $user $g 2.46 - done ;; 2.47 - *) continue ;; 2.48 - esac 2.49 - cat << EOT 2.50 -<div id="wrapper"> 2.51 - <h2>`gettext "Manage users"`</h2> 2.52 - <p>`gettext "Manage human users on your SliTaz system"`</p> 2.53 -</div> 2.54 -<form method="get" action="$SCRIPT_NAME"> 2.55 -EOT 2.56 - table_start 2.57 - cat << EOT 2.58 -<tr id="thead"> 2.59 - <td>`gettext "Login"`</td> 2.60 - <td>`gettext "User ID"`</td> 2.61 - <td>`gettext "Name"`</td> 2.62 - <td>`gettext "Home"`</td> 2.63 - <td>`gettext "SHell"`</td> 2.64 -</tr> 2.65 -EOT 2.66 - for i in `cat /etc/passwd | cut -d ":" -f 1` 2.67 - do 2.68 - if [ -d /home/$i ]; then 2.69 - login=$i 2.70 - uid=`cat /etc/passwd | grep $i | cut -d ":" -f 3` 2.71 - gid=`cat /etc/passwd | grep $i | cut -d ":" -f 4` 2.72 - name=`cat /etc/passwd | grep $i | cut -d ":" -f 5 | \ 2.73 - sed s/,,,//` 2.74 - home=`cat /etc/passwd | grep $i | cut -d ":" -f 6` 2.75 - shell=`cat /etc/passwd | grep $i | cut -d ":" -f 7` 2.76 - echo '<tr>' 2.77 - echo "<td><input type='hidden' name='user' /> 2.78 - <input type='checkbox' name='deluser' value='$login' /> 2.79 - <img src='$IMAGES/user.png' />$login</td>" 2.80 - echo "<td>$uid:$gid</td>" 2.81 - echo "<td>$name</td>" 2.82 - echo "<td>$home</td>" 2.83 - echo "<td>$shell</td>" 2.84 - echo '</tr>' 2.85 - fi 2.86 - done 2.87 - table_end 2.88 - cat << EOT 2.89 - <div> 2.90 - <input type="submit" value="`gettext "Delete selected user"`" /> 2.91 - </div> 2.92 -</form> 2.93 - 2.94 -<h3>`gettext "Add a new user"`</h3> 2.95 -<form method="get" action="$SCRIPT_NAME"> 2.96 - <input type="hidden" name="user" /> 2.97 - <p>`gettext "User login:"`</p> 2.98 - <p><input type="text" name="adduser" size="30" /></p> 2.99 - <p>`gettext "User password:"`</p> 2.100 - <p><input type="password" name="passwd" size="30" /></p> 2.101 - <input type="submit" value="`gettext "Create user"`" /> 2.102 -</form> 2.103 -EOT 2.104 - ;; 2.105 hardware) 2.106 # 2.107 # Hardware drivers, devices, filesystem, screen 2.108 @@ -159,6 +72,12 @@ 2.109 # Default xHTML content 2.110 # 2.111 xhtml_header 2.112 + case "$QUERY_STRING" in 2.113 + gen-locale=*) 2.114 + new_locale=${QUERY_STRING#gen-locale=} ;; 2.115 + rdate) 2.116 + echo "" ;; 2.117 + esac 2.118 cat << EOT 2.119 <div id="wrapper"> 2.120 <h2>`gettext "Host:"` `hostname`</h2>
3.1 --- a/network.cgi Wed Apr 06 19:02:07 2011 +0200 3.2 +++ b/network.cgi Thu Apr 07 01:22:07 2011 +0200 3.3 @@ -16,6 +16,8 @@ 3.4 TEXTDOMAIN='tazpanel' 3.5 export TEXTDOMAIN 3.6 3.7 +TITLE="- Network" 3.8 + 3.9 # Actions commands before page is displayed 3.10 case "$QUERY_STRING" in 3.11 start)
4.1 Binary file po/fr.mo has changed
5.1 --- a/po/fr.po Wed Apr 06 19:02:07 2011 +0200 5.2 +++ b/po/fr.po Thu Apr 07 01:22:07 2011 +0200 5.3 @@ -7,9 +7,9 @@ 5.4 msgstr "" 5.5 "Project-Id-Version: TazPanel 1.0\n" 5.6 "Report-Msgid-Bugs-To: \n" 5.7 -"POT-Creation-Date: 2011-04-06 06:09+0200\n" 5.8 -"PO-Revision-Date: 2011-04-06 06:11+0200\n" 5.9 -"Last-Translator: Linux User <pankso@slitaz.org>\n" 5.10 +"POT-Creation-Date: 2011-04-06 20:37+0200\n" 5.11 +"PO-Revision-Date: 2011-04-06 20:40+0100\n" 5.12 +"Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 5.13 "Language-Team: French\n" 5.14 "Language: fr\n" 5.15 "MIME-Version: 1.0\n" 5.16 @@ -19,7 +19,7 @@ 5.17 5.18 #: tazpanel:33 5.19 msgid "TazPanel Authentication" 5.20 -msgstr "" 5.21 +msgstr "Mot de passe de TazPanel" 5.22 5.23 #: tazpanel:36 5.24 msgid "Stopping TazPanel web server..." 5.25 @@ -41,245 +41,271 @@ 5.26 msgid "Usage:" 5.27 msgstr "" 5.28 5.29 -#: index.cgi:38 5.30 -msgid "Interface" 5.31 -msgstr "" 5.32 - 5.33 -#: index.cgi:39 index.cgi:133 pkgs.cgi:117 5.34 -msgid "Name" 5.35 -msgstr "" 5.36 - 5.37 -#: index.cgi:40 5.38 -msgid "Status" 5.39 -msgstr "" 5.40 - 5.41 -#: index.cgi:41 5.42 -msgid "IP Address" 5.43 -msgstr "" 5.44 - 5.45 -#: index.cgi:76 5.46 +#: index.cgi:43 5.47 msgid "Boot & startup" 5.48 msgstr "" 5.49 5.50 -#: index.cgi:78 5.51 +#: index.cgi:45 5.52 msgid "Everything that appends before user login." 5.53 msgstr "" 5.54 5.55 -#: index.cgi:82 5.56 +#: index.cgi:49 5.57 msgid "Kernel cmdline" 5.58 msgstr "" 5.59 5.60 -#: index.cgi:123 5.61 +#: index.cgi:90 5.62 msgid "Manage users" 5.63 msgstr "" 5.64 5.65 -#: index.cgi:124 5.66 +#: index.cgi:91 5.67 msgid "Manage human users on your SliTaz system" 5.68 msgstr "" 5.69 5.70 -#: index.cgi:131 5.71 +#: index.cgi:98 5.72 msgid "Login" 5.73 msgstr "" 5.74 5.75 -#: index.cgi:132 5.76 +#: index.cgi:99 5.77 msgid "User ID" 5.78 msgstr "" 5.79 5.80 -#: index.cgi:134 5.81 +#: index.cgi:100 5.82 +#: pkgs.cgi:118 5.83 +#: lib/libtazpanel:40 5.84 +msgid "Name" 5.85 +msgstr "Nom" 5.86 + 5.87 +#: index.cgi:101 5.88 msgid "Home" 5.89 msgstr "" 5.90 5.91 -#: index.cgi:135 5.92 +#: index.cgi:102 5.93 msgid "SHell" 5.94 msgstr "" 5.95 5.96 -#: index.cgi:162 5.97 +#: index.cgi:129 5.98 msgid "Delete selected user" 5.99 msgstr "" 5.100 5.101 -#: index.cgi:166 5.102 +#: index.cgi:133 5.103 msgid "Add a new user" 5.104 msgstr "" 5.105 5.106 -#: index.cgi:169 5.107 +#: index.cgi:136 5.108 msgid "User login:" 5.109 msgstr "" 5.110 5.111 -#: index.cgi:171 5.112 +#: index.cgi:138 5.113 msgid "User password:" 5.114 msgstr "" 5.115 5.116 -#: index.cgi:173 5.117 +#: index.cgi:140 5.118 msgid "Create user" 5.119 -msgstr "" 5.120 +msgstr "Creer un utilisateur" 5.121 5.122 -#: index.cgi:185 network.cgi:32 5.123 -msgid "Networking" 5.124 -msgstr "" 5.125 - 5.126 -#: index.cgi:186 network.cgi:33 5.127 -msgid "Manage network connection and services" 5.128 -msgstr "" 5.129 - 5.130 -#: index.cgi:205 5.131 +#: index.cgi:152 5.132 msgid "Drivers & Devices" 5.133 msgstr "" 5.134 5.135 -#: index.cgi:206 5.136 +#: index.cgi:153 5.137 msgid "Manage your computer hardware" 5.138 msgstr "" 5.139 5.140 -#: index.cgi:226 5.141 +#: index.cgi:179 5.142 msgid "Host:" 5.143 msgstr "" 5.144 5.145 -#: index.cgi:227 5.146 +#: index.cgi:180 5.147 msgid "SliTaz administration et configuration Panel" 5.148 msgstr "" 5.149 5.150 -#: index.cgi:230 pkgs.cgi:390 5.151 +#: index.cgi:183 5.152 +#: pkgs.cgi:476 5.153 msgid "Summary" 5.154 -msgstr "" 5.155 +msgstr "Resume" 5.156 5.157 -#: index.cgi:233 5.158 +#: index.cgi:186 5.159 msgid "Uptime:" 5.160 msgstr "" 5.161 5.162 -#: index.cgi:236 5.163 +#: index.cgi:189 5.164 msgid "Memory in Mb" 5.165 msgstr "" 5.166 5.167 -#: index.cgi:243 5.168 +#: index.cgi:196 5.169 msgid "Network status" 5.170 msgstr "" 5.171 5.172 -#: index.cgi:246 5.173 +#: index.cgi:199 5.174 msgid "Filesystem usage statistics" 5.175 msgstr "" 5.176 5.177 -#: pkgs.cgi:63 5.178 +#: index.cgi:204 5.179 +msgid "System language" 5.180 +msgstr "" 5.181 + 5.182 +#: index.cgi:215 5.183 +#, sh-format 5.184 +msgid "" 5.185 +"You must logout and login again your current\n" 5.186 +"\t\t\t\tsession to use $new_locale language." 5.187 +msgstr "" 5.188 + 5.189 +#: index.cgi:218 5.190 +#, sh-format 5.191 +msgid "Current system locales: " 5.192 +msgstr "" 5.193 + 5.194 +#: index.cgi:224 5.195 +msgid "Avalaible locales:" 5.196 +msgstr "" 5.197 + 5.198 +#: index.cgi:229 5.199 +msgid "Generated and use" 5.200 +msgstr "" 5.201 + 5.202 +#: pkgs.cgi:64 5.203 msgid "Last recharge : " 5.204 msgstr "" 5.205 5.206 -#: pkgs.cgi:73 5.207 +#: pkgs.cgi:74 5.208 msgid "Installed packages : " 5.209 msgstr "" 5.210 5.211 -#: pkgs.cgi:75 5.212 +#: pkgs.cgi:76 5.213 msgid "Mirrored packages : " 5.214 msgstr "" 5.215 5.216 -#: pkgs.cgi:77 5.217 +#: pkgs.cgi:78 5.218 msgid "Upgradeable packages : " 5.219 msgstr "" 5.220 5.221 -#: pkgs.cgi:79 5.222 +#: pkgs.cgi:80 5.223 msgid "Installed files : " 5.224 msgstr "" 5.225 5.226 -#: pkgs.cgi:81 5.227 +#: pkgs.cgi:82 5.228 msgid "Blocked packages : " 5.229 msgstr "" 5.230 5.231 -#: pkgs.cgi:107 5.232 +#: pkgs.cgi:108 5.233 msgid "Search" 5.234 msgstr "" 5.235 5.236 -#: pkgs.cgi:118 5.237 +#: pkgs.cgi:119 5.238 msgid "Version" 5.239 msgstr "" 5.240 5.241 -#: pkgs.cgi:119 5.242 +#: pkgs.cgi:120 5.243 msgid "Description" 5.244 msgstr "" 5.245 5.246 -#: pkgs.cgi:120 5.247 +#: pkgs.cgi:121 5.248 msgid "Web" 5.249 msgstr "" 5.250 5.251 -#: pkgs.cgi:128 pkgs.cgi:182 5.252 +#: pkgs.cgi:152 5.253 +#: pkgs.cgi:167 5.254 +#: pkgs.cgi:185 5.255 +#: pkgs.cgi:204 5.256 +msgid "Selection:" 5.257 +msgstr "" 5.258 + 5.259 +#: pkgs.cgi:156 5.260 +#: pkgs.cgi:172 5.261 +#: pkgs.cgi:191 5.262 +#: pkgs.cgi:210 5.263 +msgid "List:" 5.264 +msgstr "" 5.265 + 5.266 +#: pkgs.cgi:176 5.267 +#: pkgs.cgi:195 5.268 +#: pkgs.cgi:213 5.269 +#: pkgs.cgi:230 5.270 +#: pkgs.cgi:312 5.271 +#: pkgs.cgi:369 5.272 +#: pkgs.cgi:400 5.273 +#: pkgs.cgi:484 5.274 msgid "My packages" 5.275 msgstr "" 5.276 5.277 -#: pkgs.cgi:129 pkgs.cgi:213 5.278 -msgid "All packages" 5.279 +#: pkgs.cgi:188 5.280 +#: pkgs.cgi:207 5.281 +msgid "Toogle all" 5.282 msgstr "" 5.283 5.284 -#: pkgs.cgi:130 5.285 +#: pkgs.cgi:265 5.286 +msgid "Category:" 5.287 +msgstr "" 5.288 + 5.289 +#: pkgs.cgi:284 5.290 +msgid "Search packages" 5.291 +msgstr "" 5.292 + 5.293 +#: pkgs.cgi:300 5.294 +msgid "Recharge" 5.295 +msgstr "" 5.296 + 5.297 +#: pkgs.cgi:305 5.298 +msgid "" 5.299 +"Recharge will check for new or updated packages...\n" 5.300 +"please wait" 5.301 +msgstr "" 5.302 + 5.303 +#: pkgs.cgi:321 5.304 +msgid "Packages lists are up-to-date" 5.305 +msgstr "" 5.306 + 5.307 +#: pkgs.cgi:328 5.308 +msgid "Upgradeable packages" 5.309 +msgstr "" 5.310 + 5.311 +#: pkgs.cgi:363 5.312 +msgid "Performing task on packages... please wait" 5.313 +msgstr "" 5.314 + 5.315 +#: pkgs.cgi:390 5.316 +msgid "Package" 5.317 +msgstr "" 5.318 + 5.319 +#: pkgs.cgi:394 5.320 +msgid "Remove" 5.321 +msgstr "" 5.322 + 5.323 +#: pkgs.cgi:416 5.324 +msgid "Installed files:" 5.325 +msgstr "" 5.326 + 5.327 +#: pkgs.cgi:440 5.328 +#: pkgs.cgi:490 5.329 +msgid "Configuration" 5.330 +msgstr "" 5.331 + 5.332 +#: pkgs.cgi:442 5.333 +msgid "Tazpkg configuration and settings" 5.334 +msgstr "" 5.335 + 5.336 +#: pkgs.cgi:447 5.337 +msgid "Packages in the cache:" 5.338 +msgstr "" 5.339 + 5.340 +#: pkgs.cgi:454 5.341 +msgid "Current mirror list" 5.342 +msgstr "" 5.343 + 5.344 +#: pkgs.cgi:478 5.345 +msgid "Overview of all installed and mirrored packages" 5.346 +msgstr "" 5.347 + 5.348 +#: pkgs.cgi:486 5.349 msgid "Recharge list" 5.350 msgstr "" 5.351 5.352 -#: pkgs.cgi:131 5.353 -msgid "Upgrade" 5.354 +#: pkgs.cgi:488 5.355 +msgid "Check upgrade" 5.356 msgstr "" 5.357 5.358 -#: pkgs.cgi:132 pkgs.cgi:354 5.359 -msgid "Configuration" 5.360 -msgstr "" 5.361 - 5.362 -#: pkgs.cgi:141 pkgs.cgi:151 pkgs.cgi:162 5.363 -msgid "Selection:" 5.364 -msgstr "" 5.365 - 5.366 -#: pkgs.cgi:165 5.367 -msgid "Toogle all" 5.368 -msgstr "" 5.369 - 5.370 -#: pkgs.cgi:232 5.371 -msgid "Search packages" 5.372 -msgstr "" 5.373 - 5.374 -#: pkgs.cgi:248 5.375 -msgid "Recharge" 5.376 -msgstr "" 5.377 - 5.378 -#: pkgs.cgi:252 5.379 -msgid "" 5.380 -"Recharge will check for new or updated packages...\n" 5.381 -"\t\tplease wait" 5.382 -msgstr "" 5.383 - 5.384 -#: pkgs.cgi:261 5.385 -msgid "Packages lists are up-to-date" 5.386 -msgstr "" 5.387 - 5.388 -#: pkgs.cgi:268 5.389 -msgid "Upgradeable packages" 5.390 -msgstr "" 5.391 - 5.392 -#: pkgs.cgi:297 5.393 -msgid "Performing task on packages" 5.394 -msgstr "" 5.395 - 5.396 -#: pkgs.cgi:314 5.397 -msgid "Package info" 5.398 -msgstr "" 5.399 - 5.400 -#: pkgs.cgi:316 5.401 -msgid "Detailled information on:" 5.402 -msgstr "" 5.403 - 5.404 -#: pkgs.cgi:330 5.405 -msgid "Installed files" 5.406 -msgstr "" 5.407 - 5.408 -#: pkgs.cgi:356 5.409 -msgid "Tazpkg configuration and settings" 5.410 -msgstr "" 5.411 - 5.412 -#: pkgs.cgi:361 5.413 -msgid "Packages in the cache:" 5.414 -msgstr "" 5.415 - 5.416 -#: pkgs.cgi:368 5.417 -msgid "Current mirror list" 5.418 -msgstr "" 5.419 - 5.420 -#: pkgs.cgi:392 5.421 -msgid "Overview of all installed and mirrored packages" 5.422 -msgstr "" 5.423 - 5.424 -#: pkgs.cgi:397 5.425 +#: pkgs.cgi:492 5.426 msgid "Latest log entries" 5.427 msgstr "" 5.428 5.429 @@ -337,3 +363,48 @@ 5.430 #: live.cgi:99 5.431 msgid "generate" 5.432 msgstr "" 5.433 + 5.434 +#: network.cgi:41 5.435 +msgid "Ethernet connection" 5.436 +msgstr "" 5.437 + 5.438 +#: network.cgi:51 5.439 +msgid "Wireless connection" 5.440 +msgstr "" 5.441 + 5.442 +#: network.cgi:61 5.443 +msgid "Networking" 5.444 +msgstr "" 5.445 + 5.446 +#: network.cgi:63 5.447 +msgid "Manage network connection and services" 5.448 +msgstr "" 5.449 + 5.450 +#: network.cgi:67 5.451 +msgid "Connection:" 5.452 +msgstr "" 5.453 + 5.454 +#: network.cgi:68 5.455 +msgid "Start" 5.456 +msgstr "" 5.457 + 5.458 +#: network.cgi:69 5.459 +msgid "Stop" 5.460 +msgstr "" 5.461 + 5.462 +#: network.cgi:75 5.463 +msgid "Output of ifconfig" 5.464 +msgstr "" 5.465 + 5.466 +#: lib/libtazpanel:39 5.467 +msgid "Interface" 5.468 +msgstr "" 5.469 + 5.470 +#: lib/libtazpanel:41 5.471 +msgid "Status" 5.472 +msgstr "" 5.473 + 5.474 +#: lib/libtazpanel:42 5.475 +msgid "IP Address" 5.476 +msgstr "" 5.477 +
6.1 --- a/po/tazpanel.pot Wed Apr 06 19:02:07 2011 +0200 6.2 +++ b/po/tazpanel.pot Thu Apr 07 01:22:07 2011 +0200 6.3 @@ -8,7 +8,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: TazPanel 1.0\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2011-04-06 06:15+0200\n" 6.8 +"POT-Creation-Date: 2011-04-06 20:37+0200\n" 6.9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 6.10 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 6.11 "Language-Team: LANGUAGE <LL@li.org>\n" 6.12 @@ -41,225 +41,254 @@ 6.13 msgid "Usage:" 6.14 msgstr "" 6.15 6.16 -#: index.cgi:34 6.17 +#: index.cgi:43 6.18 msgid "Boot & startup" 6.19 msgstr "" 6.20 6.21 -#: index.cgi:36 6.22 +#: index.cgi:45 6.23 msgid "Everything that appends before user login." 6.24 msgstr "" 6.25 6.26 -#: index.cgi:40 6.27 +#: index.cgi:49 6.28 msgid "Kernel cmdline" 6.29 msgstr "" 6.30 6.31 -#: index.cgi:81 6.32 +#: index.cgi:90 6.33 msgid "Manage users" 6.34 msgstr "" 6.35 6.36 -#: index.cgi:82 6.37 +#: index.cgi:91 6.38 msgid "Manage human users on your SliTaz system" 6.39 msgstr "" 6.40 6.41 -#: index.cgi:89 6.42 +#: index.cgi:98 6.43 msgid "Login" 6.44 msgstr "" 6.45 6.46 -#: index.cgi:90 6.47 +#: index.cgi:99 6.48 msgid "User ID" 6.49 msgstr "" 6.50 6.51 -#: index.cgi:91 pkgs.cgi:117 lib/libtazpanel:40 6.52 +#: index.cgi:100 pkgs.cgi:118 lib/libtazpanel:40 6.53 msgid "Name" 6.54 msgstr "" 6.55 6.56 -#: index.cgi:92 6.57 +#: index.cgi:101 6.58 msgid "Home" 6.59 msgstr "" 6.60 6.61 -#: index.cgi:93 6.62 +#: index.cgi:102 6.63 msgid "SHell" 6.64 msgstr "" 6.65 6.66 -#: index.cgi:120 6.67 +#: index.cgi:129 6.68 msgid "Delete selected user" 6.69 msgstr "" 6.70 6.71 -#: index.cgi:124 6.72 +#: index.cgi:133 6.73 msgid "Add a new user" 6.74 msgstr "" 6.75 6.76 -#: index.cgi:127 6.77 +#: index.cgi:136 6.78 msgid "User login:" 6.79 msgstr "" 6.80 6.81 -#: index.cgi:129 6.82 +#: index.cgi:138 6.83 msgid "User password:" 6.84 msgstr "" 6.85 6.86 -#: index.cgi:131 6.87 +#: index.cgi:140 6.88 msgid "Create user" 6.89 msgstr "" 6.90 6.91 -#: index.cgi:143 6.92 +#: index.cgi:152 6.93 msgid "Drivers & Devices" 6.94 msgstr "" 6.95 6.96 -#: index.cgi:144 6.97 +#: index.cgi:153 6.98 msgid "Manage your computer hardware" 6.99 msgstr "" 6.100 6.101 -#: index.cgi:164 6.102 +#: index.cgi:179 6.103 msgid "Host:" 6.104 msgstr "" 6.105 6.106 -#: index.cgi:165 6.107 +#: index.cgi:180 6.108 msgid "SliTaz administration et configuration Panel" 6.109 msgstr "" 6.110 6.111 -#: index.cgi:168 pkgs.cgi:390 6.112 +#: index.cgi:183 pkgs.cgi:476 6.113 msgid "Summary" 6.114 msgstr "" 6.115 6.116 -#: index.cgi:171 6.117 +#: index.cgi:186 6.118 msgid "Uptime:" 6.119 msgstr "" 6.120 6.121 -#: index.cgi:174 6.122 +#: index.cgi:189 6.123 msgid "Memory in Mb" 6.124 msgstr "" 6.125 6.126 -#: index.cgi:181 6.127 +#: index.cgi:196 6.128 msgid "Network status" 6.129 msgstr "" 6.130 6.131 -#: index.cgi:184 6.132 +#: index.cgi:199 6.133 msgid "Filesystem usage statistics" 6.134 msgstr "" 6.135 6.136 -#: pkgs.cgi:63 6.137 +#: index.cgi:204 6.138 +msgid "System language" 6.139 +msgstr "" 6.140 + 6.141 +#: index.cgi:215 6.142 +#, sh-format 6.143 +msgid "" 6.144 +"You must logout and login again your current\n" 6.145 +"\t\t\t\tsession to use $new_locale language." 6.146 +msgstr "" 6.147 + 6.148 +#: index.cgi:218 6.149 +#, sh-format 6.150 +msgid "Current system locales: " 6.151 +msgstr "" 6.152 + 6.153 +#: index.cgi:224 6.154 +msgid "Avalaible locales:" 6.155 +msgstr "" 6.156 + 6.157 +#: index.cgi:229 6.158 +msgid "Generated and use" 6.159 +msgstr "" 6.160 + 6.161 +#: pkgs.cgi:64 6.162 msgid "Last recharge : " 6.163 msgstr "" 6.164 6.165 -#: pkgs.cgi:73 6.166 +#: pkgs.cgi:74 6.167 msgid "Installed packages : " 6.168 msgstr "" 6.169 6.170 -#: pkgs.cgi:75 6.171 +#: pkgs.cgi:76 6.172 msgid "Mirrored packages : " 6.173 msgstr "" 6.174 6.175 -#: pkgs.cgi:77 6.176 +#: pkgs.cgi:78 6.177 msgid "Upgradeable packages : " 6.178 msgstr "" 6.179 6.180 -#: pkgs.cgi:79 6.181 +#: pkgs.cgi:80 6.182 msgid "Installed files : " 6.183 msgstr "" 6.184 6.185 -#: pkgs.cgi:81 6.186 +#: pkgs.cgi:82 6.187 msgid "Blocked packages : " 6.188 msgstr "" 6.189 6.190 -#: pkgs.cgi:107 6.191 +#: pkgs.cgi:108 6.192 msgid "Search" 6.193 msgstr "" 6.194 6.195 -#: pkgs.cgi:118 6.196 +#: pkgs.cgi:119 6.197 msgid "Version" 6.198 msgstr "" 6.199 6.200 -#: pkgs.cgi:119 6.201 +#: pkgs.cgi:120 6.202 msgid "Description" 6.203 msgstr "" 6.204 6.205 -#: pkgs.cgi:120 6.206 +#: pkgs.cgi:121 6.207 msgid "Web" 6.208 msgstr "" 6.209 6.210 -#: pkgs.cgi:128 pkgs.cgi:182 6.211 +#: pkgs.cgi:152 pkgs.cgi:167 pkgs.cgi:185 pkgs.cgi:204 6.212 +msgid "Selection:" 6.213 +msgstr "" 6.214 + 6.215 +#: pkgs.cgi:156 pkgs.cgi:172 pkgs.cgi:191 pkgs.cgi:210 6.216 +msgid "List:" 6.217 +msgstr "" 6.218 + 6.219 +#: pkgs.cgi:176 pkgs.cgi:195 pkgs.cgi:213 pkgs.cgi:230 pkgs.cgi:312 6.220 +#: pkgs.cgi:369 pkgs.cgi:400 pkgs.cgi:484 6.221 msgid "My packages" 6.222 msgstr "" 6.223 6.224 -#: pkgs.cgi:129 pkgs.cgi:213 6.225 -msgid "All packages" 6.226 +#: pkgs.cgi:188 pkgs.cgi:207 6.227 +msgid "Toogle all" 6.228 msgstr "" 6.229 6.230 -#: pkgs.cgi:130 6.231 +#: pkgs.cgi:265 6.232 +msgid "Category:" 6.233 +msgstr "" 6.234 + 6.235 +#: pkgs.cgi:284 6.236 +msgid "Search packages" 6.237 +msgstr "" 6.238 + 6.239 +#: pkgs.cgi:300 6.240 +msgid "Recharge" 6.241 +msgstr "" 6.242 + 6.243 +#: pkgs.cgi:305 6.244 +msgid "" 6.245 +"Recharge will check for new or updated packages...\n" 6.246 +"please wait" 6.247 +msgstr "" 6.248 + 6.249 +#: pkgs.cgi:321 6.250 +msgid "Packages lists are up-to-date" 6.251 +msgstr "" 6.252 + 6.253 +#: pkgs.cgi:328 6.254 +msgid "Upgradeable packages" 6.255 +msgstr "" 6.256 + 6.257 +#: pkgs.cgi:363 6.258 +msgid "Performing task on packages... please wait" 6.259 +msgstr "" 6.260 + 6.261 +#: pkgs.cgi:390 6.262 +msgid "Package" 6.263 +msgstr "" 6.264 + 6.265 +#: pkgs.cgi:394 6.266 +msgid "Remove" 6.267 +msgstr "" 6.268 + 6.269 +#: pkgs.cgi:416 6.270 +msgid "Installed files:" 6.271 +msgstr "" 6.272 + 6.273 +#: pkgs.cgi:440 pkgs.cgi:490 6.274 +msgid "Configuration" 6.275 +msgstr "" 6.276 + 6.277 +#: pkgs.cgi:442 6.278 +msgid "Tazpkg configuration and settings" 6.279 +msgstr "" 6.280 + 6.281 +#: pkgs.cgi:447 6.282 +msgid "Packages in the cache:" 6.283 +msgstr "" 6.284 + 6.285 +#: pkgs.cgi:454 6.286 +msgid "Current mirror list" 6.287 +msgstr "" 6.288 + 6.289 +#: pkgs.cgi:478 6.290 +msgid "Overview of all installed and mirrored packages" 6.291 +msgstr "" 6.292 + 6.293 +#: pkgs.cgi:486 6.294 msgid "Recharge list" 6.295 msgstr "" 6.296 6.297 -#: pkgs.cgi:131 6.298 -msgid "Upgrade" 6.299 +#: pkgs.cgi:488 6.300 +msgid "Check upgrade" 6.301 msgstr "" 6.302 6.303 -#: pkgs.cgi:132 pkgs.cgi:354 6.304 -msgid "Configuration" 6.305 -msgstr "" 6.306 - 6.307 -#: pkgs.cgi:141 pkgs.cgi:151 pkgs.cgi:162 6.308 -msgid "Selection:" 6.309 -msgstr "" 6.310 - 6.311 -#: pkgs.cgi:165 6.312 -msgid "Toogle all" 6.313 -msgstr "" 6.314 - 6.315 -#: pkgs.cgi:232 6.316 -msgid "Search packages" 6.317 -msgstr "" 6.318 - 6.319 -#: pkgs.cgi:248 6.320 -msgid "Recharge" 6.321 -msgstr "" 6.322 - 6.323 -#: pkgs.cgi:252 6.324 -msgid "" 6.325 -"Recharge will check for new or updated packages...\n" 6.326 -"\t\tplease wait" 6.327 -msgstr "" 6.328 - 6.329 -#: pkgs.cgi:261 6.330 -msgid "Packages lists are up-to-date" 6.331 -msgstr "" 6.332 - 6.333 -#: pkgs.cgi:268 6.334 -msgid "Upgradeable packages" 6.335 -msgstr "" 6.336 - 6.337 -#: pkgs.cgi:297 6.338 -msgid "Performing task on packages" 6.339 -msgstr "" 6.340 - 6.341 -#: pkgs.cgi:314 6.342 -msgid "Package info" 6.343 -msgstr "" 6.344 - 6.345 -#: pkgs.cgi:316 6.346 -msgid "Detailled information on:" 6.347 -msgstr "" 6.348 - 6.349 -#: pkgs.cgi:330 6.350 -msgid "Installed files" 6.351 -msgstr "" 6.352 - 6.353 -#: pkgs.cgi:356 6.354 -msgid "Tazpkg configuration and settings" 6.355 -msgstr "" 6.356 - 6.357 -#: pkgs.cgi:361 6.358 -msgid "Packages in the cache:" 6.359 -msgstr "" 6.360 - 6.361 -#: pkgs.cgi:368 6.362 -msgid "Current mirror list" 6.363 -msgstr "" 6.364 - 6.365 -#: pkgs.cgi:392 6.366 -msgid "Overview of all installed and mirrored packages" 6.367 -msgstr "" 6.368 - 6.369 -#: pkgs.cgi:397 6.370 +#: pkgs.cgi:492 6.371 msgid "Latest log entries" 6.372 msgstr "" 6.373 6.374 @@ -318,14 +347,38 @@ 6.375 msgid "generate" 6.376 msgstr "" 6.377 6.378 -#: network.cgi:32 6.379 +#: network.cgi:41 6.380 +msgid "Ethernet connection" 6.381 +msgstr "" 6.382 + 6.383 +#: network.cgi:51 6.384 +msgid "Wireless connection" 6.385 +msgstr "" 6.386 + 6.387 +#: network.cgi:61 6.388 msgid "Networking" 6.389 msgstr "" 6.390 6.391 -#: network.cgi:33 6.392 +#: network.cgi:63 6.393 msgid "Manage network connection and services" 6.394 msgstr "" 6.395 6.396 +#: network.cgi:67 6.397 +msgid "Connection:" 6.398 +msgstr "" 6.399 + 6.400 +#: network.cgi:68 6.401 +msgid "Start" 6.402 +msgstr "" 6.403 + 6.404 +#: network.cgi:69 6.405 +msgid "Stop" 6.406 +msgstr "" 6.407 + 6.408 +#: network.cgi:75 6.409 +msgid "Output of ifconfig" 6.410 +msgstr "" 6.411 + 6.412 #: lib/libtazpanel:39 6.413 msgid "Interface" 6.414 msgstr ""
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/settings.cgi Thu Apr 07 01:22:07 2011 +0200 7.3 @@ -0,0 +1,187 @@ 7.4 +#!/bin/sh 7.5 +# 7.6 +# System settings CGI interface: user, locale, keyboard, date. Since we 7.7 +# dont have multiple page here there is only one case used to get commands 7.8 +# values and the full content is following directly. 7.9 +# 7.10 +# 7.11 +echo "Content-Type: text/html" 7.12 +echo "" 7.13 + 7.14 +# Common functions from libtazpanel 7.15 +. lib/libtazpanel 7.16 +get_config 7.17 + 7.18 +# Include gettext helper script. 7.19 +. /usr/bin/gettext.sh 7.20 + 7.21 +# Export package name for gettext. 7.22 +TEXTDOMAIN='tazpanel' 7.23 +export TEXTDOMAIN 7.24 + 7.25 +TITLE="- Settings" 7.26 + 7.27 +# Get the list of system locales 7.28 +list_locales() { 7.29 + cd /usr/share/i18n/locales 7.30 + for locale in `ls -1 [a-z][a-z]_[A-Z][A-Z]` 7.31 + do 7.32 + echo "<option value='$locale'>$locale</option>" 7.33 + done 7.34 +} 7.35 + 7.36 +# 7.37 +# Commands executed before page loading. 7.38 +# 7.39 + 7.40 +case "$QUERY_STRING" in 7.41 + users|user=*) 7.42 + # 7.43 + # Manage system user accounts 7.44 + # 7.45 + cmdline=`echo ${QUERY_STRING#user*=} | sed s'/&/ /g'` 7.46 + # Parse cmdline 7.47 + for opt in $cmdline 7.48 + do 7.49 + case $opt in 7.50 + adduser=*) 7.51 + user=${opt#adduser=} 7.52 + cmd=adduser ;; 7.53 + deluser=*) 7.54 + user=${opt#deluser=} 7.55 + deluser $user ;; 7.56 + passwd=*) 7.57 + pass=${opt#passwd=} ;; 7.58 + esac 7.59 + done 7.60 + case "$cmd" in 7.61 + adduser) 7.62 + adduser -D $user 7.63 + echo "$pass" | chpasswd 7.64 + for g in audio cdrom floppy video 7.65 + do 7.66 + addgroup $user $g 7.67 + done ;; 7.68 + *) continue ;; 7.69 + esac ;; 7.70 + gen-locale=*) 7.71 + new_locale=${QUERY_STRING#gen-locale=} ;; 7.72 + rdate) 7.73 + rdate -s tick.greyware.com ;; 7.74 + hwclock) 7.75 + hwclock -w ;; 7.76 + *) 7.77 + continue ;; 7.78 +esac 7.79 + 7.80 +# 7.81 +# Default xHTML content 7.82 +# 7.83 +xhtml_header 7.84 +cat << EOT 7.85 +<div id="wrapper"> 7.86 + <h2>`gettext "System settings"`</h2> 7.87 + <p>`gettext "Manage system time, users or language settings"`<p> 7.88 +</div> 7.89 + 7.90 +<pre> 7.91 +`gettext "Time zome :"` `cat /etc/TZ` 7.92 +`gettext "System time :"` `date` 7.93 +`gettext "Hardware clock :"` `hwclock -r` 7.94 +</pre> 7.95 +<a class="button" href="$SCRIPT_NAME?rdate">`gettext "Sync online"`</a> 7.96 +<a class="button" href="$SCRIPT_NAME?hwclock">`gettext "Set harware clock"`</a> 7.97 +EOT 7.98 +# 7.99 +# Users management 7.100 +# 7.101 + 7.102 +cat <<EOT 7.103 +<h3>`gettext "Users"`</h3> 7.104 +<form method="get" action="$SCRIPT_NAME"> 7.105 +EOT 7.106 +table_start 7.107 +cat << EOT 7.108 +<tr class="thead"> 7.109 + <td>`gettext "Login"`</td> 7.110 + <td>`gettext "User ID"`</td> 7.111 + <td>`gettext "Name"`</td> 7.112 + <td>`gettext "Home"`</td> 7.113 + <td>`gettext "SHell"`</td> 7.114 +</tr> 7.115 +EOT 7.116 +for i in `cat /etc/passwd | cut -d ":" -f 1` 7.117 +do 7.118 + if [ -d /home/$i ]; then 7.119 + login=$i 7.120 + uid=`cat /etc/passwd | grep $i | cut -d ":" -f 3` 7.121 + gid=`cat /etc/passwd | grep $i | cut -d ":" -f 4` 7.122 + name=`cat /etc/passwd | grep $i | cut -d ":" -f 5 | \ 7.123 + sed s/,,,//` 7.124 + home=`cat /etc/passwd | grep $i | cut -d ":" -f 6` 7.125 + shell=`cat /etc/passwd | grep $i | cut -d ":" -f 7` 7.126 + echo '<tr>' 7.127 + echo "<td><input type='hidden' name='user' /> 7.128 + <input type='checkbox' name='deluser' value='$login' /> 7.129 + <img src='$IMAGES/user.png' />$login</td>" 7.130 + echo "<td>$uid:$gid</td>" 7.131 + echo "<td>$name</td>" 7.132 + echo "<td>$home</td>" 7.133 + echo "<td>$shell</td>" 7.134 + echo '</tr>' 7.135 + fi 7.136 +done 7.137 +table_end 7.138 +cat << EOT 7.139 + <div> 7.140 + <input type="submit" value="`gettext "Delete selected user"`" /> 7.141 + </div> 7.142 +</form> 7.143 + 7.144 +<h4>`gettext "Add a new user"`</h4> 7.145 +<form method="get" action="$SCRIPT_NAME"> 7.146 + <input type="hidden" name="user" /> 7.147 + <p>`gettext "User login:"`</p> 7.148 + <p><input type="text" name="adduser" size="30" /></p> 7.149 + <p>`gettext "User password:"`</p> 7.150 + <p><input type="password" name="passwd" size="30" /></p> 7.151 + <input type="submit" value="`gettext "Create user"`" /> 7.152 +</form> 7.153 +EOT 7.154 + 7.155 +# 7.156 +# Locale settings 7.157 +# 7.158 +cat << EOT 7.159 +<a name="locale"></a> 7.160 +<h3>`gettext "System language"`</h3> 7.161 +<p> 7.162 +EOT 7.163 + # Check if a new locale was requested 7.164 + if [ -n "$new_locale" ]; then 7.165 + rm -rf /usr/lib/locale/$new_locale 7.166 + localedef -i $new_locale -c -f UTF-8 \ 7.167 + /usr/lib/locale/$new_locale 7.168 + # System configuration 7.169 + echo "LANG=$new_locale" > /etc/locale.conf 7.170 + echo "LC_ALL=$new_locale" >> /etc/locale.conf 7.171 + eval_gettext "You must logout and login again your current 7.172 + session to use \$new_locale locale." 7.173 + else 7.174 + eval_gettext "Current system locales: " 7.175 + locale -a 7.176 + fi 7.177 + cat << EOT 7.178 +</p> 7.179 +<form method="get" action="$SCRIPT_NAME"> 7.180 + `gettext "Avalaible locales:"` 7.181 + <select name="gen-locale"> 7.182 + <option value="en_US">en_US</options> 7.183 + `list_locales` 7.184 + </select> 7.185 + <input type="submit" value="`gettext "Generated and use"`" /> 7.186 +</form> 7.187 +EOT 7.188 + 7.189 +xhtml_footer 7.190 +exit 0
8.1 --- a/styles/default/header.html Wed Apr 06 19:02:07 2011 +0200 8.2 +++ b/styles/default/header.html Thu Apr 07 01:22:07 2011 +0200 8.3 @@ -16,9 +16,9 @@ 8.4 <a href="/">Panel</a> 8.5 <a href="/pkgs.cgi">Packages</a> 8.6 <a href="/network.cgi">Network</a> 8.7 + <a href="/settings.cgi">Settings</a> 8.8 <a href="/live.cgi">Live</a> 8.9 <a href="/index.cgi?boot">Boot</a> 8.10 - <a href="/index.cgi?users">Users</a> 8.11 <a href="/index.cgi?hardware">Hardware</a> 8.12 </div> 8.13 </div>
9.1 Binary file styles/default/images/locale.png has changed
10.1 --- a/styles/default/style.css Wed Apr 06 19:02:07 2011 +0200 10.2 +++ b/styles/default/style.css Thu Apr 07 01:22:07 2011 +0200 10.3 @@ -17,7 +17,7 @@ 10.4 h1 { color: #d66018; padding: 10px 0 0 40px;} 10.5 h2 { color: #444; margin: 10px 0 10px; } 10.6 h3 { color: #666; font-size: 140%; } 10.7 -h4 { color: #888; font-size: 120%; } 10.8 +h4 { color: #888; font-size: 120%; margin: 10px 0 5px; } 10.9 img { border: 0pt none; vertical-align: middle; padding: 0px 6px 2px 0;} 10.10 p { margin: 6px 0; } 10.11 ul { list-style-type: none; padding: 0; } 10.12 @@ -160,7 +160,7 @@ 10.13 td.pkg { max-width: 160px; } 10.14 td.desc { max-width: 300px; } 10.15 10.16 -#thead, thead { 10.17 +#thead, .thead, thead { 10.18 height: 10px; 10.19 font-weight: bold; 10.20 } 10.21 @@ -193,9 +193,12 @@ 10.22 10.23 input[type=text] { height: 18px; } 10.24 10.25 +div.scroll { height: 200px; overflow: auto; border: 1px solid #ddd; } 10.26 +div.scroll table { border: 0px solid #fff; } 10.27 + 10.28 /* Round corner */ 10.29 10.30 -table, pre, input[type=submit], .debug, .box, .button { 10.31 +table, pre, input[type=submit], .debug, .box, .button, div.scroll { 10.32 /*-moz-border-radius: 4px; 10.33 -webkit-border-radius: 4px; */ 10.34 border-radius: 4px;