From 720295d973b44cdad4cd4a0e0b0b0f7f79ff6c3a Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 10 Oct 2008 20:59:27 +0000 Subject: OXYGEN #3: Add "back" button to UCI apply/revert/changes pages --- i18n/english/luasrc/i18n/default.en.lua | 1 + i18n/english/luasrc/i18n/default.en.xml | 1 + i18n/german/luasrc/i18n/default.de.lua | 1 + i18n/german/luasrc/i18n/default.de.xml | 1 + modules/admin-full/luasrc/controller/admin/uci.lua | 10 ++++++---- modules/admin-full/luasrc/view/admin_uci/apply.htm | 10 ++++++++++ modules/admin-full/luasrc/view/admin_uci/changes.htm | 10 ++++++++++ modules/admin-full/luasrc/view/admin_uci/revert.htm | 10 ++++++++++ modules/admin-mini/luasrc/controller/mini/uci.lua | 8 +++++--- modules/admin-mini/luasrc/view/mini/uci_apply.htm | 10 ++++++++++ modules/admin-mini/luasrc/view/mini/uci_changes.htm | 19 ++++++++++++++++--- modules/admin-mini/luasrc/view/mini/uci_revert.htm | 10 ++++++++++ 12 files changed, 81 insertions(+), 10 deletions(-) diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua index 3613f10bb..666b7a312 100644 --- a/i18n/english/luasrc/i18n/default.en.lua +++ b/i18n/english/luasrc/i18n/default.en.lua @@ -6,6 +6,7 @@ add = 'Add' addresses = 'Addresses' aliases = 'Aliases' all = 'all' +back = 'back' administration = 'Administration' essentials = 'Essentials' apply = 'Apply' diff --git a/i18n/english/luasrc/i18n/default.en.xml b/i18n/english/luasrc/i18n/default.en.xml index cf67c7f80..3c0f270c2 100644 --- a/i18n/english/luasrc/i18n/default.en.xml +++ b/i18n/english/luasrc/i18n/default.en.xml @@ -11,6 +11,7 @@ Addresses Aliases all +back Administration Essentials Apply diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua index 8700c1c9d..24c37eaa9 100644 --- a/i18n/german/luasrc/i18n/default.de.lua +++ b/i18n/german/luasrc/i18n/default.de.lua @@ -9,6 +9,7 @@ all = 'alle' administration = 'Administration' essentials = 'Vereinfacht' apply = 'Anwenden' +back = 'zurück' basicsettings = 'Grundeinstellungen' broadcast = 'IPv4-Broadcast' changes = 'Änderungen' diff --git a/i18n/german/luasrc/i18n/default.de.xml b/i18n/german/luasrc/i18n/default.de.xml index 91a067d14..e9c4ca2c0 100644 --- a/i18n/german/luasrc/i18n/default.de.xml +++ b/i18n/german/luasrc/i18n/default.de.xml @@ -16,6 +16,7 @@ Anwenden +zurück Grundeinstellungen IPv4-Broadcast diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua index 53b3464f6..d313128ad 100644 --- a/modules/admin-full/luasrc/controller/admin/uci.lua +++ b/modules/admin-full/luasrc/controller/admin/uci.lua @@ -15,12 +15,14 @@ module("luci.controller.admin.uci", package.seeall) function index() local i18n = luci.i18n.translate + local redir = luci.http.formvalue("redir", true) or + luci.dispatcher.build_url(unpack(luci.dispatcher.context.request)) entry({"admin", "uci"}, nil, i18n("config")) - 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) + entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"), 40).query = {redir=redir} + entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"), 30).query = {redir=redir} + entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"), 20).query = {redir=redir} + entry({"admin", "uci", "saveapply"}, call("action_apply"), i18n("saveapply"), 10).query = {redir=redir} end function convert_changes(changes) diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm index 8aa09c641..a908b6a8b 100644 --- a/modules/admin-full/luasrc/view/admin_uci/apply.htm +++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm @@ -13,6 +13,11 @@ $Id$ -%> <%+header%> +
+"><< <%:back%> +
+
+

<%:config%>

<%:uci_applied%>:

