cbi_addopt = "-- Additional Field --"
cbi_optional = " (optional)"
cbi_sectempty = "This section contains no values yet"
-cbi_saveapply = "Save & Apply"
revert = "Revert"
save = "Save"
+saveapply = "Save & Apply"
service = "Service"
services = "Services"
settings = "Settings"
cbi_del = "Eintrag entfernen"
cbi_invalid = "Error: Ungültige Eingabe"
cbi_addopt = "-- Zusätzliches Feld --"
-cbi_sectempty = "Diese Sektion enthält noch keine Einträge"
-cbi_saveapply = "Speichern & Anwenden"
\ No newline at end of file
+cbi_sectempty = "Diese Sektion enthält noch keine Einträge"
\ No newline at end of file
revert = "Verwerfen"
save = "Speichern"
+saveapply = "Speichern & Anwenden"
service = "Dienst"
services = "Dienste"
settings = "Einstellungen"
-%>
<div>
- <input type="submit" name="cbi.apply" value="<%:cbi_saveapply%>" />
+ <input type="submit" name="cbi.apply" value="<%:saveapply%>" />
<input type="submit" value="<%:save%>" />
<input type="reset" value="<%:reset%>" />
<script type="text/javascript">cbi_d_init();</script>
local i18n = luci.i18n.translate
entry({"admin", "uci"}, nil, i18n("config"))
- entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"))
- entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"))
- entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"))
+ entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"), 40)
+ entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"), 30)
+ entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"), 20)
+ entry({"admin", "uci", "saveapply"}, call("action_apply"), i18n("saveapply"), 10)
end
function convert_changes(changes)
end
function action_apply()
+ local path = luci.dispatcher.context.path
local changes = luci.model.uci.changes()
local output = ""
-- Collect files to be applied and commit changes
for r, tbl in pairs(changes) do
if r then
- luci.model.uci.load(r)
- luci.model.uci.commit(r)
- luci.model.uci.unload(r)
+ if path[#path] ~= "apply" then
+ luci.model.uci.load(r)
+ luci.model.uci.commit(r)
+ luci.model.uci.unload(r)
+ end
if luci.config.uci_oncommit and luci.config.uci_oncommit[r] then
run[luci.config.uci_oncommit[r]] = true
end
<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
<input type="submit" value="<%:apply%>" />
</form>
+<form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
+ <input type="submit" value="<%:saveapply%>" />
+</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
<input type="submit" value="<%:revert%>" />
</form>
local i18n = luci.i18n.translate
entry({"mini", "uci"}, nil, i18n("config"))
- entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"))
- entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"))
- entry({"mini", "uci", "apply"}, call("action_apply"), i18n("apply"))
+ entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"), 30)
+ entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"), 20)
+ entry({"mini", "uci", "apply"}, call("action_apply"), i18n("saveapply"), 10)
end
function convert_changes(changes)
end
%>
<div><%:config%>
- <ul>
<% if ucic > 0 then %>
- <li><a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a></li>
- <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
- <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
+ <% submenu(category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
<% else %>
- <li><%:changes%>: 0</li>
+ <ul>
+ <li><%:changes%>: 0</li>
+ </ul>
<% end %>
- </ul>
</div>
<% end %>
</div>
<div>
<% if ucic > 0 then %>
<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>
+ <% submenu(category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
<% else %>
<a href="#"><%:changes%>: 0</a>
<% end %>