luci-0.9: merge r5764

diff --git a/applications/luci-initmgr/luasrc/controller/init.lua b/applications/luci-initmgr/luasrc/controller/init.lua
index c7ef43f83ebc6193bd7d73d3c1b5e12a6d151e2b..19771fb3226c62047cb56f3808e29ea331810a67 100644 (file)
--- a/applications/luci-initmgr/luasrc/controller/init.lua
+++ b/applications/luci-initmgr/luasrc/controller/init.lua
@@ -23,7 +23,7 @@ function index()
        luci.i18n.loadc("initmgr")
 
        entry(
-               {"admin", "system", "init"}, form("init/init"),
-               luci.i18n.translate("initmgr", "Init Scripts")
+               {"admin", "services", "init"}, form("init/init"),
+               luci.i18n.translate("initmgr", "Init Scripts"), 0
        ).i18n = "initmgr"
 end

diff --git a/applications/luci-initmgr/luasrc/model/cbi/init/init.lua b/applications/luci-initmgr/luasrc/model/cbi/init/init.lua
index 5d915a890dea553fb1f03673e69394b2216d25c4..c3cbc4663d28734ae1c9d74b9a217092e82c93ce 100644 (file)
--- a/applications/luci-initmgr/luasrc/model/cbi/init/init.lua
+++ b/applications/luci-initmgr/luasrc/model/cbi/init/init.lua
@@ -32,28 +32,54 @@ end
 
 m = SimpleForm("initmgr", translate("initmgr"), translate("initmgr_desc"))
 m.reset = false
+m.submit = false
+
 
 s = m:section(Table, inits)
 
 i = s:option(DummyValue, "index", translate("initmgr_index"))
 n = s:option(DummyValue, "name", translate("initmgr_name"))
 
-e = s:option(Flag, "enabled", translate("initmgr_enabled"))
-e.rmempty = false
 
-e.cfgvalue = function(self, section)
-       return inits[section].enabled and "1" or "0"
+e = s:option(Button, "endisable", translate("initmgr_enabled"))
+
+e.render = function(self, section, scope)
+       if inits[section].enabled then
+               self.title = translate("initmgr_enable", "Enabled")
+               self.inputstyle = "save"
+       else
+               self.title = translate("initmgr_disable", "Disabled")
+               self.inputstyle = "reset"
+       end
+
+       Button.render(self, section, scope)
 end
 
-e.write = function(self, section, value)
-       if value == "1" and not inits[section].enabled then
-               inits[section].enabled = true
-               return luci.sys.init.enable(inits[section].name)
-       elseif value == "0" and inits[section].enabled then
+e.write = function(self, section)
+       if inits[section].enabled then
                inits[section].enabled = false
                return luci.sys.init.disable(inits[section].name)
+       else
+               inits[section].enabled = true
+               return luci.sys.init.enable(inits[section].name)
        end
-       return true
 end
 
+
+start = s:option(Button, "start", translate("initmgr_start",  "Start"))
+start.inputstyle = "apply"
+start.write = function(self, section)
+       luci.sys.call("/etc/init.d/%s %s" %{ inits[section].name, self.option })
+end
+
+restart = s:option(Button, "restart", translate("initmgr_restart", "Restart"))
+restart.inputstyle = "reload"
+restart.write = start.write
+
+stop = s:option(Button, "stop", translate("initmgr_stop",   "Stop"))
+stop.inputstyle = "remove"
+stop.write = start.write
+
+
 return m
+

diff --git a/po/ca/initmgr.po b/po/ca/initmgr.po
index 63b66dfa19401cb7a0d7da456e3fc576da6690b3..ed9b39c43f61695c17ba8b73a319dee89a2a024a 100644 (file)
--- a/po/ca/initmgr.po
+++ b/po/ca/initmgr.po
@@ -41,3 +41,15 @@ msgstr "Script d'inici"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Activa/Desactiva"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/de/initmgr.po b/po/de/initmgr.po
index dea77145d663f75d9b01f90953a5034e44efc3fa..2793d9fc2e61b83cba5275a03300e114d3f3044e 100644 (file)
--- a/po/de/initmgr.po
+++ b/po/de/initmgr.po
@@ -22,8 +22,8 @@ msgstr "Startscripte"
 msgid "initmgr_desc"
 msgstr ""
 "Hier können installierte Startscripte aktiviert oder deaktiviert werden. "
