modules: Redesigned configuration save, apply, save & apply menu options

i18n/english/luasrc/i18n/cbi.en.lua

@@ -4,4 +4,3 @@ cbi_invalid = "Error: Invalid input value"
 cbi_addopt = "-- Additional Field --"
 cbi_optional = " (optional)"
 cbi_sectempty = "This section contains no values yet"
-cbi_saveapply = "Save & Apply"

i18n/english/luasrc/i18n/default.en.lua

@@ -77,6 +77,7 @@ reset = "Reset"
 revert = "Revert"
 
 save = "Save"
+saveapply = "Save & Apply"
 service = "Service"
 services = "Services"
 settings = "Settings"

i18n/german/luasrc/i18n/cbi.de.lua

@@ -3,4 +3,3 @@ 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"

i18n/german/luasrc/i18n/default.de.lua

@@ -78,6 +78,7 @@ reset = "Zurücksetzen"
 revert = "Verwerfen"
 
 save = "Speichern"
+saveapply = "Speichern & Anwenden"
 service = "Dienst"
 services = "Dienste"
 settings = "Einstellungen"

libs/cbi/luasrc/view/cbi/footer.htm

@@ -14,7 +14,7 @@ $Id$
 -%>
 
 	<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>

modules/admin-full/luasrc/controller/admin/uci.lua

@@ -17,9 +17,10 @@ function index()
 	local i18n = luci.i18n.translate
 	
 	entry({"admin", "uci"}, nil, i18n("config"))
-	entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"))
+	entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"), 40)
-	entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"))
+	entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"), 30)
-	entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"))
+	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)
@@ -52,6 +53,7 @@ function action_changes()
 end
 
 function action_apply()
+	local path = luci.dispatcher.context.path
 	local changes = luci.model.uci.changes()
 	local output  = ""
 	
@@ -62,9 +64,11 @@ function action_apply()
 		-- Collect files to be applied and commit changes
 		for r, tbl in pairs(changes) do
 			if r then
-				luci.model.uci.load(r)
+				if path[#path] ~= "apply" then
-				luci.model.uci.commit(r)
+					luci.model.uci.load(r)
-				luci.model.uci.unload(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

modules/admin-full/luasrc/view/admin_uci/changes.htm

@@ -20,6 +20,9 @@ $Id$
 <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>

modules/admin-mini/luasrc/controller/mini/uci.lua

@@ -18,9 +18,9 @@ function index()
 	local i18n = luci.i18n.translate
 	
 	entry({"mini", "uci"}, nil, i18n("config"))
-	entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"))
+	entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"), 30)
-	entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"))
+	entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"), 20)
-	entry({"mini", "uci", "apply"}, call("action_apply"), i18n("apply"))
+	entry({"mini", "uci", "apply"}, call("action_apply"), i18n("saveapply"), 10)
 end
 
 function convert_changes(changes)

themes/fledermaus/luasrc/view/themes/fledermaus/header.htm

@@ -146,15 +146,13 @@ end
 				end
 		%>
 		<div><%:config%>
-			<ul>
 			<% if ucic > 0 then %>
-				<li><a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a></li>
+				<% submenu(category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
-				<li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
-				<li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
 			<% else %>
-				<li><%:changes%>: 0</li>
+				<ul>
+					<li><%:changes%>: 0</li>
+				</ul>
 			<% end %>
-			</ul>
 		</div>
 		<% end %>
 	</div>

themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm

@@ -174,10 +174,7 @@ end
 		<div>
 			<% if ucic > 0 then %>
 			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:unsavedchanges%>: <%=ucic%></a>
-			<ul>
+			<% submenu(category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
-				<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>
 			<% end %>