[v2] fff-web: Show WiFi channels

Details

Message ID	1508083889-56624-1-git-send-email-freifunk@adrianschmutzler.de
State	Superseded
Headers	show Return-Path: <franken-dev-bounces@freifunk.net> From: Adrian Schmutzler <freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Subject: [PATCH v2] fff-web: Show WiFi channels Date: Sun, 15 Oct 2017 18:11:29 +0200 Message-Id: <1508083889-56624-1-git-send-email-freifunk@adrianschmutzler.de> Precedence: list Reply-To: Adrian Schmutzler <freifunk@adrianschmutzler.de>, franken-dev@freifunk.net MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: franken-dev-bounces@freifunk.net Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Message ID

1508083889-56624-1-git-send-email-freifunk@adrianschmutzler.de

State

Superseded

Headers

From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Subject: [PATCH v2] fff-web: Show WiFi channels
Date: Sun, 15 Oct 2017 18:11:29 +0200
Message-Id: <1508083889-56624-1-git-send-email-freifunk@adrianschmutzler.de>
Precedence: list
Reply-To: Adrian Schmutzler <freifunk@adrianschmutzler.de>,
	franken-dev@freifunk.net
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Errors-To: franken-dev-bounces@freifunk.net
Sender: "franken-dev" <franken-dev-bounces@freifunk.net>

Commit Message

Adrian Schmutzler Oct. 15, 2017, 4:11 p.m.

Channels displayed are based on json!

This is combined with a reorganization of the columns.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Changes in v2:
 - Rebased onto fff-hoods: Fix case of missing keyxchangev2data
---
 .../fff/fff-web/files/www/ssl/cgi-bin/home.html    | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
index 64c89f7..6d64ade 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
@@ -55,15 +55,19 @@  if [ -n "$jsonfile" ] ; then
 	json_select hood
 	json_get_var mesh_type2 mesh_type2
 	json_get_var mesh_type5 mesh_type5
+	json_get_var chan2ghz channel2
+	json_get_var chan5ghz channel5
 else
 	mesh_type2="-"
 	mesh_type5="-"
+	chan2ghz="-"
+	chan5ghz="-"
 fi
 
 %>
 <table style="width: 100%;">
 <tr><td>
-<fieldset style="min-height: 15.05em;">
+<fieldset style="padding-bottom:12px">
 	<legend>System</legend>
 	<table>
 		<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
@@ -78,8 +82,18 @@  fi
 		<tr><th>Uhrzeit:</th><td><% date %></td></tr>
 	</table>
 </fieldset>
+<fieldset style="padding-bottom:12px">
+	<legend>Netz: Freifunk</legend>
+	<table>
+		<tr><th>Nutzer:</th><td><% cat /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c 'W' %></td></tr>
+		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
+		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
+		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh %></td></tr>
+		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh %></td></tr>
+	</table>
+</fieldset>
 </td><td>
-<fieldset style="min-height: 10em;">
+<fieldset style="padding-bottom:12px">
 	<legend>Software</legend>
 	<table>
 		<tr><th>Firmware Version:</th><td><%= ${FIRMWARE_VERSION} %></td></tr>
@@ -90,31 +104,19 @@  fi
 	</table>
 </fieldset>
 <form method="post">
-<fieldset style="min-height: 5em;">
+<fieldset style="padding-bottom:12px">
 	<legend>Hood</legend>
 	<table>
 		<tr><th style="width:200px">Hood:</th><td><% echo "$hood" %></td></tr>
 		<tr><th style="width:200px">Mesh-Type (2.4/5 GHz):</th><td><% echo "${mesh_type2} / ${mesh_type5}" %></td></tr>
+		<tr><th style="width:200px">Channel (2.4/5 GHz):</th><td><% echo "${chan2ghz} / ${chan5ghz}" %></td></tr>
 		<tr><td colspan="2">&nbsp;</td></tr>
 		<tr><td colspan="2">Beim Klicken werden die Hood-Daten innerhalb von 5 Minuten neu abgerufen und angewandt:</td></tr>
 		<tr><td colspan="2"><input type="submit" name="resethood" value="Reset hood data" /></td></tr>
 	</table>
 </fieldset>
 </form>
-</td></tr>
-<tr><td>
-<fieldset style="min-height: 12.65em;">
-	<legend>Netz: Freifunk</legend>
-	<table>
-		<tr><th>Nutzer:</th><td><% cat /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c 'W' %></td></tr>
-		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
-		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
-		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh %></td></tr>
-		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh %></td></tr>
-	</table>
-</fieldset>
-</td><td>
-<fieldset style="min-height: 12.65em;">
+<fieldset style="padding-bottom:12px">
 	<legend>Netz: WAN</legend>
 	<table>
 		<tr><th>Internet vorhanden:</th><td><%= ${internet_active} %></td></tr>

