From 4f3d0084351693f6bfc4fc45e9231ee3273feec6 Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sat, 19 Jul 2008 11:03:14 +0000
Subject: modules/admin-mini: Added WLAN-Scan page Minor translation fixes

---
 i18n/english/luasrc/i18n/admin-core.en.lua         |  5 ++-
 i18n/german/luasrc/i18n/admin-core.de.lua          |  5 ++-
 .../admin-full/luasrc/controller/admin/status.lua  |  4 +-
 modules/admin-mini/luasrc/controller/mini/wifi.lua |  3 +-
 modules/admin-mini/luasrc/view/mini/iwscan.htm     | 52 ++++++++++++++++++++++
 5 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 modules/admin-mini/luasrc/view/mini/iwscan.htm

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 1c2294b79..cc465cc65 100644
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -259,4 +259,7 @@ m_i_systemtime = "Local Time"
 m_i_uptime = "Uptime"
 
 m_n_d_firstaddress = "First leased address"
-m_n_d_numleases = "Number of leasesed addresses"
\ No newline at end of file
+m_n_d_numleases = "Number of leasesed addresses"
+
+routingtable = "Routing table"
+wlanscan = "Wifi scan"
\ No newline at end of file
diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 0597fd866..fb685c0f1 100644
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -273,4 +273,7 @@ m_i_systemtime = "Lokale Zeit"
 m_i_uptime = "Laufzeit"
 
 m_n_d_firstaddress = "Erste vergebene Adresse"
-m_n_d_numleases = "Anzahl vergebener Adressen"
\ No newline at end of file
+m_n_d_numleases = "Anzahl vergebener Adressen"
+
+routingtable = "Routingtabelle"
+wlanscan = "WLAN-Scan"
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 3a0f04074..ea7ad1b03 100644
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -19,8 +19,8 @@ function index()
 
 	entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20)
 	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "Systemprotokoll"))
-	entry({"admin", "status", "routes"}, template("admin_status/routes"), "Routingtabelle", 10)
-	entry({"admin", "status", "iwscan"}, template("admin_status/iwscan"), "WLAN-Scan", 20)
+	entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("routingtable"), 10)
+	entry({"admin", "status", "iwscan"}, template("admin_status/iwscan"), i18n("wlanscan"), 20)
 end
 
 function action_syslog()
diff --git a/modules/admin-mini/luasrc/controller/mini/wifi.lua b/modules/admin-mini/luasrc/controller/mini/wifi.lua
index 91183199b..1fa8c2a71 100644
--- a/modules/admin-mini/luasrc/controller/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/controller/mini/wifi.lua
@@ -18,5 +18,6 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"mini", "wifi"}, cbi("mini/wifi"), i18n("wifi", "Drahtlos"), 30)
+	entry({"mini", "wifi"}, cbi("mini/wifi"), i18n("wifi"), 30)
+	entry({"mini", "wifi", "scan"}, template("mini/iwscan"), i18n("wlanscan"), 10)
 end
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/iwscan.htm b/modules/admin-mini/luasrc/view/mini/iwscan.htm
new file mode 100644
index 000000000..cbba791e6
--- /dev/null
+++ b/modules/admin-mini/luasrc/view/mini/iwscan.htm
@@ -0,0 +1,52 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
+<%+header%>
+<h1><%:iwscan%></h1>
+<p><%:iwscan1%></p>
+
+<br />
+<table cellspacing="0" cellpadding="6" class="smalltext">
+<tr>
+<th><%:interface%></th>
+<th>ESSID</th>
+<th>BSSID</th>
+<th><%:mode%></th>
+<th><%:channel%></th>
+<th><%:iwscan_encr%></th>
+<th><%:iwscan_link%></th>
+<th><%:iwscan_signal%></th>
+<th><%:iwscan_noise%></th>
+</tr>
+<%for iface, cells in pairs(luci.sys.wifi.iwscan()) do
+	for i, cell in ipairs(cells) do 
+%>
+<tr>
+<td><%=iface%></td>
+<td><%=cell.ESSID%></td>
+<td><%=cell.Address%></td>
+<td><%=cell.Mode%></td>
+<td><%=(cell.Channel or cell.Frequency or "")%></td>
+<td><%=cell["Encryption key"]%></td>
+<td><%=cell.Quality%></td>
+<td><%=cell["Signal level"]%></td>
+<td><%=cell["Noise level"]%></td>
+</tr>
+<%
+	end
+end
+%>
+</table>
+<br />
+<%+footer%>
\ No newline at end of file
-- 
cgit v1.2.3