SliTaz Repositories

     1.1 --- a/network.cgi	Sun Aug 30 18:52:48 2015 +0200
     1.2 +++ b/network.cgi	Sun Jan 24 22:20:07 2016 +0100
     1.3 @@ -281,21 +281,21 @@
     1.4  				</tr>
     1.5  				<tr id="wk1"><td>$(_ 'MAC address to wake up')</td>
     1.6  					<td><input type="text" name="macwakup" title="$(_ 'Leave empty for a general wakeup')" $PAR/><!--
     1.7 -					--><button form="indexform" name="file" value="/etc/ethers" data-icon="view">$(_ 'List')</button>
     1.8 +					--><button form="indexform" name="file" value="/etc/ethers" data-icon="@view@">$(_ 'List')</button>
     1.9  					</td>
    1.10  				</tr>
    1.11  				<tr id="wk2"><td>$(_ 'MAC/IP address password')</td>
    1.12  					<td><input type="text" name="macpass" title="$(_ 'Optional')" $PAR/><!--
    1.13 -					--><button form="indexform" name="exec" value="ether-wake --help" data-icon="help">$(_ 'Help')</button>
    1.14 +					--><button form="indexform" name="exec" value="ether-wake --help" data-icon="@help@">$(_ 'Help')</button>
    1.15  					</td>
    1.16  				</tr>
    1.17  			</table>
    1.18  		</div>
    1.19  	</form>
    1.20  	<footer><!--
    1.21 -		--><button form="conf" type="submit" name="start_eth" data-icon="start" $start_disabled>$(_ 'Start'  )</button><!--
    1.22 -		--><button form="conf" type="submit" name="stop"      data-icon="stop"  $stop_disabled >$(_ 'Stop'   )</button><!--
    1.23 -		--><button id="wk3" form="conf" type="submit" name="dowakeup"  data-icon="clock" $stop_disabled >$(_ 'Wake up')</button><!--
    1.24 +		--><button form="conf" type="submit" name="start_eth" data-icon="@start@" $start_disabled>$(_ 'Start'  )</button><!--
    1.25 +		--><button form="conf" type="submit" name="stop"      data-icon="@stop@"  $stop_disabled >$(_ 'Stop'   )</button><!--
    1.26 +		--><button id="wk3" form="conf" type="submit" name="dowakeup"  data-icon="@clock@" $stop_disabled >$(_ 'Wake up')</button><!--
    1.27  	--></footer>
    1.28  </section>
    1.29  
    1.30 @@ -363,6 +363,13 @@
    1.31  
    1.32  				QUALITY=$(echo "$SCAN" | sed -n 's|.*Quality[:=]\([^ ]*\).*|\1|p')
    1.33  				QUALITY_ICON="lvl$(( 5*${QUALITY:-0} ))"		# lvl0 .. lvl4, lvl5
    1.34 +				case $QUALITY_ICON in
    1.35 +					lvl0) QUALITY_ICON='@lvl0@';;
    1.36 +					lvl1) QUALITY_ICON='@lvl1@';;
    1.37 +					lvl2) QUALITY_ICON='@lvl2@';;
    1.38 +					lvl3) QUALITY_ICON='@lvl3@';;
    1.39 +					lvl4|lvl5) QUALITY_ICON='@lvl4@';;
    1.40 +				esac
    1.41  				LEVEL=$(echo "$SCAN" | sed -n 's|.*Signal level[:=]\([^ ]*\).*|\1|p; s|-|−|')
    1.42  
    1.43  				ENCRYPTION=$(echo "$SCAN" | sed -n 's|.*Encryption key[:=]\([^ ]*\).*|\1|p')		# on/off
    1.44 @@ -390,14 +397,14 @@
    1.45  					# "WPA" or "WPA2" or "WPA/WPA2" (maybe also "WPA2/WPA")
    1.46  					ENC_SIMPLE=$(echo "$SCAN" | sed -n '/.*WPA.*/ s|.*\(WPA[^ ]*\).*|\1|p')
    1.47  					ENC_SIMPLE=$(echo $ENC_SIMPLE | sed 's| |/|')
    1.48 -					ENC_ICON='sechi' # high
    1.49 +					ENC_ICON='@sechi@' # high
    1.50  					if [ -z "$ENC_SIMPLE" ]; then
    1.51  						WIFI_KEY_TYPE='WEP'
    1.52 -						ENC_SIMPLE='WEP'; ENC_ICON='secmi' # middle
    1.53 +						ENC_SIMPLE='WEP'; ENC_ICON='@secmi@' # middle
    1.54  					fi
    1.55  				else
    1.56  					WIFI_KEY_TYPE='NONE'
    1.57 -					ENC_SIMPLE="$(_ 'None')"; ENC_ICON='seclo' # low
    1.58 +					ENC_SIMPLE="$(_ 'None')"; ENC_ICON='@seclo@' # low
    1.59  				fi
    1.60  
    1.61  				# Connected or not connected...
    1.62 @@ -410,7 +417,7 @@
    1.63  
    1.64  				cat <<EOT
    1.65  <tr>
    1.66 -	<td><a data-icon="wifi" onclick="loadcfg('$ESSID', '$BSSID', '$WIFI_KEY_TYPE')">${ESSID:-$HIDDEN}</a></td>
    1.67 +	<td><a data-icon="@wifi@" onclick="loadcfg('$ESSID', '$BSSID', '$WIFI_KEY_TYPE')">${ESSID:-$HIDDEN}</a></td>
    1.68  	<td><span data-icon="$QUALITY_ICON" title="Quality: $QUALITY"> $LEVEL dBm</span></td>
    1.69  	<td>$CHANNEL</td>
    1.70  	<td><span data-icon="$ENC_ICON">$ENC_SIMPLE</span></td>
    1.71 @@ -443,9 +450,9 @@
    1.72  		[ -w /etc/network.conf ] && cat <<EOT
    1.73  <form>
    1.74  	<input type="hidden" name="wifi"/>
    1.75 -	   <button name="start_wifi" data-icon="start"   $start_disabled>$(_ 'Start')</button><!--
    1.76 -	--><button name="stop"       data-icon="stop"    $stop_disabled >$(_ 'Stop' )</button><!--
    1.77 -	--><button type="submit"     data-icon="refresh" $stop_disabled >$(_ 'Scan' )</button>
    1.78 +	   <button name="start_wifi" data-icon="@start@"   $start_disabled>$(_ 'Start')</button><!--
    1.79 +	--><button name="stop"       data-icon="@stop@"    $stop_disabled >$(_ 'Stop' )</button><!--
    1.80 +	--><button type="submit"     data-icon="@refresh@" $stop_disabled >$(_ 'Scan' )</button>
    1.81  </form>
    1.82  EOT
    1.83  
    1.84 @@ -453,7 +460,7 @@
    1.85  		if [ -n "$start_disabled" ]; then
    1.86  			cat <<EOT
    1.87  <section id="wifiList">
    1.88 -	<div style="text-align: center;"><span data-icon="clock">$(_ 'Scanning wireless interface...')</span></div>
    1.89 +	<div style="text-align: center;"><span data-icon="@clock@">$(_ 'Scanning wireless interface...')</span></div>
    1.90  </section>
    1.91  
    1.92  <script type="text/javascript">
    1.93 @@ -534,7 +541,7 @@
    1.94  					<td><div>$(_ 'Password')</div></td>
    1.95  					<td><div>
    1.96  						<input type="password" name="password" value="$WIFI_KEY_ESCAPED" id="password"/>
    1.97 -						<span data-img="view" title="$(_ 'Show password')"
    1.98 +						<span data-img="@view@" title="$(_ 'Show password')"
    1.99  							onmousedown="document.getElementById('password').type='text'; return false"
   1.100  							  onmouseup="document.getElementById('password').type='password'"
   1.101  							 onmouseout="document.getElementById('password').type='password'"
   1.102 @@ -546,8 +553,8 @@
   1.103  		</form>
   1.104  	</div>
   1.105  	<footer>
   1.106 -		<button form="connection" type="submit" name="wifi" data-icon="ok">$(_ 'Configure')</button>
   1.107 -		<button data-icon="user" onclick="shareWiFi(); popup('popup_qr', 'show');">$(_ 'Share')</button>
   1.108 +		<button form="connection" type="submit" name="wifi" data-icon="@ok@">$(_ 'Configure')</button>
   1.109 +		<button data-icon="@user@" onclick="shareWiFi(); popup('popup_qr', 'show');">$(_ 'Share')</button>
   1.110  	</footer>
   1.111  </section>
   1.112  
   1.113 @@ -636,16 +643,16 @@
   1.114  <form action="index.cgi" id="indexform"></form>
   1.115  
   1.116  <form id="mainform"><!--
   1.117 -	--><button name="start"   data-icon="start"   $start_disabled>$(_ 'Start'  )</button><!--
   1.118 -	--><button name="stop"    data-icon="stop"    $stop_disabled >$(_ 'Stop'   )</button><!--
   1.119 -	--><button name="restart" data-icon="restart" $stop_disabled >$(_ 'Restart')</button>
   1.120 +	--><button name="start"   data-icon="@start@"   $start_disabled>$(_ 'Start'  )</button><!--
   1.121 +	--><button name="stop"    data-icon="@stop@"    $stop_disabled >$(_ 'Stop'   )</button><!--
   1.122 +	--><button name="restart" data-icon="@restart@" $stop_disabled >$(_ 'Restart')</button>
   1.123  </form>
   1.124  
   1.125  <div class="float-right"><!--
   1.126  	-->$(_ 'Configuration:')<!--
   1.127 -	--><button form="indexform" name="file" value="/etc/network.conf" data-icon="conf">network.conf</button><!--
   1.128 -	--><button form="mainform" name="eth" data-icon="eth">Ethernet</button><!--
   1.129 -	--><button form="mainform" name="wifi" data-icon="wifi">Wireless</button>
   1.130 +	--><button form="indexform" name="file" value="/etc/network.conf" data-icon="@conf@">network.conf</button><!--
   1.131 +	--><button form="mainform" name="eth" data-icon="@eth@">Ethernet</button><!--
   1.132 +	--><button form="mainform" name="wifi" data-icon="@wifi@">Wireless</button>
   1.133  </div>
   1.134  
   1.135  
   1.136 @@ -659,7 +666,7 @@
   1.137  EOT
   1.138  		_ 'forward packets between interfaces'
   1.139  		[ "$REMOTE_USER" == 'root' ] && cat <<EOT
   1.140 -		<button form="mainform" name="toggleipforward" data-icon="ok">$(_ 'Change')</button>
   1.141 +		<button form="mainform" name="toggleipforward" data-icon="@ok@">$(_ 'Change')</button>
   1.142  EOT
   1.143  		cat <<EOT
   1.144  	</footer>
   1.145 @@ -668,14 +675,14 @@
   1.146  
   1.147  <section>
   1.148  	<header id="hosts">$(_ 'Hosts'; edit_button /etc/hosts)</header>
   1.149 -	<span data-icon="info">$(r=$(getdb hosts | wc -l); 
   1.150 +	<span data-icon="@info@">$(r=$(getdb hosts | wc -l); 
   1.151  		_p '%d record in the hosts DB' \
   1.152  			'%d records in the hosts DB' "$r" \
   1.153  			"$r")</span>
   1.154  	<pre class="scroll">$(getdb hosts | fgrep -v 0.0.0.0)</pre>
   1.155  	<footer>
   1.156  		<form action="hosts.cgi">
   1.157 -			<button data-icon="admin" data-root>$(_ 'Configure')</button>
   1.158 +			<button data-icon="@admin@" data-root>$(_ 'Configure')</button>
   1.159  			$(_ 'Use hosts file as Ad blocker')
   1.160  		</form>
   1.161  	</footer>
   1.162 @@ -690,7 +697,7 @@
   1.163  			cat <<EOT
   1.164  		<form>
   1.165  			<input type="text" name="hostname" value="$(hostname)"/><!--
   1.166 -			--><button type="submit" data-icon="ok">$(_ 'Change')</button>
   1.167 +			--><button type="submit" data-icon="@ok@">$(_ 'Change')</button>
   1.168  		</form>
   1.169  EOT
   1.170  		else
   1.171 @@ -730,7 +737,7 @@
   1.172  	<tr><td>
   1.173  	<input type="hidden" name="entry" value="$(urlencode "$(echo $line | \
   1.174  		sed 's/) .* on/ -i/;s/.*(//')")">
   1.175 -	<button type="submit" data-icon="remove" name="rmarp"></button>
   1.176 +	<button type="submit" data-icon="@remove@" name="rmarp"></button>
   1.177  	</td><td><pre>$line</pre></td></tr>
   1.178  </form>
   1.179  EOT
   1.180 @@ -740,8 +747,8 @@
   1.181  	<footer>
   1.182  		<form>
   1.183  			IP <input type="text" name="ip" value="10.20.30.40" size="12" /> on $(select_if)<!--
   1.184 -			--><button type="submit" data-icon="upgrade" name="proxyarp">$(_ 'Proxy')</button>
   1.185 -			or <button type="submit" data-icon="add" name="addarp">$(_ 'Add')</button>
   1.186 +			--><button type="submit" data-icon="@upgrade@" name="proxyarp">$(_ 'Proxy')</button>
   1.187 +			or <button type="submit" data-icon="@add@" name="addarp">$(_ 'Add')</button>
   1.188  			 MAC <input type="text" name="mac" value="11:22:33:44:55:66" size="16" />
   1.189  		</form>
   1.190  EOT