From 73d125b250b0e1741f8f7298226107566b33de61 Mon Sep 17 00:00:00 2001
From: ficus <ficus@robocracy.org>
Date: Tue, 25 Sep 2012 19:01:13 +0200
Subject: dhcp settings for lan and wifi

---
 torouterui/templates/lan.html  |  5 ++++-
 torouterui/templates/lib.html  | 13 +++++++++++--
 torouterui/templates/wifi.html |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'torouterui/templates')

diff --git a/torouterui/templates/lan.html b/torouterui/templates/lan.html
index 09bcf0a..9b260bf 100644
--- a/torouterui/templates/lan.html
+++ b/torouterui/templates/lan.html
@@ -14,11 +14,14 @@
 <legend>Address Configuration</legend>
 {{ lib.forminput(form, formerr, 'ipv4addr', 'IPv4 Address', '0.0.0.0') }}
 {{ lib.forminput(form, formerr, 'ipv4netmask', 'Netmask', '255.255.0.0') }}
-{{ lib.forminput(form, formerr, 'ipv4gateway', 'Gateway IP Address', '0.0.0.0') }}
 
 <legend>DHCP Configuration</legend>
+Make sure that the assigned addresses all fall within the netmask range
+specified above!
+
 {{ lib.forminput(form, formerr, 'dhcpbase', 'DHCP Range Base', '192.168.1.100') }}
 {{ lib.forminput(form, formerr, 'dhcptop', 'DHCP Range Top', '192.168.1.200') }}
+{{ lib.forminput(form, formerr, 'dhcpnetmask', 'DHCP Netmask', '255.255.255.0') }}
 {{ lib.forminput(form, formerr, 'dhcptime', 'Lease Time', '12h') }}
 
 <div class="pull-right">
diff --git a/torouterui/templates/lib.html b/torouterui/templates/lib.html
index 6ac5e12..03a671f 100644
--- a/torouterui/templates/lib.html
+++ b/torouterui/templates/lib.html
@@ -39,8 +39,17 @@ Network hardware not detected at all!
       <th>SSID
       <td><span style="font-family:monospace;">{{ ifstatus.ssid }}</span>
     <tr>
-      <th>Frequency
-      <td><span style="font-family:monospace;">{{ ifstatus.freq }}</span>
+      <th>SSID Broadcast?
+      <td><span style="font-family:monospace;">{{ ifstatus.ssid_broadcast }}</span>
+    <tr>
+      <th>Channel
+      <td><span style="font-family:monospace;">{{ ifstatus.channel }}</span>
+    <tr>
+      <th>TX Power
+      <td><span style="font-family:monospace;">{{ ifstatus.tx_power }}</span>
+    <tr>
+      <th>Auth Mode
+      <td><span style="font-family:monospace;">{{ ifstatus.auth_mode }}</span>
     <tr>
       <th>Signal Strength
       <td><span style="font-family:monospace;">{{ ifstatus.signal_dbm }}</span>
diff --git a/torouterui/templates/wifi.html b/torouterui/templates/wifi.html
index 3e41788..c8f17f0 100644
--- a/torouterui/templates/wifi.html
+++ b/torouterui/templates/wifi.html
@@ -20,11 +20,11 @@
 <legend>Network Address</legend>
 {{ lib.forminput(form, formerr, 'ipv4addr', 'IPv4 Address', '0.0.0.0') }}
 {{ lib.forminput(form, formerr, 'ipv4netmask', 'Netmask', '255.255.0.0') }}
-{{ lib.forminput(form, formerr, 'ipv4gateway', 'Gateway IP Address', '0.0.0.0') }}
 
 <legend>DHCP Server</legend>
 {{ lib.forminput(form, formerr, 'dhcpbase', 'DHCP Range Base', '192.168.1.100') }}
 {{ lib.forminput(form, formerr, 'dhcptop', 'DHCP Range Top', '192.168.1.200') }}
+{{ lib.forminput(form, formerr, 'dhcpnetmask', 'DHCP Range Top', '255.255.255.0') }}
 {{ lib.forminput(form, formerr, 'dhcptime', 'Lease Time', '12h') }}
 
 <div class="pull-right">
-- 
cgit v1.2.3