-"Änderungen werden erst mit einem Geräteneustart angewendet.<br "
-"/><strong>Warnung: Wenn essentialle Startscripte wie &quot;network&quot; "
+"Änderungen werden erst mit einem Geräteneustart angewendet.<br /"
+"><strong>Warnung: Wenn essentialle Startscripte wie &quot;network&quot; "
 "deaktiviert werden könnte das Gerät unerreichbar werden!</strong>"
 
 #. Start priority
@@ -40,3 +40,15 @@ msgstr "Startscript"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Aktivieren/Deaktivieren"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/el/initmgr.po b/po/el/initmgr.po
index cdb2f0285aa4ef2959fa354345bfe17344b9c103..6d5eb8d05f2d7b20e52461650081c25972633851 100644 (file)
--- a/po/el/initmgr.po
+++ b/po/el/initmgr.po
@@ -22,10 +22,10 @@ msgstr "Σενάρια Εκκίνησης"
 msgid "initmgr_desc"
 msgstr ""
 "Μπορείτε να ενεργοποιήσετε ή να απενεργοποιήσετε σενάρια εκκίνησης εδώ. Οι "
-"αλλαγές θα εφαρμοστούν αφού επανεκκινήσετε τη συσκευή.<br "
-"/><strong>Προειδοποίηση: Αν απενεργοποιήσετε απαραίτητα σενάρια εκκίνησης "
-"όπως το &quot;network&quot;, η συσκευή σας μπορεί να γίνει "
-"μη-προσβάσιμη!</strong>"
+"αλλαγές θα εφαρμοστούν αφού επανεκκινήσετε τη συσκευή.<br /"
+"><strong>Προειδοποίηση: Αν απενεργοποιήσετε απαραίτητα σενάρια εκκίνησης "
+"όπως το &quot;network&quot;, η συσκευή σας μπορεί να γίνει μη-προσβάσιμη!</"
+"strong>"
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
@@ -41,3 +41,15 @@ msgstr "Σενάριο εκκίνησης"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Ενεργοποίηση/Απενεργοποίηση"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/en/initmgr.po b/po/en/initmgr.po
index 3183647ca3e0171201ce7ef486b773e6374cb6bc..8fdf6d17dc26947d94e30f028fd731f8a566edae 100644 (file)
--- a/po/en/initmgr.po
+++ b/po/en/initmgr.po
@@ -23,8 +23,8 @@ msgid "initmgr_desc"
 msgstr ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
-"scripts like &quot;network&quot;, your device might become "
-"inaccesable!</strong>"
+"scripts like &quot;network&quot;, your device might become inaccesable!</"
+"strong>"
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
@@ -40,3 +40,15 @@ msgstr "Initscript"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Enable/Disable"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/es/initmgr.po b/po/es/initmgr.po
index 37244b48aed3ebe8e6b14add949df5a21b5d7b8d..f38f7a2e9f1a67285197495fce5a69855758a4bf 100644 (file)
--- a/po/es/initmgr.po
+++ b/po/es/initmgr.po
@@ -21,10 +21,10 @@ msgstr "Scripts de inicio"
 msgid "initmgr_desc"
 msgstr ""
 "Puede activar o desactivar los scripts de inicio (init scripts) desde aquí. "
