Message ID | 1508063003-28323-1-git-send-email-freifunk@adrianschmutzler.de |
---|---|
State | Superseded |
Headers | show |
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 1569c01..ed34ca6 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 @@ -54,15 +54,19 @@ if [ -s /tmp/keyxchangev2data ] ; 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> @@ -77,8 +81,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> @@ -89,31 +103,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"> </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>
Am Sonntag, den 15.10.2017, 12:23 +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> > --- > .../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 1569c01..ed34ca6 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 > @@ -54,15 +54,19 @@ if [ -s /tmp/keyxchangev2data ] ; then Hier könnte das selbe Problem auftreten wir bei "[PATCH] fff-hoods: Fix case of missing keyxchangev2data" versucht wird zu lösen.. Das UI-Design hab ich mir nicht angeschaut. Ansonsten einverstanden: Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim > 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> > @@ -77,8 +81,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> > @@ -89,31 +103,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"> </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 >
Hallo Tim, den muss ich rebasen. Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Sonntag, 15. Oktober 2017 17:45 > To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken- > dev@freifunk.net > Subject: Re: [PATCH] fff-web: Show WiFi channels > > Am Sonntag, den 15.10.2017, 12:23 +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> > > --- > > .../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 1569c01..ed34ca6 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 > > @@ -54,15 +54,19 @@ if [ -s /tmp/keyxchangev2data ] ; then > Hier könnte das selbe Problem auftreten wir bei "[PATCH] fff-hoods: Fix case > of missing keyxchangev2data" versucht wird zu lösen.. > > Das UI-Design hab ich mir nicht angeschaut. Ansonsten einverstanden: > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > Tim > > > 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> > > @@ -77,8 +81,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> > > @@ -89,31 +103,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"> </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 > >
Reviewed-by: Fabian Bläse <fabian@blaese.de> Tested-by: Fabian Bläse <fabian@blaese.de> Fabian > On 15. Oct 2017, at 18:01, mail@adrianschmutzler.de wrote: > > Hallo Tim, > > den muss ich rebasen. > > Grüße > > Adrian > >> -----Original Message----- >> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf >> Of Tim Niemeyer >> Sent: Sonntag, 15. Oktober 2017 17:45 >> To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken- >> dev@freifunk.net >> Subject: Re: [PATCH] fff-web: Show WiFi channels >> >> Am Sonntag, den 15.10.2017, 12:23 +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> >>> --- >>> .../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 1569c01..ed34ca6 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 >>> @@ -54,15 +54,19 @@ if [ -s /tmp/keyxchangev2data ] ; then >> Hier könnte das selbe Problem auftreten wir bei "[PATCH] fff-hoods: Fix case >> of missing keyxchangev2data" versucht wird zu lösen.. >> >> Das UI-Design hab ich mir nicht angeschaut. Ansonsten einverstanden: >> Reviewed-by: Tim Niemeyer <tim@tn-x.org> >> >> Tim >> >>> 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> >>> @@ -77,8 +81,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> >>> @@ -89,31 +103,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"> </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
Channels displayed are based on json! This is combined with a reorganization of the columns. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- .../fff/fff-web/files/www/ssl/cgi-bin/home.html | 36 ++++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-)