<%=(changes or "-")%> @@ -26,4 +31,9 @@ while line do end fp:close() %> +
+"><< <%:back%> +
+
+
<%+footer%> \ No newline at end of file diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm index da0d9f11c..6375aaf71 100644 --- a/modules/admin-full/luasrc/view/admin_uci/changes.htm +++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm @@ -13,6 +13,11 @@ $Id$ -%> <%+header%> +
+"><< <%:back%> +
+
+

<%:config%>

<%:changes%>

<%=changes%> @@ -26,4 +31,9 @@ $Id$
+ +
+
+"><< <%:back%> +
<%+footer%> diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm index 553ec7454..e8515dc41 100644 --- a/modules/admin-full/luasrc/view/admin_uci/revert.htm +++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm @@ -13,7 +13,17 @@ $Id$ -%> <%+header%> +
+"><< <%:back%> +
+
+

<%:config%>

<%:uci_reverted%>:

<%=(changes or "-")%> +
+"><< <%:back%> +
+
+
<%+footer%> \ No newline at end of file diff --git a/modules/admin-mini/luasrc/controller/mini/uci.lua b/modules/admin-mini/luasrc/controller/mini/uci.lua index 4e920563a..4687c839d 100644 --- a/modules/admin-mini/luasrc/controller/mini/uci.lua +++ b/modules/admin-mini/luasrc/controller/mini/uci.lua @@ -16,11 +16,13 @@ module("luci.controller.mini.uci", package.seeall) function index() local i18n = luci.i18n.translate + local redir = luci.http.formvalue("redir", true) or + luci.dispatcher.build_url(unpack(luci.dispatcher.context.request)) entry({"mini", "uci"}, nil, i18n("config")) - entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"), 30) - entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"), 20) - entry({"mini", "uci", "saveapply"}, call("action_apply"), i18n("saveapply"), 10) + entry({"mini", "uci", "changes"}, call("action_changes"), i18n("changes"), 30).query = {redir=redir} + entry({"mini", "uci", "revert"}, call("action_revert"), i18n("revert"), 20).query = {redir=redir} + entry({"mini", "uci", "saveapply"}, call("action_apply"), i18n("saveapply"), 10).query = {redir=redir} end function convert_changes(changes) diff --git a/modules/admin-mini/luasrc/view/mini/uci_apply.htm b/modules/admin-mini/luasrc/view/mini/uci_apply.htm index 8aa09c641..a908b6a8b 100644 --- a/modules/admin-mini/luasrc/view/mini/uci_apply.htm +++ b/modules/admin-mini/luasrc/view/mini/uci_apply.htm @@ -13,6 +13,11 @@ $Id$ -%> <%+header%> +
+"><< <%:back%> +
+
+

<%:config%>

<%:uci_applied%>:

<%=(changes or "-")%> @@ -26,4 +31,9 @@ while line do end fp:close() %> +
+"><< <%:back%> +
+
+
<%+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 591ae6998..89df99dab 100644 --- a/modules/admin-mini/luasrc/view/mini/uci_changes.htm +++ b/modules/admin-mini/luasrc/view/mini/uci_changes.htm @@ -13,14 +13,27 @@ $Id$ -%> <%+header%> +
+"><< <%:back%> +
+
+

<%:config%>

<%:changes%>

<%=changes%>

-
+
-
+ + +
+
-<%+footer%> + +
+
+"><< <%:back%> +
+<%+footer%> \ No newline at end of file diff --git a/modules/admin-mini/luasrc/view/mini/uci_revert.htm b/modules/admin-mini/luasrc/view/mini/uci_revert.htm index 553ec7454..e8515dc41 100644 --- a/modules/admin-mini/luasrc/view/mini/uci_revert.htm +++ b/modules/admin-mini/luasrc/view/mini/uci_revert.htm @@ -13,7 +13,17 @@ $Id$ -%> <%+header%> +
+"><< <%:back%> +
+
+

<%:config%>

<%:uci_reverted%>:

<%=(changes or "-")%> +
+"><< <%:back%> +
+
+
<%+footer%> \ No newline at end of file -- cgit v1.2.3