Comments

Tim Niemeyer Oct. 15, 2017, 4:46 p.m.

Hi

Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim

Am Sonntag, den 15.10.2017, 18:11 +0200 schrieb Adrian Schmutzler:
> Channels displayed are based on json!
> 
> This is combined with a reorganization of the columns.
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> 
> Changes in v2:
>  - Rebased onto fff-hoods: Fix case of missing keyxchangev2data
> ---
>  .../fff/fff-web/files/www/ssl/cgi-bin/home.html    | 36
> ++++++++++++----------
>  1 file changed, 19 insertions(+), 17 deletions(-)
> 
> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html 
> b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
> index 64c89f7..6d64ade 100755
> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
> @@ -55,15 +55,19 @@ if [ -n "$jsonfile" ] ; then
>  	json_select hood
>  	json_get_var mesh_type2 mesh_type2
>  	json_get_var mesh_type5 mesh_type5
> +	json_get_var chan2ghz channel2
> +	json_get_var chan5ghz channel5
>  else
>  	mesh_type2="-"
>  	mesh_type5="-"
> +	chan2ghz="-"
> +	chan5ghz="-"
>  fi
>  
>  %>
>  <table style="width: 100%;">
>  <tr><td>
> -<fieldset style="min-height: 15.05em;">
> +<fieldset style="padding-bottom:12px">
>  	<legend>System</legend>
>  	<table>
>  		<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
> @@ -78,8 +82,18 @@ fi
>  		<tr><th>Uhrzeit:</th><td><% date %></td></tr>
>  	</table>
>  </fieldset>
> +<fieldset style="padding-bottom:12px">
> +	<legend>Netz: Freifunk</legend>
> +	<table>
> +		<tr><th>Nutzer:</th><td><% cat
> /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null |
> grep -c 'W' %></td></tr>
> +		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-
> mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
> +		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-
> mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
> +		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh
> %></td></tr>
> +		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh
> %></td></tr>
> +	</table>
> +</fieldset>
>  </td><td>
> -<fieldset style="min-height: 10em;">
> +<fieldset style="padding-bottom:12px">
>  	<legend>Software</legend>
>  	<table>
>  		<tr><th>Firmware Version:</th><td><%=
> ${FIRMWARE_VERSION} %></td></tr>
> @@ -90,31 +104,19 @@ fi
>  	</table>
>  </fieldset>
>  <form method="post">
> -<fieldset style="min-height: 5em;">
> +<fieldset style="padding-bottom:12px">
>  	<legend>Hood</legend>
>  	<table>
>  		<tr><th style="width:200px">Hood:</th><td><% echo
> "$hood" %></td></tr>
>  		<tr><th style="width:200px">Mesh-Type (2.4/5
> GHz):</th><td><% echo "${mesh_type2} / ${mesh_type5}" %></td></tr>
> +		<tr><th style="width:200px">Channel (2.4/5
> GHz):</th><td><% echo "${chan2ghz} / ${chan5ghz}" %></td></tr>
>  		<tr><td colspan="2">&nbsp;</td></tr>
>  		<tr><td colspan="2">Beim Klicken werden die Hood-
> Daten innerhalb von 5 Minuten neu abgerufen und angewandt:</td></tr>
>  		<tr><td colspan="2"><input type="submit"
> name="resethood" value="Reset hood data" /></td></tr>
>  	</table>
>  </fieldset>
>  </form>
> -</td></tr>
> -<tr><td>
> -<fieldset style="min-height: 12.65em;">
> -	<legend>Netz: Freifunk</legend>
> -	<table>
> -		<tr><th>Nutzer:</th><td><% cat
> /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null |
> grep -c 'W' %></td></tr>
> -		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-
> mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
> -		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-
> mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
> -		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh
> %></td></tr>
> -		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh
> %></td></tr>
> -	</table>
> -</fieldset>
> -</td><td>
> -<fieldset style="min-height: 12.65em;">
> +<fieldset style="padding-bottom:12px">
>  	<legend>Netz: WAN</legend>
>  	<table>
>  		<tr><th>Internet vorhanden:</th><td><%=
> ${internet_active} %></td></tr>
> -- 
> 2.7.4
>

Fabian Blaese Oct. 19, 2017, 10:55 p.m.

Da hab ich doch glatt den falschen Patch erwischt. Ist aber nur ein Rebase und auch hier ist allen in Ordnung. Daher

Reviewed-by: Fabian Bläse <fabian@blaese.de>
Tested-by: Fabian Bläse <fabian@blaese.de>

Fabian

