Changeset 6653

Timestamp:

12/17/10 03:14:28 (2 years ago)

Author:

soma

Message:

applications/luci-olsr: Add overview page, move old index to neigbors

Location:

luci/trunk/applications/luci-olsr

Files:

• htdocs (added)
• htdocs/cgi-bin-nodes.html (added)
• htdocs/cgi-bin-status.html (added)
• luasrc/controller/olsr.lua (modified) (5 diffs)
• luasrc/view/status-olsr/index.htm (deleted)
• luasrc/view/status-olsr/interfaces.htm (added)
• luasrc/view/status-olsr/neighbors.htm (added)
• luasrc/view/status-olsr/overview.htm (added)
• luasrc/view/status-olsr/smartgw.htm (modified) (2 diffs)

luci/trunk/applications/luci-olsr/luasrc/controller/olsr.lua

@@ -10 +10 @@
 
     local page  = node("admin", "status", "olsr")
-    page.target = call("action_index")
+    page.target = template("status-olsr/overview")
     page.title  = "OLSR"
     page.i18n   = "olsr"
     page.subindex = true
+
+    local page  = node("admin", "status", "olsr", "neighbors")
+    page.target = call("action_neigh")
+    page.title  = i18n("Neighbors")
+    page.subindex = true
+    page.order  = 5
 
     local page  = node("admin", "status", "olsr", "routes")
@@ -39 +45 @@
     page.title  = "SmartGW"
     page.order  = 60
+
+    local page  = node("admin", "status", "olsr", "interfaces")
+        page.target = call("action_interfaces")
+        page.title  = i18n("Interfaces")
+        page.order  = 70
 
     local ol = entry(
@@ -78 +89 @@
 end
 
-function action_index()
+function action_neigh()
     local data = fetch_txtinfo("links")
 
@@ -103 +114 @@
     table.sort(data.Links, compare)
 
-    luci.template.render("status-olsr/index", {links=data.Links})
+    luci.template.render("status-olsr/neighbors", {links=data.Links})
 end
 
@@ -202 +213 @@
 end
 
-
+function action_interfaces()
+        local data = fetch_txtinfo("interfaces")
+
+        if not data or not data.Interfaces then
+                luci.template.render("status-olsr/error_olsr")
+                return nil
+        end
+
+        luci.template.render("status-olsr/interfaces", {iface=data.Interfaces})
+end
 
 -- Internal

luci/trunk/applications/luci-olsr/luasrc/view/status-olsr/smartgw.htm

@@ -3 +3 @@
 Copyright 2008 Steven Barth <steven@midlink.org>
 Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2010 Manuel Munz <freifunk at somakoma dot de>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -9 +10 @@
 
     http://www.apache.org/licenses/LICENSE-2.0
+-%>
 
-$Id: mid.htm 5448 2009-10-31 15:54:11Z jow $
-
--%>
 <%
 require("luci.model.uci")