From 6ec0353201435e0d0d7d32820d8ba600b4ca7b5b Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <cshored@thecshore.com>
Date: Thu, 2 Aug 2018 09:39:48 -0400
Subject: modules: Make luci-base sufficient to use luci apps

Per the discussion in https://github.com/openwrt/luci/issues/869, make
luci-base sufficient to login, logout, and review and apply or revert
uci changes.  This allows most luci-app-xxx to work without having
luci-mod-admin-full installed.

It has been tested with some apps and not luci-mod-admin-full, as well
as with luci-mod-admin-full (to make sure the usual case doesn't break).

Instead of creating a new module namespace (e.g. 'Base') we reduce the
opportunities for breakage by having luci-base take over the 'shell' of
the 'Administration' (admin/....) namespace.

Since admin is assumed by all current building LuCI components (including
Freifunk), this doesn't introduce the 'Administration' tab into any
situation where it would not already be present (but includes it where it
was before).

We also add a "Component not installed" page to avoid fatal errors and
backtrace when e.g. luci-mod-admin-full is not installed.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
---
 .../luci-base/luasrc/view/admin_uci/changes.htm    | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 modules/luci-base/luasrc/view/admin_uci/changes.htm

(limited to 'modules/luci-base/luasrc/view/admin_uci/changes.htm')

diff --git a/modules/luci-base/luasrc/view/admin_uci/changes.htm b/modules/luci-base/luasrc/view/admin_uci/changes.htm
new file mode 100644
index 0000000000..43bd7c23fb
--- /dev/null
+++ b/modules/luci-base/luasrc/view/admin_uci/changes.htm
@@ -0,0 +1,45 @@
+<%#
+ Copyright 2008 Steven Barth <steven@midlink.org>
+ Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io>
+ Licensed to the public under the Apache License 2.0.
+-%>
+
+<%+header%>
+
+<%-
+	local node, redir_url = luci.dispatcher.lookup(luci.http.formvalue("redir"))
+	export("redirect", redir_url or url("admin/uci/changes"))
+
+	include("admin_uci/changelog")
+-%>
+
+<h2 name="content"><%:Configuration%> / <%:Changes%></h2>
+
+<% if changes then %>
+	<%- uci_changelog(changes) -%>
+<% else %>
+	<p><strong><%:There are no pending changes!%></strong></p>
+<% end %>
+
+<div class="alert-message" id="cbi_apply_status" style="display:none"></div>
+
+<div class="cbi-page-actions">
+	<% if redir_url then %>
+	<form method="get" action="<%=luci.util.pcdata(redir_url)%>">
+		<input class="cbi-button cbi-button-link" type="submit" value="<%:Back%>" />
+	</form>
+	<% end %>
+
+	<form method="post" action="<%=url("admin/uci/changes")%>">
+		<input type="hidden" name="token" value="<%=token%>" />
+		<input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
+		<input class="cbi-button cbi-button-save" type="submit" name="trigger_apply" value="<%:Save & Apply%>" />
+	</form>
+	<form method="post" action="<%=url("admin/uci/revert")%>">
+		<input type="hidden" name="token" value="<%=token%>" />
+		<input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
+		<input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" />
+	</form>
+</div>
+
+<%+footer%>
-- 
cgit v1.2.3