Several small cleanups and improvements

modules/admin-mini: Added reboot page

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index efbe12456f57acb71e47b808348b4473a1f46ab0..b179ec808ebc5a6b292ee29408c73982321b2801 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -97,6 +97,7 @@ a_s_flash_upgrade1 = "Replaces the installed firmware with a new one. The firmwa
 a_s_reboot1 = "Reboots the operating system of your device"
 a_s_reboot_do = "Perform reboot"
 a_s_reboot_running = "Please wait: Device rebooting..."
 a_s_reboot1 = "Reboots the operating system of your device"
 a_s_reboot_do = "Perform reboot"
 a_s_reboot_running = "Please wait: Device rebooting..."

+a_s_reboot_u = "Warning: There are unsaved changes that will be lost while rebooting!"

 
 a_srv_http = "HTTP-Server"
 a_srv_ssh = "SSH-Server"
 
 a_srv_http = "HTTP-Server"
 a_srv_ssh = "SSH-Server"

diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua
index df135a66d8020ad85376952b907646c31f3d0d6a..eb6ce8c4d1e067abf1825505acb6341e459cf3f4 100644 (file)
--- a/i18n/english/luasrc/i18n/default.en.lua
+++ b/i18n/english/luasrc/i18n/default.en.lua
@@ -87,8 +87,10 @@ target = "Target"
 timezone = "Timezone"
 type = "Type"
 
 timezone = "Timezone"
 type = "Type"
 

-username = "Username"

 unknownerror = "Unknown Error"
 unknownerror = "Unknown Error"

+unsavedchanges = "Unsaved Changes"
+username = "Username"
+

 
 version = "Version"
 
 
 version = "Version"
 

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 2c7f0fc9c785f9f3c49bd3cbb8d3dc9f39fa9e49..c3cb041ebee362afc851447c8deed42c20d8e1cf 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -93,6 +93,7 @@ a_s_packages_upgrade = [[Installierte Pakete aktualisieren]]
 a_s_reboot1 = [[Startet das Betriebssystem des Routers neu.]]
 a_s_reboot_do = [[Neustart durchführen]]
 a_s_reboot_running = [[Bitte warten: Neustart wird durchgeführt...]]
 a_s_reboot1 = [[Startet das Betriebssystem des Routers neu.]]
 a_s_reboot_do = [[Neustart durchführen]]
 a_s_reboot_running = [[Bitte warten: Neustart wird durchgeführt...]]

+a_s_reboot_u = "Warnung: Es gibt ungespeicherte Änderungen, die beim Neustart verloren gehen!"

 a_s_sshkeys = [[SSH-Schlüssel]]
 a_s_sshkeys1 = [[Hier können öffentliche SSH-Schlüssel (einer pro Zeile)
  zur Authentifizierung abgelegt werden.]]
 a_s_sshkeys = [[SSH-Schlüssel]]
 a_s_sshkeys1 = [[Hier können öffentliche SSH-Schlüssel (einer pro Zeile)
  zur Authentifizierung abgelegt werden.]]

diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua
index 4e0a36f66c52eabe4ce629734fe43aac4b6a17e2..c88e941343ce8bdea6e58b227c4fd283e50bf74f 100644 (file)
--- a/i18n/german/luasrc/i18n/default.de.lua
+++ b/i18n/german/luasrc/i18n/default.de.lua
@@ -88,8 +88,9 @@ target = "Ziel"
 timezone = "Zeitzone"
 type = "Typ"
 
 timezone = "Zeitzone"
 type = "Typ"
 

-username = "Benutzername"

 unknownerror = "Unbekannter Fehler"
 unknownerror = "Unbekannter Fehler"

+unsavedchanges = "Ungespeicherte Änderungen"
+username = "Benutzername"

 
 version = "Version"
 
 
 version = "Version"
 

diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index 430c5b82c59972b26cc6f13ec76dd8ac24f7df94..9583f4f91377ed66d38a414d73fbc8c105bf18ec 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -41,7 +41,7 @@ function index()
        page.target = cbi("admin_index/luci")
        page.title  = i18n("a_i_ui", "Oberfläche")
        
        page.target = cbi("admin_index/luci")
        page.title  = i18n("a_i_ui", "Oberfläche")
        

-       entry({"admin", "logout"}, call("action_logout"), i18n("logout"))
+       entry({"admin", "index", "logout"}, call("action_logout"), i18n("logout"))

 end
 
 function action_logout()
 end
 
 function action_logout()

diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm
index 3ddfa5880ebe14901c450387f19e228472bb1692..600da36fcb48951c73210138351f63324e9b7199 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm
@@ -16,10 +16,18 @@ $Id$
 <h1><%:system%></h1>
 <h2><%:reboot%></h2>
 <p><%:a_s_reboot1%></p>
 <h1><%:system%></h1>
 <h2><%:reboot%></h2>
 <p><%:a_s_reboot1%></p>

-<% if not reboot then %>
+<%-
+local c = require("luci.model.uci").changes()
+if c and next(c) then
+-%>
+       <p class="warning"><%:a_s_reboot_u%></p> 
+<%-
+end
+if not reboot then 
+-%>

 <p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>
 <p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>

-<% else %>
+<%- else -%>

 <p><%:a_s_reboot_running%></p>
 <script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
 <p><%:a_s_reboot_running%></p>
 <script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>

