Merge pull request #488 from hnyman/black-flash
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 4 Oct 2015 15:57:59 +0000 (18:57 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 4 Oct 2015 15:57:59 +0000 (18:57 +0300)
luci-base: change index.html to be more like current themes

42 files changed:
applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
applications/luci-app-statistics/luasrc/statistics/i18n.lua
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
modules/luci-base/htdocs/luci-static/resources/icons/bridge.png
modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/encryption.png
modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png
modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/port_down.png
modules/luci-base/htdocs/luci-static/resources/icons/port_up.png
modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png
modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png
modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png
modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png
modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png
modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png
modules/luci-base/htdocs/luci-static/resources/icons/switch.png
modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png
modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/vlan.png
modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/wifi.png
modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png
modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png
modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_map.lua
themes/luci-theme-freifunk-bno/Makefile [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png [deleted file]
themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif [deleted file]
themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm [deleted file]
themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm [deleted file]
themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno [deleted file]

index d0415cdfa33495ea824ccca110083ae2d7c63461..d9c52eddee87915062a7b766e5f23f2a8209ea89 100644 (file)
@@ -170,7 +170,7 @@ function statistics_render()
        if #instances == 0 then
                --instances = { graph.tree:plugin_instances( plugin )[1] }
                instances = graph.tree:plugin_instances( plugin )
-               is_index = true
+               is_index = (#instances > 1)
 
        -- index instance requested
        elseif instances[1] == "-" then
index 5a2800d5f4ca037318b27e452df04eb877436a47..7877e61ab3063aa3b476a885c5962cf7f9844a5f 100644 (file)
@@ -26,15 +26,6 @@ function Instance._subst( self, str, val )
        return str
 end
 
-function Instance._translate( self, key, alt )
-       local val = self.i18n.string(key)
-       if val ~= key then
-               return val
-       else
-               return alt
-       end
-end
-
 function Instance.title( self, plugin, pinst, dtype, dinst, user_title )
 
        local title = user_title or
@@ -73,24 +64,17 @@ end
 
 function Instance.ds( self, source )
 
-       local label = source.title or self:_translate(
-               string.format( "stat_ds_%s_%s_%s", source.type, source.instance, source.ds ),
-               self:_translate(
-                       string.format( "stat_ds_%s_%s", source.type, source.instance ),
-                       self:_translate(
-                               string.format( "stat_ds_label_%s__%s", source.type, source.ds ),
-                               self:_translate(
-                                       string.format( "stat_ds_%s", source.type ),
-                                       source.type .. "_" .. source.instance:gsub("[^%w]","_") .. "_" .. source.ds
-                               )
-                       )
-               )
-       )
+       local label = source.title or
+               "dt=%s/di=%s/ds=%s" % {
+                       (source.type     and #source.type     > 0) and source.type     or "(nil)",
+                       (source.instance and #source.instance > 0) and source.instance or "(nil)",
+                       (source.ds       and #source.ds       > 0) and source.ds       or "(nil)"
+               }
 
        return self:_subst( label, {
                dtype = source.type,
                dinst = source.instance,
                dsrc  = source.ds
-       } )
+       } ):gsub(":", "\\:")
 
 end
index b4f2ac185ea24cc30ec32c93c7ec3098781e8f5e..9e879a44a6fe046ae1474785dc39415e8b24f9e3 100644 (file)
@@ -22,11 +22,13 @@ function rrdargs( graph, plugin, plugin_instance )
                        -- special options for single data lines
                        options = {
                                if_octets__tx = {
+                                       title = "Bytes (TX)",
                                        total = true,           -- report total amount of bytes
                                        color = "00ff00"        -- tx is green
                                },
 
                                if_octets__rx = {
+                                       title = "Bytes (RX)",
                                        flip  = true,           -- flip rx line
                                        total = true,           -- report total amount of bytes
                                        color = "0000ff"        -- rx is blue
@@ -59,6 +61,7 @@ function rrdargs( graph, plugin, plugin_instance )
                        options = {
                                -- processed packets (tx DS)
                                if_packets__tx = {
+                                       title   = "Total   (TX)",
                                        overlay = true,         -- don't summarize
                                        total   = true,         -- report total amount of bytes
                                        color   = "00ff00"      -- processed tx is green
@@ -66,6 +69,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
                                -- processed packets (rx DS)
                                if_packets__rx = {
+                                       title   = "Total   (RX)",
                                        overlay = true,         -- don't summarize
                                        flip    = true,         -- flip rx line
                                        total   = true,         -- report total amount of bytes
@@ -74,6 +78,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
                                -- dropped packets (tx DS)
                                if_dropped__tx = {
+                                       title   = "Dropped (TX)",
                                        overlay = true,         -- don't summarize
                                        total   = true,         -- report total amount of bytes
                                        color   = "660055"      -- dropped tx is ... dunno ;)
@@ -81,14 +86,16 @@ function rrdargs( graph, plugin, plugin_instance )
 
                                -- dropped packets (rx DS)
                                if_dropped__rx = {
+                                       title   = "Dropped (RX)",
                                        overlay = true,         -- don't summarize
                                        flip    = true,         -- flip rx line
                                        total   = true,         -- report total amount of bytes
-                                       color   = "440066"      -- dropped rx is violett
+                                       color   = "ff00ff"      -- dropped rx is violett
                                },
 
                                -- packet errors (tx DS)
                                if_errors__tx = {
+                                       title   = "Errors  (TX)",
                                        overlay = true,         -- don't summarize
                                        total   = true,         -- report total amount of packets
                                        color   = "ff5500"      -- tx errors are orange
@@ -96,6 +103,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
                                -- packet errors (rx DS)
                                if_errors__rx = {
+                                       title   = "Errors  (RX)",
                                        overlay = true,         -- don't summarize
                                        flip    = true,         -- flip rx line
                                        total   = true,         -- report total amount of packets
@@ -122,6 +130,7 @@ function rrdargs( graph, plugin, plugin_instance )
                        options = {
                                -- multicast packets
                                if_multicast = {
+                                       title = "Packets",
                                        total = true,           -- report total amount of packets
                                        color = "0000ff"        -- multicast is blue
                                }
@@ -146,6 +155,7 @@ function rrdargs( graph, plugin, plugin_instance )
                        options = {
                                -- collision rate
                                if_collisions = {
+                                       title = "Collisions",
                                        total = true,           -- report total amount of packets
                                        color = "ff0000"        -- collsions are red
                                }
@@ -173,15 +183,19 @@ function rrdargs( graph, plugin, plugin_instance )
                        },
 
                        -- special options for single data lines
-                       options = {     -- XXX: fixme (define colors...)
-                               if_tx_errors = {
-                                       total = true
-                               },
-
-                               if_rx_errors = {
-                                       flip  = true,
-                                       total = true
-                               }
+                       options = {
+                               if_tx_errors_aborted_value   = { total = true, color = "ffff00", title = "Aborted   (TX)" },
+                               if_tx_errors_carrier_value   = { total = true, color = "ffcc00", title = "Carrier   (TX)" },
+                               if_tx_errors_fifo_value      = { total = true, color = "ff9900", title = "Fifo      (TX)" },
+                               if_tx_errors_heartbeat_value = { total = true, color = "ff6600", title = "Heartbeat (TX)" },
+                               if_tx_errors_window_value    = { total = true, color = "ff3300", title = "Window    (TX)" },
+
+                               if_rx_errors_length_value    = { flip = true, total = true, color = "ff0000", title = "Length    (RX)" },
+                               if_rx_errors_missed_value    = { flip = true, total = true, color = "ff0033", title = "Missed    (RX)" },
+                               if_rx_errors_over_value      = { flip = true, total = true, color = "ff0066", title = "Over      (RX)" },
+                               if_rx_errors_crc_value       = { flip = true, total = true, color = "ff0099", title = "CRC       (RX)" },
+                               if_rx_errors_fifo_value      = { flip = true, total = true, color = "ff00cc", title = "Fifo      (RX)" },
+                               if_rx_errors_frame_value     = { flip = true, total = true, color = "ff00ff", title = "Frame     (RX)" }
                        }
                }
        }
index 4c163bf692da13973a1e6b55498c42802e190722..7faadecf92cf03e26ed917924ecd0a27d0385265 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png and b/modules/luci-base/htdocs/luci-static/resources/icons/bridge.png differ
index 0f367c5369f83e65b1f95bfa86e2ce3e4254984a..b3e620b3a13f5cca1337f191465c02d38b5e0286 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/bridge_disabled.png differ
index 41d2ba9ace8332dab6b216749cbc48794f30b541..77628336045bf443bb8d2430a8210fbf0a4139e8 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png and b/modules/luci-base/htdocs/luci-static/resources/icons/encryption.png differ
index f2e05a425136b086a9962472f7e8c4a947c15c7c..9a8721b02c1f32d0a38ad5a2909309c64d10e89c 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/encryption_disabled.png differ
index a02538124c6a030579f90bc1c358947234593a63..e3d24f2791bcdb1b79e3dcc2e857972d0d1fd0cb 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png and b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet.png differ
index 2bb02e455a39c5518426cf794dd6b108ba989d3f..d8792df54b1afe3286b9b8c1ca2d4bb404b5b6b1 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/ethernet_disabled.png differ
index 25ea172324c04e222c575cd01089e36a5c416c3e..5a2b235d0a51193676d7e6c1cefc47889be473a4 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png and b/modules/luci-base/htdocs/luci-static/resources/icons/port_down.png differ
index e06303791092800beef5f08cd3dd9ba70cf68fa7..8105e77d0878e1bd4a4f4953365ca1cab3a80ab5 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png and b/modules/luci-base/htdocs/luci-static/resources/icons/port_up.png differ
index 2e5dff46632a2cfc115f30a5e5450a61bbacec54..b3a8118afcc008caf688f233f1ca35753e31f212 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png and b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0-25.png differ
index 114583a67611fb0320e55d309201fb0172b4aa6d..333b1557ba5d9b5df28ec13542337b338eec48fb 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png and b/modules/luci-base/htdocs/luci-static/resources/icons/signal-0.png differ
index ee8cc4f1cef6b76624d92dad8457c988845fbc7d..b465de3f575fdf90a7919b23b77a1dd10da9cd29 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png and b/modules/luci-base/htdocs/luci-static/resources/icons/signal-25-50.png differ
index 26bcbf715d6ff22f3fb95f1efa3fcedc6b0abba9..cd7bcaf9a6da38490231f92e4045cfc1a2c96a4d 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png and b/modules/luci-base/htdocs/luci-static/resources/icons/signal-50-75.png differ
index 5cffaa1b84fc02489584ada68491b764e8cc875b..f7a3658df8d05f8fa037d84cf8e920308980ff0e 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png and b/modules/luci-base/htdocs/luci-static/resources/icons/signal-75-100.png differ
index b77585c0f053fb7c2ebd618370a466b7ccb675dc..4a11356af2ea5d5c188b82d30322077052da4964 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png and b/modules/luci-base/htdocs/luci-static/resources/icons/signal-none.png differ
index 5c99ba5684d182ee4afd75be80c67beabaac3e3a..be99b19badcd389e58cad6e04d067890a58943d8 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/switch.png and b/modules/luci-base/htdocs/luci-static/resources/icons/switch.png differ
index b8c84c8dc46e68abe3ea5d4de8832b530ae2a3a1..54588d24d1c2293a11021ed862bed2603e8fc8cc 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/switch_disabled.png differ
index c5a09dd6857f7a1f0cf2577827ec021ce5054bdf..63eabfef5901b6cfc80a4fabfce7aad6d24f8174 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png and b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel.png differ
index ad9856cfecac80bc025b48feca437b7c524f86f9..ca79d81707c1a9476ce729e4cb88b3aa32ef0cc7 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/tunnel_disabled.png differ
index 5c99ba5684d182ee4afd75be80c67beabaac3e3a..be99b19badcd389e58cad6e04d067890a58943d8 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png and b/modules/luci-base/htdocs/luci-static/resources/icons/vlan.png differ
index b8c84c8dc46e68abe3ea5d4de8832b530ae2a3a1..54588d24d1c2293a11021ed862bed2603e8fc8cc 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/vlan_disabled.png differ
index 528ce2b4e91e3ebb9b9473ec196e10f0a608e4f6..80a23e8e9a740f8f69e1ad82f3bcdede9f05953b 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png and b/modules/luci-base/htdocs/luci-static/resources/icons/wifi.png differ
index d73a5e7401ae9ec36bada05af157e39fe5b81a1c..9e466aebf41d819f6bfbf5dd70c5b193fb2a7295 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png and b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big.png differ
index af93b37b7a7a12f136c055362ed91a7eddfc2c2c..6f9fff3813e2e051a7429f042ebf8c23d7b42378 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_big_disabled.png differ
index 338a34f78c8da317fb342515ec5ba8d2931a0876..e989a2bd3def286810a37ccd2ba6eeeca511ff48 100644 (file)
Binary files a/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png and b/modules/luci-base/htdocs/luci-static/resources/icons/wifi_disabled.png differ
index 07a96b2bf015f5f0131d9bdd4ca9d65455d0c23a..a98d790802a099b87382c6568b9709048d234075 100644 (file)
@@ -88,7 +88,9 @@
                if has_dsl then
                        local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat")
                        local dsl_func = loadstring(dsl_stat)
-                       rv.dsl = dsl_func()
+                       if dsl_func then
+                               rv.dsl = dsl_func()
+                       end
                end
 
                luci.http.prepare_content("application/json")
index 2f8108ef1c8dc7d9c3308026b34eebd85bec66d9..37d4ec901aed0dc18dc50cacfc63791dc683f2fa 100644 (file)
@@ -50,7 +50,7 @@ ip6prefixlen.datatype    = "range(0,64)"
 
 
 s:taboption("general", Value, "ealen",
-       translate("EA-bits length")).datatype = "range(0,16)"
+       translate("EA-bits length")).datatype = "range(0,48)"
 
 s:taboption("general", Value, "psidlen",
        translate("PSID-bits length")).datatype = "range(0,16)"
diff --git a/themes/luci-theme-freifunk-bno/Makefile b/themes/luci-theme-freifunk-bno/Makefile
deleted file mode 100644 (file)
index 1491a97..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org>
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=Freifunk Berlin Nordost Theme
-LUCI_DEPENDS:=
-
-include ../../luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css
deleted file mode 100644 (file)
index 4f89b2d..0000000
+++ /dev/null
@@ -1,872 +0,0 @@
-* {
-       margin: 0;
-       padding: 0;
-}
-
-body {
-       background-color: #ffffff;
-       color: #ffffff;
-       font-family: Verdana, Arial, sans-serif;
-       font-size: 100%;
-       line-height: 100%;
-       background-image: url(images/main-back.png);
-       background-repeat: repeat-x;
-       background-position: left bottom;
-       }
-#all {
-        margin: 0px;
-       padding: 0px;
-        min-height: 800px;
-}
-
-code {
-       font-family: monospace;
-       white-space: pre;
-}
-
-a:link, a:visited {
-       color:#000000;
-       font-weight:bold;
-       text-decoration:none;
-       }
-a:hover {
-       color:#333333;
-       font-weight:bold;
-       }
-
-/* Custom*/
- #wrapper
-{
-       width: 95%;
-       color: #333333;
-       margin-left: auto;
-       margin-right: auto;
-/*     background-image: url(images/corner-left.gif);  */
-/*     background-repeat: no-repeat;                   */
-/*     background-position: left bottom;               */
-       background-color: #FffdF4;
-       min-width: 710px;
-   min-height: 710px;
-}
-#main {
-  clear: both;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  color: #333333;
-/*  background-image: url(images/corner-right.gif);    */
-/*  background-repeat: no-repeat;                      */
-/*  background-position: right bottom;                 */
-   min-height: 710px;
-}
-
-div#maincontent ul {
-       margin-left: 2em;
-}
-
-.warning {
-       color: red !important;
-       font-weight: bold;
-}
-
-.clear {
-       clear: both;
-       height: 1px;
-}
-
-.hidden {
-       display: none;
-}
-
-.error {
-       color: #ff0000;
-}
-
-#header
-{
- padding: 0px;
- height: 100px;
-}
-#headerleft
-{
- height: 100px;
- background-color: #FFFfff;
- background-image: url(images/header-left.gif);
- background-repeat: no-repeat;
- background-position: left top;
-}
-#headerright
-{
- height: 100px;
- background-color: #FFfffF;
-
- margin-left: 5px;
- background-image: url(images/header-right.gif);
- background-repeat: no-repeat;
- background-position: right top;
-}
-
-#headerback
-{
- margin-right: 5px;
- height: 100px;
- background-color: #FFfffF;
- background-image: url(images/header-back.gif);
- background-repeat: repeat-x;
- background-position: left top;
-}
-#schriftzug {
- font-size : 1.5em;
- text-align:left;
- margin-bottom: 7px;
- margin-top: 7px;
- float:left;
- width: 450px;
-}
-
-#schriftzug a:hover{
- background-color:transparent;
-}
-#logo{
- margin-top: 5px;
- float:right;
- width: 115px;
-}
-
-.pathbar {
-       display: none;
-}
-
-.menubar {
-       width: 100%;
-       min-height: 1.8em;
-       background: #ffffff;
-       color: #000000;
-       border-top:0.4em solid #DC0067;
-}
-
-.mainmenu {
-       float: left;
-       width: auto;
-       min-height: 1.8em;
-       background: #ffffff;
-       color: #000000;
-}
-.modemenu li {
-       border-top:0.3em solid #DC0067;
-       margin-left:  0.3em;
-       margin-top:  -0.3em;
-}
-.mainmenu div {
-       float: left;
-       border-top:0.3em solid #DC0067;
-       margin-right:  0.3em;
-       margin-top:  -0.3em;
-}
-.mainmenu div.preactive {
-       border-top: 0.3em solid #FFCB05;
-       margin-top:  -0.2em;
-}
-
-.mainmenu li {
-       white-space: nowrap;
-}
-
-.mainmenu div ul {
-       display: none;
-       position: absolute;
-       background: #ffffff;
-       color: #000000;
-       border-width: 0 1px 1px 1px;
-       border-style: solid;
-       border-color: #444444;
-       list-style-type: none;
-}
-
-.mainmenu ul li:hover > ul,
-.mainmenu div:hover > ul {
-       display: block;
-}
-
-.mainmenu ul li > ul {
-       left: 100%;
-       margin-top: -1.8em;
-       border-width: 1px;
-}
-
-.modemenu a,
-.mainmenu a {
-       display: block;
-       padding: 0.2em;
-       color: #000000;
-       text-decoration: none;
-       font-size: 70%;
-       font-weight: bold;
-}
-
-
-.modemenu .active a {
-       color: #000000;
-       font-weight: bold;
-       border-top:0.3em solid #FFCB05;
-       margin-top:  -0.2em;
-}
-.mainmenu .active a{
-       color: #000000;
-       font-weight: bold;
-       border-top:0.2em solid #FFCB05;
-}
-.mainmenu li > span:active {
-       background-color: #FFE990;
-}
-
-.mainmenu li:hover > span > a,
-.mainmenu div:hover > a {
-color: #ffffff;
-background-color: #FFCB05;
-}
-
-
-.modemenu a:focus,
-.mainmenu a:focus {
-       color: #000000;
-}
-
-.mainmenu a:hover,
-.modemenu a:hover {
-color: #ffffff;
-background-color: #FFCB05;
-}
-
-.mainmenu div.preactive > a {
-       color: #DC0067;
-       font-weight: bold;
-}
-.mainmenu div.preactive > a:hover,
-.mainmenu div.preactive > a:focus {
-       color: #ffffff;
-       font-weight: bold;
-}
-
-.modemenu ul {
-       width: auto;
-       background: #000000;
-       color: #ffffff;
-       list-style-type: none;
-}
-
-.modemenu li {
-       float: right;
-
-}
-
-#maincontent {
-       clear: both;
-       width: 98%;
-       margin: 0 auto;
-       padding: 0.5em;
-       background: #FFF4BE;
-       color: #000000;
-       font-size: 80%;
-       border-top:1px solid #D2A800;
-}
-
-#maincontent h2 {
-       margin: 0.25em 0 0.5em 0;
-       font-size: 150%;
-       font-weight: normal;
-}
-
-#maincontent h3 {
-       margin: 0.5em 0;
-       font-size: 120%;
-       font-weight: normal;
-       text-decoration: underline;
-}
-
-#maincontent p {
-       margin-bottom: 1em;
-}
-
-.cbi-section {
-       margin-bottom: 0.5em;
-       padding: 0.5em 1em;
-       border: 1px dotted #D2A800;
-       background-color: #FFE990;
-}
-
-.cbi-section legend {
-       font-size: 110%;
-       font-weight: bold;
-       height: 1em;
-       padding: 0 0.25em;
-       color: #555555;
-}
-
-.cbi-section h2 {
-       margin: 0em 0 0.5em -0.5em !important;
-}
-
-.cbi-section h3 {
-       height: 1.5em;
-       font-size: 90%;
-       color: #555555;
-}
-
-.cbi-section-descr {
-       margin-bottom: 0.5em;
-       font-size: 95%;
-}
-
-.cbi-title-ref {
-       color: inherit;
-       text-decoration: none;
-       padding-right: 18px;
-       background: url('../resources/cbi/link.gif') no-repeat scroll right center;
-       background-color: inherit;
-}
-
-input[type=submit],
-input[type=reset],
-input[type=image],
-label {
-       cursor: pointer;
-}
-
-select,
-input,
-textarea {
-       background: #FffdF4;
-       color: #000000;
-       border-width: 1px;
-       border-color: #000000;
-}
-
-input[type=image] {
-       border: none;
-}
-
-
-input:focus,
-input:hover,
-select:focus,
-select:hover,
-textarea:focus,
-textarea:hover {
-       background-color: #FFF4BE;
-}
-
-select,
-input[type=text],
-input[type=password] {
-       width: 20em;
-}
-
-td select,
-td input[type=text],
-td input[type=password] {
-       width: 99%;
-}
-
-img.cbi-image-button {
-       cursor: pointer;
-       margin: 0 2px;
-       vertical-align: middle;
-}
-
-input.cbi-input-user {
-       background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-}
-
-input.cbi-input-password {
-       background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-}
-
-input.cbi-input-find {
-       background: url('../resources/cbi/find.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-}
-
-input.cbi-input-reload {
-       background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-}
-
-input.cbi-input-add,
-input.cbi-button-add {
-       background: url('../resources/cbi/add.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-input-fieldadd,
-input.cbi-button-fieldadd {
-       background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-input-reset,
-input.cbi-button-reset {
-       background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-input-save,
-input.cbi-button-save {
-       background: url('../resources/cbi/save.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-input-apply,
-input.cbi-button-apply {
-       background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-input-remove,
-div.cbi-section-remove input {
-       background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
-       background-color: inherit;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-button-up {
-       background-image: url('../resources/cbi/up.gif');
-       padding-left: 11px;
-       padding-right: 1px;
-}
-
-input.cbi-button-down {
-       background-image: url('../resources/cbi/down.gif');
-       padding-left: 11px;
-       padding-right: 1px;
-}
-
-input.cbi-button-edit {
-       background-image: url('../resources/cbi/edit.gif');
-       color: #000000;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-button-reload {
-       background-image: url('../resources/cbi/reload.gif');
-       color: #000000;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-button-reset {
-       background-image: url('../resources/cbi/reset.gif');
-       color: #000000;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-input.cbi-button-remove {
-       background-image: url('../resources/cbi/remove.gif');
-       color: #000000;
-       padding-left: 17px;
-       padding-right: 1px;
-}
-
-.cbi-input-invalid {
-       background-image: url('../resources/cbi/reset.gif');
-       background-repeat: no-repeat;
-       background-position: right;
-       color: #FF0000 !important;
-       border-color: #FF0000;
-}
-
-div.cbi-section-remove input {
-       border-bottom: none;
-}
-
-textarea {
-       margin-left: -1px;
-       margin-bottom: 0.5em;
-}
-
-form > div > input[type=submit],
-form > div > input[type=reset] {
-       float: right;
-       margin-left: 0.5em;
-}
-
-table.smalltext {
-background-color: #FFCB05;
-       border-top: 1px solid #666666;
-       border-right: 1px solid #666666;
-       border-bottom: 1px solid #666666;
-       font-size: 90%;
-       width: 80%;
-       margin-left: auto;
-       margin-right: auto;
-       border-collapse: collapse;
-}
-
-table.smalltext tr:hover td {
-background-color: #FFE990;
-}
-
-table.smalltext tr th {
-       padding: 0 0.25em;
-       border-left: 1px solid #666666;
-       text-align: left;
-}
-
-table.smalltext tr td {
-       padding: 0 0.25em;
-       border-top: 1px solid #666666;
-       border-left: 1px solid #666666;
-}
-
-.cbi-rowstyle-1 {
-       background-color: #FFF4BE;
-}
-
-.cbi-rowstyle-2 {
-}
-
-table.cbi-section-table .cbi-section-table-cell {
-       padding: 3px;
-       white-space: nowrap;
-}
-
-div.cbi-value {
-       clear: left;
-       vertical-align: middle;
-       padding-left: 0.25em;
-       border-bottom: 1px dotted #FFCB05;
-}
-
-div.cbi-value:hover {
-       background: #FFF4BE;
-}
-
-div.cbi-value:last-child {
-       border: none;
-}
-
-.cbi-value-title {
-       float: left;
-       width: 40%;
-}
-
-div.cbi-value-field {
-       width: 58%;
-       margin: 0.25em 0 0.25em 40%;
-}
-
-div.cbi-value-description {
-       font-size: 90%;
-}
-
-div.cbi-value-field > div.cbi-value-description {
-       display: none;
-}
-
-div.cbi-value:hover div.cbi-value-field > div.cbi-value-description {
-       display: block;
-       color: #ffffff;
-       background-color: #FFCB05;
-}
-
-option:active,
-option:before,
-option:after,
-option:focus,
-option:hover {
-       color: #ffffff;
-       background-color: #EEBA00;
-       background: url(images/bgoption.png);
-}
-
-div.cbi-section-create {
-       clear: left;
-       white-space: nowrap;
-}
-
-div.cbi-map-descr {
-       margin-bottom: 1em;
-}
-
-div.cbi-optionals {
-       margin: 0.5em 0;
-       padding: 0 0.25em;
-}
-
-div.cbi-section-remove {
-       float: right;
-}
-
-.cbi-section-node {
-       clear: both;
-       border: 1px dotted #FFCB05;
-       padding-bottom: 0;
-}
-
-.cbi-section-node div.cbi-section-table-row {
-       margin: 0.25em;
-}
-
-table.cbi-section-table {
-       width: 100%;
-       font-size: 95%;
-}
-
-table.cbi-section-table th,
-table.cbi-section-table td {
-       text-align: center;
-}
-
-tr.cbi-section-table-descr th {
-       font-weight: normal;
-       font-size: 90%;
-}
-
-td.cbi-section-table-optionals {
-       text-align: left !important;
-       padding-top: 1em;
-}
-
-.cbi-value-helpicon img {
-       vertical-align: bottom;
-}
-
-div.cbi-error {
-       font-size: 95%;
-       font-weight: bold;
-       color: #FF0000;
-}
-
-td.cbi-value-error {
-       border-color: red !important;
-}
-
-.cbi-value-error input,
-.cbi-value-error select {
-       color: red !important;
-       background-color: #FFCCCC;
-}
-
-.cbi-section-error {
-       color: red;
-       font-size: 95%;
-       border: 1px dotted red;
-       margin: 3px;
-       padding: 3px;
-}
-
-ul.cbi-apply {
-       font-size: 90%;
-}
-
-ul.cbi-tabmenu {
-       padding: 3px 0;
-       margin-left: 0 !important;
-       margin-bottom: -1px;
-       list-style-type: none;
-}
-
-ul.cbi-tabmenu li.cbi-tab,
-ul.cbi-tabmenu li.cbi-tab-disabled {
-       display: inline;
-       margin: 0;
-}
-
-ul.cbi-tabmenu li.cbi-tab a,
-ul.cbi-tabmenu li.cbi-tab-disabled a {
-       text-decoration: none;
-       padding: 3px 7px;
-       margin-right: 3px;
-       border: 1px outset #000;
-       border-bottom: none;
-       background-color: #eee;
-       color: #bbb;
-}
-
-ul.cbi-tabmenu li.cbi-tab-highlighted a {
-       color: #000;
-       background-color: #FFEEAA;
-}
-
-ul.cbi-tabmenu li a:hover {
-       color: #000;
-}
-
-ul.cbi-tabmenu li.cbi-tab a {
-       position: relative;
-       top: 1px;
-       padding-top: 4px;
-       color: #000;
-       background-color: #fff;
-}
-
-div.cbi-tab-descr {
-       background-image: url(/luci-static/resources/cbi/help.gif);
-       background-position: 0.25em 50%;
-       background-repeat: no-repeat;
-       border-bottom: 1px solid #ccc;
-       margin: 0.25em 0.25em 2em;
-       padding: 0.5em 0.5em 0.5em 2em;
-}
-
-
-.left {
-       text-align: left !important;
-}
-
-.right {
-       text-align: right !important;
-}
-
-.luci {
-       position: fixed;
-       bottom: 0;
-       left: 0;
-       text-align: right;
-}
-
-.luci a {
-       color: #666666;
-       text-decoration: none;
-       font-size: 70%;
-}
-
-.inline {
-       display: inline;
-}
-
-.error500 {
-       white-space: normal;
-       border: 1px dotted #FF0000;
-       background-color: #FFFFFF;
-       padding: 0.5em;
-}
-
-/* obligatory IE6 Voodoo Code */
-* html body {
-       padding-left: 50% !important;
-}
-
-* html div#header {
-       margin-left: -100% !important;
-}
-
-* html div.menubar {
-       margin-left: -100% !important;
-       width: 200% !important;
-}
-
-* html div#maincontent {
-       margin-left: -80% !important;
-       width: 160% !important;
-}
-
-* html div.mainmenu div.hover ul,
-* html div.mainmenu div li.hover ul,
-* html div.mainmenu div li li.hover ul,
-* html div.mainmenu div li li li.hover ul,
-* html div.mainmenu div li li li li.hover ul {
-       display: block !important;
-       margin-left: 3em;
-}
-
-* html div.mainmenu div.hover ul {
-       margin-left: 0;
-}
-
-* html div.mainmenu .hover ul ul,
-* html div.mainmenu .hover ul ul ul,
-* html div.mainmenu .hover ul ul ul ul,
-* html div.mainmenu .hover ul ul ul ul ul {
-       display: none !important;
-}
-
-* html div.mainmenu li {
-       height: 1em !important;
-       width: 10em !important;
-}
-
-* html .mainmenu {
-       height: 1.8em;
-}
-
-* html div.cbi-value-description {
-       margin-left: 40%;
-}
-
-
-.ifacebox {
-       background-color: #FFFFFF;
-       border: 1px solid #CCCCCC;
-       margin: 0 10px;
-       text-align: center;
-       white-space: nowrap;
-}
-
-.ifacebox .ifacebox-head {
-       border-bottom: 1px solid #CCCCCC;
-       padding: 2px;
-}
-
-.ifacebox .ifacebox-body {
-       padding: 2px;
-}
-
-
-.ifacebadge {
-       background-color: #FFFFFF;
-       border: 1px solid #CCCCCC;
-       padding: 2px;
-       margin-left: 2px;
-       display: inline-block;
-}
-
-.ifacebadge-active {
-       border-color: #000000;
-       font-weight: bold;
-}
-
-
-.zonebadge {
-       padding: 2px;
-       display: inline-block;
-       white-space: nowrap;
-       cursor: pointer;
-}
-
-.zonebadge em,
-.zonebadge strong {
-       margin: 3px;
-       display: inline-block;
-}
-
-.zonebadge input {
-       width: 6em;
-       height: 1.5em;
-}
-
-.zonebadge-empty {
-       border: 1px dashed #AAAAAA;
-       color: #AAAAAA;
-       font-style: italic;
-       font-size: smaller;
-}
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png
deleted file mode 100644 (file)
index 6fd1e2f..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/bgoption.png and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico
deleted file mode 100644 (file)
index 7247cfa..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/favicon.ico and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif
deleted file mode 100644 (file)
index 21fe02b..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-back.gif and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif
deleted file mode 100644 (file)
index a3258cc..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-left.gif and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif
deleted file mode 100644 (file)
index 93d0291..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/header-right.gif and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif
deleted file mode 100644 (file)
index ff00d6d..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/logo.gif and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png
deleted file mode 100644 (file)
index 34aca44..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/main-back.png and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif b/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif
deleted file mode 100644 (file)
index 82607d5..0000000
Binary files a/themes/luci-theme-freifunk-bno/htdocs/luci-static/freifunk-bno/images/schriftzug.gif and /dev/null differ
diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/footer.htm
deleted file mode 100644 (file)
index 2dbade3..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<%#
- Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-               <br class="clear" />
-       </div>
-</div></div>
-</div>
-
-<div class="luci separator black whitetext bold">
-       <% local ver = require "luci.version" -%>
-       <a href="<%=controller%>/about">Powered by <%= ver.luciname %> (<%= ver.luciversion %>)</a>
-</div>
-</div><!-- end main --><div align="center" style="padding-top:5px "></div>
-<br>
-</div><!-- end wrapper -->
-
-</center>
-</div>
-
-</body>
-</html>
diff --git a/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/luci-theme-freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm
deleted file mode 100644 (file)
index d108a08..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-<%#
- Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-require("luci.sys")
-require("luci.util")
-
-local boardinfo = luci.util.ubus("system", "board")
-
-local request  = require("luci.dispatcher").context.path
-local category = request[1]
-local tree     = luci.dispatcher.node()
-local cattree  = category and luci.dispatcher.node(category)
-local node     = luci.dispatcher.context.dispatched
-
-local c = tree
-for i,r in ipairs(request) do
-       if c.nodes and c.nodes[r] then
-               c = c.nodes[r]
-               c._menu_selected = true
-       end
-end
-
-require("luci.http").prepare_content("text/html")
-
--%>
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-       <link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
-       <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
-       <% if css then %><style title="text/css">
-       <%-= css %>
-       </style>
-       <% end -%>
-       <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" />
-       <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-       <meta http-equiv="content-script-type" content="text/javascript" />
-       <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
-       <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
-
-       <!--[if lt IE 7]>
-               <script type="text/javascript">
-                       function setup_hover() {
-                               function ie_hover(e) {
-                                       e.onmouseover = function() { this.className = "hover" }
-                                       e.onmouseout  = function() { this.className = null    }
-                               }
-
-                               var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
-                               var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
-
-                               for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
-                               for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
-                       }
-               </script>
-       <![endif]-->
-</head>
-<body onload="window.setup_hover && setup_hover()">
-<div id="all">
-<center>
-
-<div id="wrapper">
-<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
-       <div class="warning">
-               <strong><%:No password set!%></strong><br />
-               <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
-       </div>
-<%- end -%>
-<div id="main">
-
-
-<div id="header">
-       <div id="headerleft">
-               <div id="headerright">
-                       <div id="headerback">
-       <div id="schriftzug"><img src="<%=media%>/images/schriftzug.gif" alt="Freifunk Nordost ueberschrift" name="Freifunk_nordost_ueberschrift" border="0"> </div>
-       <div id="logo"><img src="<%=media%>/images/logo.gif" alt="Freifunk Nordost logo" name="Freifunk_nordost" border="0"></a></div>
-       <div class="clear"></div>
-
-                       </div>
-               </div>
-       </div>
-</div>
-
-<div class="pathbar separator black whitetext bold">
-<%:Path%>: <%
-local c = tree
-local url = controller
-for k,v in pairs(request) do
-       if c.nodes and c.nodes[v] then
-               c = c.nodes[v]
-               url = url .. "/" .. v
-       %><a href="<%=url%>"><%=pcdata(striptags(translate(c.title) or v))%></a> <% if k ~= #request then %>&#187; <% end
-       end
-end
-%>
-</div>
-
-<div class="menubar">
-       <div id="mainmenu" class="mainmenu">
-<%-
-local function submenu(prefix, node)
-       if not node.nodes or node.hidden then
-               return false
-       end
-       local index = {}
-       local count = 0
-       for k, n in pairs(node.nodes) do
-               if n.title and n.target then
-                       table.insert(index, {name=k, order=n.order or 100})
-                       count = count + 1
-               end
-       end
-
-       table.sort(index, function(a, b) return a.order < b.order end)
-
-       if count > 0 then
-%>
-       <ul>
-       <%- for j, v in pairs(index) do
-               if not v.hidden and #v.name > 0 then
-                       local nnode = node.nodes[v.name]
-                       local href = controller .. prefix .. v.name
-                       href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
-               %>
-               <li>
-                       <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(nnode.title)))%></a></span>
-                       <%- submenu(prefix .. v.name .. "/", nnode) %>
-               </li>
-               <%- end %>
-       <%- end %>
-       </ul>
-<%-
-       end
-end
-
-if cattree and cattree.nodes then
-       local index = {}
-       for k, node in pairs(cattree.nodes) do
-               table.insert(index, {name=k, order=node.order or 100})
-       end
-
-       table.sort(index, function(a, b) return a.order < b.order end)
-
-       for i, k in ipairs(index) do
-               node = cattree.nodes[k.name]
-               if not node.hidden and node.title and node.target then
-                       local href = controller.."/"..category.."/"..k.name
-                       href = (k.query) and href .. luci.http.build_querystring(k.query) or href %>
-                       <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(striptags(translate(node.title)))%></a>
-                               <%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
-                       </div>
-<%             end
-       end
-end
-%>
-       </div>
-       <div class="modemenu">
-               <ul><%
-                       for k,node in pairs(tree.nodes) do
-                               if node.title and not node.hidden then %>
-                                       <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(striptags(translate(node.title)))%></a></li>
-<%                             end
-                       end%>
-               </ul>
-       </div>
-
-       <%
-               if tree.nodes[category] and tree.nodes[category].ucidata then
-                       local ucic = 0
-
-                       for i, j in pairs(require("luci.model.uci").cursor():changes()) do
-                               for k, l in pairs(j) do
-                                       for m, n in pairs(l) do
-                                               ucic = ucic + 1;
-                                       end
-                               end
-                       end
-       %>
-       <div class="mainmenu" style="float:right; margin-right:2em">
-               <div>
-                       <% if ucic > 0 then %>
-                       <a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:Unsaved Changes%>: <%=ucic%></a>
-                       <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
-                       <% else %>
-                       <a href="#"><%:Changes%>: 0</a>
-                       <% end %>
-               </div>
-       </div>
-       <% end %>
-
-       <br class="clear" />
-</div>
-
-<div id="maincontent">
-<% if category ~= "freifunk" and category ~= "splash" then %>
-<noscript>
-       <div class="errorbox">
-               <strong><%:Java Script required!%></strong><br />
-               <%:You must enable Java Script in your browser or LuCI will not work properly.%>
-       </div>
-</noscript>
-<% end %>
diff --git a/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno
deleted file mode 100755 (executable)
index a19f2bb..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-uci batch <<-EOF
-       set luci.themes.Freifunk_BNO=/luci-static/freifunk-bno
-       set luci.main.mediaurlbase=/luci-static/freifunk-bno
-        commit luci
-EOF