tazpanel diff settings.cgi @ rev 578
Tiny edit
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Mon Apr 04 19:09:35 2016 +0100 (2016-04-04) |
| parents | c79a4557c4b5 |
| children | 5f988d8f32b1 |
line diff
1.1 --- a/settings.cgi Mon Nov 09 13:56:38 2015 +0200 1.2 +++ b/settings.cgi Mon Apr 04 19:09:35 2016 +0100 1.3 @@ -94,7 +94,8 @@ 1.4 fi ;; 1.5 1.6 # System time 1.7 - calendar) # display Yad date picker (AJAX) 1.8 + calendar) 1.9 + # display Yad date picker (AJAX) 1.10 new_date="$(DISPLAY=':0.0' XAUTHORITY='/var/run/slim.auth' \ 1.11 yad --calendar --on-top --mouse --undecorated \ 1.12 --window-icon=config-date --title="$(_ 'Set date')" \ 1.13 @@ -102,10 +103,12 @@ 1.14 header 1.15 echo "$new_date"; exit 0;; 1.16 1.17 - settz) # set timezone 1.18 + settz) 1.19 + # set timezone 1.20 GET tz > /etc/TZ ;; 1.21 1.22 - date) # only accepted format is MMDDhhmm[[YY]YY][.ss] 1.23 + date) 1.24 + # only accepted format is MMDDhhmm[[YY]YY][.ss] 1.25 if [ -n "$(GET dateFull)" ]; then 1.26 dateFull="$(GET dateFull)" # %F = YYYY-MM-DD 1.27 date $(printf '%02d%02d%02d%02d%d.%02d' "${dateFull:5:2}" \ 1.28 @@ -117,13 +120,16 @@ 1.29 "$(GET sec)") >/dev/null 1.30 fi;; 1.31 1.32 - rdate) # get and possibly set the system date/time from a remote host 1.33 + rdate) 1.34 + # get and possibly set the system date/time from a remote host 1.35 rdate -s tick.greyware.com ;; 1.36 1.37 - hwclock) # query and set hardware clock (RTC) 1.38 + hwclock) 1.39 + # query and set hardware clock (RTC) 1.40 hwclock -w -u ;; 1.41 1.42 - gethwclock) # get date/time from hardware clock (AJAX) 1.43 + gethwclock) 1.44 + # get date/time from hardware clock (AJAX) 1.45 header; hwclock -ur | sed 's|0.000000 seconds||'; exit 0;; 1.46 1.47 esac 1.48 @@ -201,7 +207,8 @@ 1.49 ;; 1.50 1.51 1.52 - *\ menuIcon\ *) # return specified image (AJAX) 1.53 + *\ menuIcon\ *) 1.54 + # return specified image (AJAX) 1.55 icon="/usr/share/pixmaps/$(GET menuIcon).png" 1.56 [ ! -r $icon ] && exit 0 1.57 header "Content-Type: image/png"; cat $icon; exit 0 1.58 @@ -232,7 +239,7 @@ 1.59 <header> 1.60 <input type="hidden" name="groups"/> 1.61 <!-- $(_ 'Selection:') --> 1.62 - <button name="do" value="delgroups" data-icon="delete">$(_ 'Delete group')</button> 1.63 + <button name="do" value="delgroups" data-icon="@delete@">$(_ 'Delete group')</button> 1.64 </header> 1.65 1.66 <div class="scroll"> 1.67 @@ -253,7 +260,7 @@ 1.68 cat <<EOT 1.69 <tr> 1.70 <td><input type="checkbox" name="group" value="$group" id="$group"/> 1.71 - <label for="$group" data-icon="group">$group</label></td> 1.72 + <label for="$group" data-icon="@group@">$group</label></td> 1.73 <td>$3</td> 1.74 <td>${4//,/, }</td> 1.75 </tr> 1.76 @@ -272,7 +279,7 @@ 1.77 <form class="wide"> 1.78 <input type="hidden" name="groups"/> 1.79 <footer>$(_ 'Group name:') <input type="text" name="group"/> 1.80 - <button type="submit" name="do" value="addgroup" data-icon="add">$(_ 'Create group')</button> 1.81 + <button type="submit" name="do" value="addgroup" data-icon="@add@">$(_ 'Create group')</button> 1.82 </footer> 1.83 </form> 1.84 </section> 1.85 @@ -287,8 +294,8 @@ 1.86 $(_ 'User login:') <select name="member">$(listdb passwd)</select> 1.87 </div> 1.88 <footer> 1.89 - <button name="do" value="addmember" data-icon="add">$(_ 'Add user')</button> 1.90 - <button name="do" value="delmember" data-icon="delete">$(_ 'Remove user')</button> 1.91 + <button name="do" value="addmember" data-icon="@add@">$(_ 'Add user')</button> 1.92 + <button name="do" value="delmember" data-icon="@delete@">$(_ 'Remove user')</button> 1.93 </footer> 1.94 </form> 1.95 </section> 1.96 @@ -309,9 +316,9 @@ 1.97 <form class="wide"> 1.98 <header> 1.99 <!--$(_ 'Selection:')--> 1.100 - <button name="do" value="delusers" data-icon="delete">$(_ 'Delete user')</button> 1.101 - <button name="do" value="lockusers" data-icon="lock" >$(_ 'Lock user' )</button> 1.102 - <button name="do" value="unlockusers" data-icon="unlock">$(_ 'Unlock user')</button> 1.103 + <button name="do" value="delusers" data-icon="@delete@">$(_ 'Delete user')</button> 1.104 + <button name="do" value="lockusers" data-icon="@lock@" >$(_ 'Lock user' )</button> 1.105 + <button name="do" value="unlockusers" data-icon="@unlock@">$(_ 'Unlock user')</button> 1.106 </header> 1.107 1.108 <table class="wide zebra center"> 1.109 @@ -328,10 +335,10 @@ 1.110 EOT 1.111 for login in $(getdb passwd | cut -d: -f1); do 1.112 if [ -d "/home/$login" ]; then 1.113 - blocked=''; usericon='user' 1.114 + blocked=''; usericon='@user@' 1.115 if getdb shadow | grep -qs "^$login:!"; then 1.116 blocked='class="color31"' 1.117 - usericon="lock" 1.118 + usericon='@lock@' 1.119 fi 1.120 IFS=':' 1.121 set -- $(getdb passwd | grep "^$login:") 1.122 @@ -357,7 +364,7 @@ 1.123 <footer> 1.124 $(_ 'Password:') 1.125 <input type="password" name="password" placeholder="$(_ 'New password')"/> 1.126 - <button type="submit" name="do" value="chpasswd" data-icon="ok">$(_ 'Change password')</button> 1.127 + <button type="submit" name="do" value="chpasswd" data-icon="@ok@">$(_ 'Change password')</button> 1.128 </footer> 1.129 </form> 1.130 </section> 1.131 @@ -378,7 +385,7 @@ 1.132 </table> 1.133 1.134 <footer> 1.135 - <button type="submit" name="do" value="adduser" data-icon="add">$(_ 'Create user')</button> 1.136 + <button type="submit" name="do" value="adduser" data-icon="@add@">$(_ 'Create user')</button> 1.137 </footer> 1.138 </form> 1.139 </section> 1.140 @@ -477,7 +484,7 @@ 1.141 </table> 1.142 1.143 <footer> 1.144 - <button type="submit" data-icon="ok">$(_ 'Activate')</button> 1.145 + <button type="submit" data-icon="@ok@">$(_ 'Activate')</button> 1.146 </footer> 1.147 </form> 1.148 </section> 1.149 @@ -539,7 +546,7 @@ 1.150 </tr> 1.151 </table> 1.152 1.153 - <p>$(_ 'Manual edit: %s' "<a data-icon=\"conf\" href="index.cgi?file=$HOME/.profile">~/.profile</a>")<br/> 1.154 + <p>$(_ 'Manual edit: %s' "<a data-icon=\"@conf@\" href="index.cgi?file=$HOME/.profile">~/.profile</a>")<br/> 1.155 $(_ 'To take effect: log out and log in to system or execute command in the terminal:')</p> 1.156 1.157 <pre>. ~/.profile</pre> 1.158 @@ -588,10 +595,10 @@ 1.159 </tr> 1.160 </table> 1.161 <p>$(_ 'Manual edit: %s' \ 1.162 - "<a data-icon=\"conf\" href=\"index.cgi?file=$HOME/.local/share/desktop-directories/SliTazMenu.directory\">~/.local/share/desktop-directories/SliTazMenu.directory</a> 1.163 + "<a data-icon=\"@conf@\" href=\"index.cgi?file=$HOME/.local/share/desktop-directories/SliTazMenu.directory\">~/.local/share/desktop-directories/SliTazMenu.directory</a> 1.164 $( 1.165 find $HOME/.config/lxpanel -type f -name panel | awk -vh="$HOME" \ 1.166 - '{ printf "<a data-icon=\"conf\" href=\"index.cgi?file=%s\">%s</a> ", $1, gensub(h, "~", "")}' 1.167 + '{ printf "<a data-icon=\"@conf@\" href=\"index.cgi?file=%s\">%s</a> ", $1, gensub(h, "~", "")}' 1.168 )")</p> 1.169 </fieldset> 1.170 </div> 1.171 @@ -609,8 +616,8 @@ 1.172 1.173 cat <<EOT 1.174 <form><!-- 1.175 - --><button name="users" data-icon="user" >$(_ 'Manage users' )</button><!-- 1.176 - --><button name="groups" data-icon="group">$(_ 'Manage groups')</button> 1.177 + --><button name="users" data-icon="@user@" >$(_ 'Manage users' )</button><!-- 1.178 + --><button name="groups" data-icon="@group@">$(_ 'Manage groups')</button> 1.179 </form> 1.180 1.181 <section> 1.182 @@ -623,17 +630,17 @@ 1.183 awk -vtz="$(cat /etc/TZ)" \ 1.184 '{printf("<option%s>%s</option>", ($1 == tz)?" selected":"", $1)}') 1.185 </select> 1.186 - <button name="do" value="settz" data-icon="ok">$(_ 'Change')</button> 1.187 + <button name="do" value="settz" data-icon="@ok@">$(_ 'Change')</button> 1.188 </fieldset> 1.189 1.190 <fieldset><legend>$(_ 'System time:')</legend> 1.191 $(date | sed 's|[0-9][0-9]:[0-9:]*|<span id="time">&</span>|') 1.192 - <button name="do" value="rdate" data-icon="sync">$(_ 'Sync online')</button> 1.193 + <button name="do" value="rdate" data-icon="@sync@">$(_ 'Sync online')</button> 1.194 </fieldset> 1.195 1.196 <fieldset id="hwclock1"><legend>$(_ 'Hardware clock:')</legend> 1.197 <span id="hwclocks">$(hwclock -ur | sed 's|0.000000 seconds||')</span> 1.198 - <button name="do" value="hwclock" id="hwclock" data-icon="clock">$(_ 'Set hardware clock')</button> 1.199 + <button name="do" value="hwclock" id="hwclock" data-icon="@clock@">$(_ 'Set hardware clock')</button> 1.200 </fieldset> 1.201 1.202 <fieldset><legend>$(_ 'Set date')</legend> 1.203 @@ -652,7 +659,7 @@ 1.204 else 1.205 cat <<EOT 1.206 <button onclick="datePicker(); return false"> 1.207 - <span id="dateTime" data-icon="calendar">$(date +%x)<span style="display:none">$(date +%F)</span></span> 1.208 + <span id="dateTime" data-icon="@calendar@">$(date +%x)<span style="display:none">$(date +%F)</span></span> 1.209 </button> 1.210 EOT 1.211 fi 1.212 @@ -663,12 +670,12 @@ 1.213 EOT 1.214 if [ -z "$(which yad)" ]; then 1.215 cat <<EOT 1.216 - <button name="do" value="date" data-icon="ok">$(_ 'Set date')</button> 1.217 + <button name="do" value="date" data-icon="@ok@">$(_ 'Set date')</button> 1.218 EOT 1.219 else 1.220 cat <<EOT 1.221 1.222 - <button data-icon="ok" onclick="submitSysTimeForm()">$(_ 'Set date')</button> 1.223 + <button data-icon="@ok@" onclick="submitSysTimeForm()">$(_ 'Set date')</button> 1.224 EOT 1.225 fi 1.226 cat <<EOT 1.227 @@ -737,7 +744,7 @@ 1.228 cat <<EOT 1.229 $(_ 'Current system locale:') 1.230 <strong>$(locale | grep LANG | cut -d= -f2)</strong> 1.231 - <button name="locale" data-icon="locale">$(_ 'Change')</button> 1.232 + <button name="locale" data-icon="@locale@">$(_ 'Change')</button> 1.233 EOT 1.234 fi 1.235 cat <<EOT 1.236 @@ -780,8 +787,8 @@ 1.237 <form id="index" action="index.cgi"></form> 1.238 <br/> 1.239 $(_ 'Suggested keymap for Xorg:') $keymap 1.240 - <button form="settings" name="apply_xorg_kbd" value="$keymap" data-icon="ok">$(_ 'Activate')</button> 1.241 - <button form="index" name="file" value="$keyboard_config" data-icon="edit">$(_ 'Edit')</button> 1.242 + <button form="settings" name="apply_xorg_kbd" value="$keymap" data-icon="@ok@">$(_ 'Activate')</button> 1.243 + <button form="index" name="file" value="$keyboard_config" data-icon="@edit@">$(_ 'Edit')</button> 1.244 <input form="index" type="hidden" name="action" value="edit" /> 1.245 <br/> 1.246 EOT 1.247 @@ -792,7 +799,7 @@ 1.248 <select name="gen_keymap"> 1.249 $(list_keymaps) 1.250 </select> 1.251 - <button type="submit" data-icon="ok">$(_ 'Activate')</button> 1.252 + <button type="submit" data-icon="@ok@">$(_ 'Activate')</button> 1.253 </form> 1.254 </div> 1.255 </section> 1.256 @@ -804,13 +811,13 @@ 1.257 <form class="wide"> 1.258 <fieldset><legend>$(_ 'Style:')</legend> 1.259 <select name="style">$(list_styles)</select> 1.260 - <button data-icon="ok">$(_ 'Activate')</button> 1.261 + <button data-icon="@ok@">$(_ 'Activate')</button> 1.262 </fieldset> 1.263 </form> 1.264 1.265 <fieldset><legend>$(_ 'Configuration files:')</legend> 1.266 - <button form="index" name="file" value="$CONFIG" data-icon="edit">$(_ 'Panel')</button> 1.267 - <button form="index" name="file" value="$HTTPD_CONF" data-icon="edit">$(_ 'Server')</button> 1.268 + <button form="index" name="file" value="$CONFIG" data-icon="@edit@">$(_ 'Panel')</button> 1.269 + <button form="index" name="file" value="$HTTPD_CONF" data-icon="@edit@">$(_ 'Server')</button> 1.270 </fieldset> 1.271 1.272 <p>$(_ 'TazPanel provides a debugging mode and page:')