-<% end %>
+<%- end -%>

 <%+footer%>
\ No newline at end of file
 <%+footer%>
\ No newline at end of file

diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
new file mode 100644 (file)
index 0000000..7b13e20
--- /dev/null
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -0,0 +1,32 @@
+--[[
+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$
+]]--
+
+module("luci.controller.mini.system", package.seeall)
+
+function index()
+       luci.i18n.loadc("admin-core")
+       local i18n = luci.i18n.translate
+
+       entry({"mini", "system"}, call("action_reboot"), i18n("system"))
+       entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 10)
+end
+
+function action_reboot()
+       local reboot = luci.http.formvalue("reboot")
+       luci.template.render("mini/reboot", {reboot=reboot})
+       if reboot then
+               luci.sys.reboot()
+       end
+end
\ No newline at end of file

diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/admin-mini/luasrc/view/mini/reboot.htm
new file mode 100644 (file)
index 0000000..600da36
--- /dev/null
+++ b/modules/admin-mini/luasrc/view/mini/reboot.htm
@@ -0,0 +1,33 @@
+<%#
+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><%:system%></h1>
+<h2><%:reboot%></h2>
+<p><%:a_s_reboot1%></p>
+<%-
+local c = require("luci.model.uci").changes()
+if c and next(c) then
+-%>
+       <p class="warning"><%:a_s_reboot_u%></p> 
+<%-
+end
+if not reboot then 
+-%>
+<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>
+<%- else -%>
+<p><%:a_s_reboot_running%></p>
+<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
+<%- end -%>
+<%+footer%>
\ No newline at end of file

diff --git a/modules/admin-mini/luasrc/view/mini/uci_changes.htm b/modules/admin-mini/luasrc/view/mini/uci_changes.htm
index 09d8d3e7ee9ca56683d239d67ff02d5ddd7084de..ae601aa1f6d90c61441743155874f9dd0d8c7eec 100644 (file)
--- a/modules/admin-mini/luasrc/view/mini/uci_changes.htm
+++ b/modules/admin-mini/luasrc/view/mini/uci_changes.htm
@@ -17,10 +17,10 @@ $Id$
 <h2><%:changes%></h2>
 <code><%=changes%></code>
 <br /><br />
 <h2><%:changes%></h2>
 <code><%=changes%></code>
 <br /><br />

-<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
+<form class="inline" method="get" action="<%=controller%>/mini/uci/apply">

        <input type="submit" value="<%:apply%>" />
 </form>
        <input type="submit" value="<%:apply%>" />
 </form>

-<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
+<form class="inline" method="get" action="<%=controller%>/mini/uci/revert">

        <input type="submit" value="<%:revert%>" />
 </form>
 <%+footer%>
        <input type="submit" value="<%:revert%>" />
 </form>
 <%+footer%>

diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index 2ca2cb4f648d0cea5d3ea19559e4fa9d3567ecd4..0febd3b6e341be10dfed41fbba5d59764f0f2104 100644 (file)
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -24,6 +24,11 @@ div#content ul {
        margin-left: 2em;
 }
 
        margin-left: 2em;
 }
 

+.warning {
+       color: red !important;
+       font-weight: bold;
+}
+

 .clear {
        clear: both;
        height: 1px;
 .clear {
        clear: both;
        height: 1px;

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 c7908c0c5a2e7eb1dc4ff963b4920590ba8c7860..df31154c0ae56914c793c927a009b3e5580c2286 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -91,7 +91,7 @@ end
 
 <div class="menubar">
        <div id="mainmenu" class="mainmenu">
 
 <div class="menubar">
        <div id="mainmenu" class="mainmenu">

-<%
+<%-

 local function submenu(prefix, node)
        if not node.nodes then
                return false
 local function submenu(prefix, node)
        if not node.nodes then
                return false


@@ -110,7 +110,7 @@ local function submenu(prefix, node)
        if count > 0 then
 %>
        <ul>
        if count > 0 then
 %>
        <ul>

-       <% for j, v in pairs(index) do
+       <%- for j, v in pairs(index) do

                if #v.name > 0 then
                        local nnode = node.nodes[v.name]
                        local href = controller .. prefix .. v.name
                if #v.name > 0 then
                        local nnode = node.nodes[v.name]
                        local href = controller .. prefix .. v.name


@@ -118,12 +118,12 @@ local function submenu(prefix, node)
                %>
                <li>
                        <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
                %>
                <li>
                        <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>

-                       <% submenu(prefix .. v.name .. "/", nnode) %>
+                       <%- submenu(prefix .. v.name .. "/", nnode) %>

                </li>
                </li>

-               <% end %>
-       <% end %>
+               <%- end %>
+       <%- end %>

        </ul>
        </ul>

-<%
+<%-

        end
 end
 
        end
 end
 


@@ -172,7 +172,7 @@ end
        <div class="mainmenu" style="float:right; margin-right:2em">
                <div>
                        <% if ucic > 0 then %>
        <div class="mainmenu" style="float:right; margin-right:2em">
                <div>
                        <% if ucic > 0 then %>

-                       <a href="<%=controller%>/<%=category%>/uci/changes"><%:changes%>: <%=ucic%></a>
+                       <a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:unsavedchanges%>: <%=ucic%></a>

                        <ul>
                                <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
                                <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>
                        <ul>
                                <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
                                <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>