SliTaz Repositories

     1.1 --- a/settings.cgi	Sun Apr 17 11:38:38 2011 +0200
     1.2 +++ b/settings.cgi	Sun Apr 17 12:20:08 2011 +0200
     1.3 @@ -86,6 +86,9 @@
     1.4  		new_locale=$(GET gen_locale) ;;
     1.5  	*\ gen_keymap\ *)
     1.6  		new_keymap=$(GET gen_keymap) ;;
     1.7 +	*\ apply_xorg_kbd\ *)
     1.8 +		sed -i "s/XkbLayout.*/XkbLayout \" \"$(GET apply_xorg_kbd)\"/" \
     1.9 +			/etc/X11/xorg.conf.d/40-Keyboard.conf ;;
    1.10  	*\ rdate\ *)
    1.11  		rdate -s tick.greyware.com ;;
    1.12  	*\ hwclock\ *)
    1.13 @@ -246,9 +249,32 @@
    1.14  			fi
    1.15  		fi
    1.16  		gettext "Current console keymap: "
    1.17 -		cat /etc/keymap.conf
    1.18 +		keymap=$(cat /etc/keymap.conf)
    1.19 +		echo $keymap
    1.20 +		echo "</p>"
    1.21 +		if [ -n "$keymap" ]; then
    1.22 +			case "$keymap" in
    1.23 +			fr_CH*)
    1.24 +				keymap="ch" ;;
    1.25 +			ru)
    1.26 +				keymap="us,ru(winkeys)" ;;
    1.27 +			slovene)
    1.28 +				keymap=si ;;
    1.29 +			*)
    1.30 +				keymap=${keymap%-lat*}
    1.31 +				keymap=${keymap%-abnt2} ;;
    1.32 +			esac
    1.33 +			keyboard_config=/etc/X11/xorg.conf.d/40-Keyboard.conf
    1.34 +			cat << EOT
    1.35 +<form method="get" action="$SCRIPT_NAME">
    1.36 +	$(gettext "Suggested keymap for Xorg:")
    1.37 +	<input type="submit" name "apply_xorg_kbd" value="$keymap" />
    1.38 +	<a class="button" href="index.cgi?file=$keyboard_config">
    1.39 +		<img src="$IMAGES/edit.png" />$(gettext "Edit")</a>
    1.40 +</form>
    1.41 +EOT
    1.42 +		fi
    1.43  		cat << EOT
    1.44 -</p>
    1.45  <form method="get" action="$SCRIPT_NAME">
    1.46  	$(gettext "Available keymaps:")
    1.47  	<select name="gen_keymap">