-"Los cambios serána plicados luego de que reinicie el equipo.<br "
-"/><strong>ADVERTENCIA: Si desactiva scripts de inicio esenciales como "
-"&amp;quot;network&amp;quot;, su equipo puede no iniciar o volverne "
-"inaccesible!.</strong>"
+"Los cambios serána plicados luego de que reinicie el equipo.<br /"
+"><strong>ADVERTENCIA: Si desactiva scripts de inicio esenciales como &amp;"
+"quot;network&amp;quot;, su equipo puede no iniciar o volverne inaccesible!.</"
+"strong>"
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
@@ -40,3 +40,15 @@ msgstr "Nombre del script de inicio"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Activar/Desactivar"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/fr/initmgr.po b/po/fr/initmgr.po
index d8d3711cd55374725d14b5b109b2c1fd57165c0b..1443680b3a6dafed6158cb325b0749769e6ac1d1 100644 (file)
--- a/po/fr/initmgr.po
+++ b/po/fr/initmgr.po
@@ -36,3 +36,15 @@ msgstr ""
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr ""
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/it/initmgr.po b/po/it/initmgr.po
index d8d3711cd55374725d14b5b109b2c1fd57165c0b..1443680b3a6dafed6158cb325b0749769e6ac1d1 100644 (file)
--- a/po/it/initmgr.po
+++ b/po/it/initmgr.po
@@ -36,3 +36,15 @@ msgstr ""
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr ""
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/ja/initmgr.po b/po/ja/initmgr.po
index d8d3711cd55374725d14b5b109b2c1fd57165c0b..1443680b3a6dafed6158cb325b0749769e6ac1d1 100644 (file)
--- a/po/ja/initmgr.po
+++ b/po/ja/initmgr.po
@@ -36,3 +36,15 @@ msgstr ""
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr ""
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/pt/initmgr.po b/po/pt/initmgr.po
index 56fc6b9de818c5c6283d42db27b59beaf68093f8..5e60af02f39fa716a2d6d5d3995621841c5ae7ef 100644 (file)
--- a/po/pt/initmgr.po
+++ b/po/pt/initmgr.po
@@ -22,8 +22,8 @@ msgstr "Scripts de Inicialização"
 msgid "initmgr_desc"
 msgstr ""
 "Você pode ativar ou desativar os scripts de inicialização instalados aqui. "
-"As mudanças serão aplicadas após a reinicialização do equipamento.<br "
-"/><strong>Aviso: Se você desativar algum script de inicialização essencial "
+"As mudanças serão aplicadas após a reinicialização do equipamento.<br /"
+"><strong>Aviso: Se você desativar algum script de inicialização essencial "
 "como por exemplo &quot;rede/network&quot;, o dispositivo poderá tornar-se "
 "inacessível!</strong>"
 
@@ -41,3 +41,15 @@ msgstr "Script de inicialização"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Ativar/Desativar"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/pt_BR/initmgr.po b/po/pt_BR/initmgr.po
index a2d557fb640e21596e754409a95b563818c87a52..2d841404a6786b1ab616afdeaaeef04039e8141e 100644 (file)
--- a/po/pt_BR/initmgr.po
+++ b/po/pt_BR/initmgr.po
@@ -22,8 +22,8 @@ msgstr "Scripts de Inicialização"
 msgid "initmgr_desc"
 msgstr ""
 "Você pode ativar ou desativar os scripts de inicialização instalados aqui. "
-"As mudanças serão aplicadas após a reinicialização do equipamento.<br "
-"/><strong>Aviso: Se você desativar algum script de inicialização essencial "
+"As mudanças serão aplicadas após a reinicialização do equipamento.<br /"
+"><strong>Aviso: Se você desativar algum script de inicialização essencial "
 "como por exemplo &quot;rede/network&quot;, o dispositivo poderá tornar-se "
 "inacessível!</strong>"
 
@@ -41,3 +41,15 @@ msgstr "Script de inicialização"
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr "Ativar/Desativar"
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""

diff --git a/po/ru/initmgr.po b/po/ru/initmgr.po
index d8d3711cd55374725d14b5b109b2c1fd57165c0b..1443680b3a6dafed6158cb325b0749769e6ac1d1 100644 (file)
--- a/po/ru/initmgr.po
+++ b/po/ru/initmgr.po
@@ -36,3 +36,15 @@ msgstr ""
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:5
 msgid "initmgr_enabled"
 msgstr ""
+
+#. Start
+msgid "initmgr_start"
+msgstr ""
+
+#. Stop
+msgid "initmgr_stop"
+msgstr ""
+
+#. Reload
+msgid "initmgr_reload"
+msgstr ""