SliTaz Repositories

     1.1 --- a/settings.cgi	Wed Apr 11 20:12:41 2012 +0300
     1.2 +++ b/settings.cgi	Fri May 04 13:00:43 2012 +0300
     1.3 @@ -31,7 +31,7 @@
     1.4  		unset IFS
     1.5  		for cmd in "Delete user" "Lock user" "Unlock user" \
     1.6  			   "Change password" ; do
     1.7 -			[ "$(GET do)" == "$(gettext "$cmd")" ] || continue
     1.8 +			[ "$(GET do)" == "$(gettext "$cmd")" ] || continue			# BUGGY
     1.9  			for user in $users ; do
    1.10  				case "$cmd" in
    1.11  				Delete*)	deluser $user ;;
    1.12 @@ -84,27 +84,29 @@
    1.13  		# Users management
    1.14  		#
    1.15  		cat <<EOT
    1.16 -<a name="users"></a>
    1.17 -<h3>`gettext "Manage users"`</h3>
    1.18 +<h3 id="users">$(gettext 'Manage users')</h3>
    1.19 +
    1.20  <form method="get" action="$SCRIPT_NAME">
    1.21  <div id="actions">
    1.22  	<div class="float-left">
    1.23 -		$(gettext "Selection:")
    1.24 -		<input type="submit" name="do" value="`gettext "Delete user"`" />
    1.25 -		<input type="submit" name="do" value="`gettext "Lock user"`" />
    1.26 -		<input type="submit" name="do" value="`gettext "Unlock user"`" />
    1.27 +		$(gettext 'Selection:')
    1.28 +		<input type="submit" name="do" value="$(gettext 'Delete user')" />
    1.29 +		<input type="submit" name="do" value="$(gettext 'Lock user')" />
    1.30 +		<input type="submit" name="do" value="$(gettext 'Unlock user')" />
    1.31  	</div>
    1.32  </div>
    1.33 -EOT
    1.34 -		table_start
    1.35 -		cat << EOT
    1.36 +
    1.37 +<table class="zebra">
    1.38 +<thead>
    1.39  <tr class="thead">
    1.40 -	<td>`gettext "Login"`</td>
    1.41 -	<td>`gettext "User ID"`</td>
    1.42 -	<td>`gettext "Name"`</td>
    1.43 -	<td>`gettext "Home"`</td>
    1.44 -	<td>`gettext "Shell"`</td>
    1.45 +	<td>$(gettext 'Login')</td>
    1.46 +	<td>$(gettext 'User ID')</td>
    1.47 +	<td>$(gettext 'Name')</td>
    1.48 +	<td>$(gettext 'Home')</td>
    1.49 +	<td>$(gettext 'Shell')</td>
    1.50  </tr>
    1.51 +</thead>
    1.52 +</tbody>
    1.53  EOT
    1.54  		for login in `cat /etc/passwd | cut -d ":" -f 1`
    1.55  		do
    1.56 @@ -132,34 +134,39 @@
    1.57  EOT
    1.58  			fi
    1.59  		done
    1.60 -		table_end
    1.61 +		cat << EOT
    1.62 +</tbody>
    1.63 +</table>
    1.64 +EOT
    1.65  		cat << EOT
    1.66  <p>
    1.67 -	$(gettext "Password":)
    1.68 +	$(gettext 'Password:')
    1.69  	<input type="password" name="password" />
    1.70 -	<input type="submit" name="do" value="`gettext "Change password"`" />
    1.71 +	<input type="submit" name="do" value="$(gettext 'Change password')" />
    1.72  </p>
    1.73  </form>
    1.74  
    1.75 -<h4>`gettext "Add a new user"`</h4>
    1.76 +<h4>$(gettext 'Add a new user')</h4>
    1.77 +
    1.78  <form method="get" action="$SCRIPT_NAME">
    1.79  	<input type="hidden" name="user" />
    1.80 -	<p>`gettext "User login:"`</p>
    1.81 -	<p><input type="text" name="adduser" size="30" /></p>
    1.82 -	<p>`gettext "User password:"`</p>
    1.83 -	<p><input type="password" name="passwd" size="30" /></p>
    1.84 -	<input type="submit" value="`gettext "Create user"`" />
    1.85 +	<table>
    1.86 +		<tr><td>$(gettext 'User login:')</td>
    1.87 +			<td><input type="text" name="adduser" size="30" /></td></tr>
    1.88 +		<tr><td>$(gettext 'User password:')</td>
    1.89 +			<td><input type="password" name="passwd" size="30" /></td></tr>
    1.90 +		<tr><td colspan="2">
    1.91 +			<input type="submit" value="$(gettext 'Create user')" /></td></tr>
    1.92 +	</table>
    1.93  </form>
    1.94  
    1.95 -<h4>`gettext "Current user sessions"`</h4>
    1.96 -<pre>
    1.97 -$(who)
    1.98 -</pre>
    1.99 +<h4>$(gettext 'Current user sessions')</h4>
   1.100  
   1.101 -<h4>`gettext "Last user sessions"`</h4>
   1.102 -<pre>
   1.103 -$(last)
   1.104 -</pre>
   1.105 +<pre>$(who)</pre>
   1.106 +
   1.107 +<h4>$(gettext 'Last user sessions')</h4>
   1.108 +
   1.109 +<pre>$(last)</pre>
   1.110  EOT
   1.111  		;;
   1.112  	*)
   1.113 @@ -168,29 +175,29 @@
   1.114  		#
   1.115  		cat << EOT
   1.116  <div id="wrapper">
   1.117 -	<h2>$(gettext "System settings")</h2>
   1.118 -	<p>$(gettext "Manage system time, users or language settings")<p>
   1.119 +	<h2>$(gettext 'System settings')</h2>
   1.120 +	<p>$(gettext 'Manage system time, users or language settings')<p>
   1.121  </div>
   1.122  <div id="actions">
   1.123  	<a class="button" href="$SCRIPT_NAME?users">
   1.124 -		<img src="$IMAGES/users.png" />$(gettext "Manage users")</a>
   1.125 +		<img src="$IMAGES/users.png" />$(gettext 'Manage users')</a>
   1.126  </div>
   1.127  
   1.128 -<h3>`gettext "System time"`</h3>
   1.129 -<pre>
   1.130 -`gettext "Time zome      :"` `cat /etc/TZ`
   1.131 -`gettext "System time    :"` `date`
   1.132 -`gettext "Hardware clock :"` `hwclock -r`
   1.133 -</pre>
   1.134 -<a class="button" href="$SCRIPT_NAME?rdate">`gettext "Sync online"`</a>
   1.135 -<a class="button" href="$SCRIPT_NAME?hwclock">`gettext "Set hardware clock"`</a>
   1.136 +<h3>$(gettext 'System time')</h3>
   1.137 +
   1.138 +<table>
   1.139 +	<tr><td>$(gettext 'Time zome:')</td><td>$(cat /etc/TZ)</td></tr>
   1.140 +	<tr><td>$(gettext 'System time:')</td><td>$(date)</td></tr>
   1.141 +	<tr><td>$(gettext 'Hardware clock:')</td><td>$(hwclock -r)</tr>
   1.142 +</table>
   1.143 +<a class="button" href="$SCRIPT_NAME?rdate">$(gettext 'Sync online')</a>
   1.144 +<a class="button" href="$SCRIPT_NAME?hwclock">$(gettext 'Set hardware clock')</a>
   1.145  EOT
   1.146  		#
   1.147  		# Locale settings
   1.148  		#
   1.149  		cat << EOT
   1.150 -<a name="locale"></a>
   1.151 -<h3>`gettext "System language"`</h3>
   1.152 +<h3 id="locale">$(gettext 'System language')</h3>
   1.153  <p>
   1.154  EOT
   1.155  		# Check if a new locale was requested
   1.156 @@ -201,25 +208,24 @@
   1.157  			# System configuration
   1.158  			echo "LANG=$new_locale" > /etc/locale.conf
   1.159  			echo "LC_ALL=$new_locale" >> /etc/locale.conf
   1.160 -			eval_gettext "You must logout and login again to your current
   1.161 -				session to use \$new_locale locale."
   1.162 +			eval_gettext "You must logout and login again to your current \
   1.163 +session to use \$new_locale locale."
   1.164  		else
   1.165 -			gettext "Current system locales: "
   1.166 +			gettext 'Current system locales:'
   1.167  			locale -a
   1.168  		fi
   1.169  		cat << EOT
   1.170  </p>
   1.171  <form method="get" action="$SCRIPT_NAME">
   1.172 -	$(gettext "Available locales:")
   1.173 +	$(gettext 'Available locales:')
   1.174  	<select name="gen_locale">
   1.175 -		<option value="en_US">en_US</options>
   1.176 +		<option value="en_US">en__US</options>
   1.177  		$(list_locales)
   1.178  	</select>
   1.179 -	<input type="submit" value="$(gettext "Activate")" />
   1.180 +	<input type="submit" value="$(gettext 'Activate')" />
   1.181  </form>
   1.182  
   1.183 -<a name="keymap"></a>
   1.184 -<h3>`gettext "Console keymap"`</h3>
   1.185 +<h3 id="keymap">$(gettext 'Console keymap')</h3>
   1.186  <p>
   1.187  EOT
   1.188  		# Check if a new keymap was requested
   1.189 @@ -231,9 +237,8 @@
   1.190  				loadkmap < /usr/share/kmap/$new_keymap.kmap
   1.191  			fi
   1.192  		fi
   1.193 -		gettext "Current console keymap: "
   1.194  		keymap=$(cat /etc/keymap.conf)
   1.195 -		echo $keymap
   1.196 +		eval_gettext 'Current console keymap: $keymap'
   1.197  		echo "</p>"
   1.198  		if [ -n "$keymap" ]; then
   1.199  			case "$keymap" in
   1.200 @@ -250,49 +255,50 @@
   1.201  			keyboard_config=/etc/X11/xorg.conf.d/40-Keyboard.conf
   1.202  			cat << EOT
   1.203  <form method="get" action="$SCRIPT_NAME">
   1.204 -	$(gettext "Suggested keymap for Xorg:")
   1.205 +	$(gettext 'Suggested keymap for Xorg:')
   1.206  	<input type="submit" name "apply_xorg_kbd" value="$keymap" />
   1.207  	<a class="button" href="index.cgi?file=$keyboard_config">
   1.208 -		<img src="$IMAGES/edit.png" />$(gettext "Edit")</a>
   1.209 +		<img src="$IMAGES/edit.png" />$(gettext 'Edit')</a>
   1.210  </form>
   1.211  EOT
   1.212  		fi
   1.213  		cat << EOT
   1.214  <form method="get" action="$SCRIPT_NAME">
   1.215 -	$(gettext "Available keymaps:")
   1.216 +	$(gettext 'Available keymaps:')
   1.217  	<select name="gen_keymap">
   1.218  		$(list_keymaps)
   1.219  	</select>
   1.220 -	<input type="submit" value="$(gettext "Activate")" />
   1.221 +	<input type="submit" value="$(gettext 'Activate')" />
   1.222  </form>
   1.223  
   1.224 -<h2>$(gettext "Panel configuration")</h2>
   1.225 +<h2>$(gettext 'Panel configuration')</h2>
   1.226 +
   1.227  <form method="get" action="$SCRIPT_NAME">
   1.228  	<p>
   1.229 -		$(gettext "Style:")
   1.230 +		$(gettext 'Style:')
   1.231  		<select name="style">
   1.232  			$(list_styles)
   1.233  		</select>
   1.234 -		<input type="submit" value="$(gettext "Activate")" />
   1.235 +		<input type="submit" value="$(gettext 'Activate')" />
   1.236  	</p>
   1.237  </form>
   1.238  <form method="get" action="$SCRIPT_NAME">
   1.239  	<p>
   1.240 -		$(gettext "Panel password:")
   1.241 +		$(gettext 'Panel password:')
   1.242  		<input type="password" name="panel_pass"/>
   1.243 -		<input type="submit" value="$(gettext "Change")" />
   1.244 +		<input type="submit" value="$(gettext 'Change')" />
   1.245  	</p>
   1.246  </form>
   1.247  <p>
   1.248 -	$(gettext "Configuration files: ")
   1.249 +	$(gettext 'Configuration files:')
   1.250  	<a class="button" href="index.cgi?file=$CONFIG">
   1.251 -		<img src="$IMAGES/edit.png" />$(gettext "Panel")</a>
   1.252 +		<img src="$IMAGES/edit.png" />$(gettext 'Panel')</a>
   1.253  	<a class="button" href="index.cgi?file=$HTTPD_CONF">
   1.254 -		<img src="$IMAGES/edit.png" />$(gettext "Server")</a>
   1.255 +		<img src="$IMAGES/edit.png" />$(gettext 'Server')</a>
   1.256  </p>
   1.257  <p>
   1.258 -	$(gettext "TazPanel provides a debuging mode and page:")
   1.259 -	<a href='/index.cgi?debug'>debug</a>
   1.260 +	$(gettext 'TazPanel provides a debuging mode and page:')
   1.261 +	<a href="/index.cgi?debug">debug</a>
   1.262  </p>
   1.263  EOT
   1.264  	;;