> On 15. Oct 2017, at 18:46, Tim Niemeyer <tim@tn-x.org> wrote:
> 
> Hi
> 
> Reviewed-by: Tim Niemeyer <tim@tn-x.org>
> 
> Tim
> 
> Am Sonntag, den 15.10.2017, 18:11 +0200 schrieb Adrian Schmutzler:
>> Channels displayed are based on json!
>> 
>> This is combined with a reorganization of the columns.
>> 
>> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
>> 
>> Changes in v2:
>>  - Rebased onto fff-hoods: Fix case of missing keyxchangev2data
>> ---
>>  .../fff/fff-web/files/www/ssl/cgi-bin/home.html    | 36
>> ++++++++++++----------
>>  1 file changed, 19 insertions(+), 17 deletions(-)
>> 
>> diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
>> b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
>> index 64c89f7..6d64ade 100755
>> --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
>> +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html
>> @@ -55,15 +55,19 @@ if [ -n "$jsonfile" ] ; then
>>  	json_select hood
>>  	json_get_var mesh_type2 mesh_type2
>>  	json_get_var mesh_type5 mesh_type5
>> +	json_get_var chan2ghz channel2
>> +	json_get_var chan5ghz channel5
>>  else
>>  	mesh_type2="-"
>>  	mesh_type5="-"
>> +	chan2ghz="-"
>> +	chan5ghz="-"
>>  fi
>> 
>>  %>
>>  <table style="width: 100%;">
>>  <tr><td>
>> -<fieldset style="min-height: 15.05em;">
>> +<fieldset style="padding-bottom:12px">
>>  	<legend>System</legend>
>>  	<table>
>>  		<tr><th>Name:</th><td><%= ${HOSTNAME} %></td></tr>
>> @@ -78,8 +82,18 @@ fi
>>  		<tr><th>Uhrzeit:</th><td><% date %></td></tr>
>>  	</table>
>>  </fieldset>
>> +<fieldset style="padding-bottom:12px">
>> +	<legend>Netz: Freifunk</legend>
>> +	<table>
>> +		<tr><th>Nutzer:</th><td><% cat
>> /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null |
>> grep -c 'W' %></td></tr>
>> +		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-
>> mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
>> +		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-
>> mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
>> +		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh
>> %></td></tr>
>> +		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh
>> %></td></tr>
>> +	</table>
>> +</fieldset>
>>  </td><td>
>> -<fieldset style="min-height: 10em;">
>> +<fieldset style="padding-bottom:12px">
>>  	<legend>Software</legend>
>>  	<table>
>>  		<tr><th>Firmware Version:</th><td><%=
>> ${FIRMWARE_VERSION} %></td></tr>
>> @@ -90,31 +104,19 @@ fi
>>  	</table>
>>  </fieldset>
>>  <form method="post">
>> -<fieldset style="min-height: 5em;">
>> +<fieldset style="padding-bottom:12px">
>>  	<legend>Hood</legend>
>>  	<table>
>>  		<tr><th style="width:200px">Hood:</th><td><% echo
>> "$hood" %></td></tr>
>>  		<tr><th style="width:200px">Mesh-Type (2.4/5
>> GHz):</th><td><% echo "${mesh_type2} / ${mesh_type5}" %></td></tr>
>> +		<tr><th style="width:200px">Channel (2.4/5
>> GHz):</th><td><% echo "${chan2ghz} / ${chan5ghz}" %></td></tr>
>>  		<tr><td colspan="2">&nbsp;</td></tr>
>>  		<tr><td colspan="2">Beim Klicken werden die Hood-
>> Daten innerhalb von 5 Minuten neu abgerufen und angewandt:</td></tr>
>>  		<tr><td colspan="2"><input type="submit"
>> name="resethood" value="Reset hood data" /></td></tr>
>>  	</table>
>>  </fieldset>
>>  </form>
>> -</td></tr>
>> -<tr><td>
>> -<fieldset style="min-height: 12.65em;">
>> -	<legend>Netz: Freifunk</legend>
>> -	<table>
>> -		<tr><th>Nutzer:</th><td><% cat
>> /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null |
>> grep -c 'W' %></td></tr>
>> -		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-
>> mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
>> -		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-
>> mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
>> -		<tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh
>> %></td></tr>
>> -		<tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh
>> %></td></tr>
>> -	</table>
>> -</fieldset>
>> -</td><td>
>> -<fieldset style="min-height: 12.65em;">
>> +<fieldset style="padding-bottom:12px">
>>  	<legend>Netz: WAN</legend>
>>  	<table>
>>  		<tr><th>Internet vorhanden:</th><td><%=
>> ${internet_active} %></td></tr>
>> --
>> 2.7.4
> --
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net