diff --git a/THANKYOU b/THANKYOU index 4e0712f9cc..2bf567bfb9 100644 --- a/THANKYOU +++ b/THANKYOU @@ -7,4 +7,7 @@ I'd like to thank the following people for contributing to this software: - for donating a Linksys WRT54GL for development purposes * Mickey (Freifunk Hannover) - - for his feedback and fixes for the OpenWRT builds \ No newline at end of file + - for his feedback and fixes for the OpenWRT builds + +* nbd (OpenWRT) + - for his work on OpenWRT integration and lua modules \ No newline at end of file diff --git a/libs/cbi/root/www/resources/cbi.js b/libs/cbi/root/www/luci-static/resources/cbi.js similarity index 100% rename from libs/cbi/root/www/resources/cbi.js rename to libs/cbi/root/www/luci-static/resources/cbi.js diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua index fc551a4bde..d075975da3 100644 --- a/libs/web/luasrc/dispatcher.lua +++ b/libs/web/luasrc/dispatcher.lua @@ -220,11 +220,18 @@ function createtree() if not built_index then createindex() end + + require("luci.i18n") for k, v in pairs(index) do luci.util.updfenv(v, _M) luci.util.extfenv(v, "_NAME", k) - pcall(v) + + local stat, err = pcall(v) + if not stat then + error500(err) + os.exit(1) + end end built_tree = true diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm new file mode 100644 index 0000000000..48a8674e00 --- /dev/null +++ b/modules/admin-core/luasrc/view/about.htm @@ -0,0 +1,27 @@ +<%+header%> +

<%:about Über%> Luci

+

<%:lucidesc Luci ist eine freie Lua-Bibliothek mit integriertem MVC-Webframework und Weboberfläche für eingebettete Geräte, +speziell Netzwerkrouter unter OpenWRT. Luci steht unter der Apache-Lizenz.%>

+ +

<%:projecthome Projekt-Homepage%>: luci.freifunk-halle.net

+ +
+

<%:leaddev Leitende Entwicklung%>

+ +
+ +

<%:contributors Mitwirkende Entwickler%>

+ +
+ +

<%:thanksto Dank an%>

+ +<%+footer%> \ No newline at end of file diff --git a/modules/admin-core/luasrc/view/footer.htm b/modules/admin-core/luasrc/view/footer.htm index 4de7bbab0c..645e2f4946 100644 --- a/modules/admin-core/luasrc/view/footer.htm +++ b/modules/admin-core/luasrc/view/footer.htm @@ -1,7 +1 @@ - -
- - -
<%=require("luci").__appname__ .. " " .. luci.__version__%> - Lua Configuration Interface
- - \ No newline at end of file +<% include("themes/" .. luci.fs.basename(media) .. "/footer") %> \ No newline at end of file diff --git a/modules/admin-core/luasrc/view/header.htm b/modules/admin-core/luasrc/view/header.htm index 5f876781f6..1a7780f707 100644 --- a/modules/admin-core/luasrc/view/header.htm +++ b/modules/admin-core/luasrc/view/header.htm @@ -1,137 +1 @@ -<% -require("luci.sys") -local load1, load5, load15 = luci.sys.loadavg() - -local request = require("luci.dispatcher").request -local category = request[1] -local tree = luci.dispatcher.node() -local cattree = category and luci.dispatcher.node(category) -local node = luci.dispatcher.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.i18n").loadc("default") - -require("luci.http").prepare_content("text/html") -%> - - - - - <% if node and node.css then %><% end %> - - - LuCI - Lua Configuration Interface - - - - -
-<%:path Pfad%>: <% -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 - %><%=c.title or v%> <% if k ~= #request then %>» <% end - end -end -%> -
- -
-
-<% -local function submenu(prefix, node) - if not node._menu_selected or not node.nodes then - return false - end - local index = {} - for k, n in pairs(node.nodes) do - table.insert(index, {name=k, order=n.order or 100}) - end - - table.sort(index, function(a, b) return a.order < b.order end) -%> -
    - <% for j, v in pairs(index) do - local nnode = node.nodes[v.name]%> -
  • - class="yellowtext"<%end%>><%=nnode.title%> - <% submenu(prefix .. v.name .. "/", nnode) %> -
    • - <% 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 node.title then %> - class="yellowtext"<%end%>><%=node.title%> - <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> -
-<% end - end -end -%> -
-
-
<%:webif Weboberfläche%> -
    <% - for k,node in pairs(tree.nodes) do - if node.title then %> - class="yellowtext"<%end%>><%=node.title%> -<% end - end%> -
-
- <% - if "admin" == request[1] then - require("luci.model.uci") - local ucic = luci.model.uci.changes() - if ucic then - ucic = #luci.util.split(ucic) - end - %> -
<%:config Konfiguration%> - -
- <% end %> -
-
\ No newline at end of file +<% include("themes/" .. luci.fs.basename(media) .. "/header") %> \ No newline at end of file diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm new file mode 100644 index 0000000000..4de7bbab0c --- /dev/null +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/footer.htm @@ -0,0 +1,7 @@ +
+
+
+ +
<%=require("luci").__appname__ .. " " .. luci.__version__%> - Lua Configuration Interface
+ + \ No newline at end of file diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm new file mode 100644 index 0000000000..5f876781f6 --- /dev/null +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm @@ -0,0 +1,137 @@ +<% +require("luci.sys") +local load1, load5, load15 = luci.sys.loadavg() + +local request = require("luci.dispatcher").request +local category = request[1] +local tree = luci.dispatcher.node() +local cattree = category and luci.dispatcher.node(category) +local node = luci.dispatcher.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.i18n").loadc("default") + +require("luci.http").prepare_content("text/html") +%> + + + + + <% if node and node.css then %><% end %> + + + LuCI - Lua Configuration Interface + + + + +
+<%:path Pfad%>: <% +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 + %><%=c.title or v%> <% if k ~= #request then %>» <% end + end +end +%> +
+ +
+
+<% +local function submenu(prefix, node) + if not node._menu_selected or not node.nodes then + return false + end + local index = {} + for k, n in pairs(node.nodes) do + table.insert(index, {name=k, order=n.order or 100}) + end + + table.sort(index, function(a, b) return a.order < b.order end) +%> +
    + <% for j, v in pairs(index) do + local nnode = node.nodes[v.name]%> +
  • + class="yellowtext"<%end%>><%=nnode.title%> + <% submenu(prefix .. v.name .. "/", nnode) %> +
    • + <% 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 node.title then %> + class="yellowtext"<%end%>><%=node.title%> + <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> +
+<% end + end +end +%> +
+
+
<%:webif Weboberfläche%> +
    <% + for k,node in pairs(tree.nodes) do + if node.title then %> + class="yellowtext"<%end%>><%=node.title%> +<% end + end%> +
+
+ <% + if "admin" == request[1] then + require("luci.model.uci") + local ucic = luci.model.uci.changes() + if ucic then + ucic = #luci.util.split(ucic) + end + %> +
<%:config Konfiguration%> + +
+ <% end %> +
+
\ No newline at end of file diff --git a/themes/fledermaus/root/www/luci-static/fledermaus/cascade.css b/themes/fledermaus/root/www/luci-static/fledermaus/cascade.css index 5920254c78..c8bb21d6d3 100644 --- a/themes/fledermaus/root/www/luci-static/fledermaus/cascade.css +++ b/themes/fledermaus/root/www/luci-static/fledermaus/cascade.css @@ -194,12 +194,6 @@ code { white-space: pre; } -table th, table, td { - vertical-align: top; - text-align: left; - border: 1px solid gray; -} - .cbi-section { margin-top: 1em; }