Generalized UCI changes display

i18n: some nicer looking translations

diff --git a/i18n/english/luasrc/i18n/cbi.en.lua b/i18n/english/luasrc/i18n/cbi.en.lua
index 6069cec453301a4ffc589d4966f017c6cde25e38..b681cfb0928b9538e64cc2a82a2c1f00858331c4 100644 (file)
--- a/i18n/english/luasrc/i18n/cbi.en.lua
+++ b/i18n/english/luasrc/i18n/cbi.en.lua
@@ -1,4 +1,4 @@
 cbi_add = "Add entry"
 cbi_del = "Remove entry"
 cbi_invalid = "Error: Invalid input value"
-cbi_addopt = "-- Field --"
\ No newline at end of file
+cbi_addopt = "-- Additional Field --"
\ 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 3667fb196bb8c7b41bc41d2e78ad6fd63728cf50..0c3c06a85d7c9b64d2a5e8b22ee28ba36948f120 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -10,6 +10,7 @@ a_i_i_team = [[Das LuCI-Team]]
 a_i_keepflash = [[Zu übernehmende Dateien bei Firmwareupgrade]]
 a_i_keepflash1 = [[Die folgenden Dateien und Verzeichnisse werden beim Aktualisieren der Firmware
 über die Oberfläche automatisch in die neue Firmware übernommen.]]
+a_i_luci1 = "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst werden."
 a_i_ucicommit = [[UCI-Befehle beim Anwenden]]
 a_i_ucicommit1 = [[Beim Anwenden
 der Konfiguration aus der Oberflächliche heraus können automatisch die relevanten Dienste neugestart werden,

diff --git a/i18n/german/luasrc/i18n/cbi.de.lua b/i18n/german/luasrc/i18n/cbi.de.lua
index ed4a091599a22a7024f3bcdbb0e6ddf440cc9bdd..baa3a80da17f125869f4bd613decfde0f90ce650 100644 (file)
--- a/i18n/german/luasrc/i18n/cbi.de.lua
+++ b/i18n/german/luasrc/i18n/cbi.de.lua
@@ -1,4 +1,4 @@
 cbi_add = "Eintrag hinzufügen"
 cbi_del = "Eintrag entfernen"
 cbi_invalid = "Error: Ungültige Eingabe"
-cbi_addopt = "-- Feld --"
\ No newline at end of file
+cbi_addopt = "-- Zusätzliches Feld --"
\ No newline at end of file

diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index eb58e00422932d43ec786db5beebf77611c65141..430c5b82c59972b26cc6f13ec76dd8ac24f7df94 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -30,6 +30,7 @@ function index()
        page.order   = 10
        page.i18n    = "admin-core"
        page.sysauth = "root"
+       page.ucidata = true
        
        local page  = node("admin", "index")
        page.target = template("admin_index/index")

diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index 1ae5df92299f6c5f34cf09b407674cd7cd39ef57..7b711d062556790effbf275112cb6aff369057a8 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -157,7 +157,7 @@ end
        </div>
 
        <%
-               if "admin" == request[1] then
+               if tree.nodes[category].ucidata then
                        local ucic = 0
                        for i, j in pairs(require("luci.model.uci").changes()) do
                                for k, l in pairs(j) do
@@ -170,10 +170,10 @@ end
        <div class="mainmenu" style="float:right; margin-right:2em">
                <div>
                        <% if ucic > 0 then %>
-                       <a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a>
+                       <a href="<%=controller%>/<%=category%>/uci/changes"><%:changes%>: <%=ucic%></a>
                        <ul>
-                               <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
-                               <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
+                               <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
+                               <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>
                        </ul>
                        <% else %>
                        <a href="#"><%:changes%>: 0</a>