6ec0353201
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>
66 lines
2.1 KiB
HTML
66 lines
2.1 KiB
HTML
<%#
|
|
Copyright 2010 Jo-Philipp Wich <jo@mein.io>
|
|
Licensed to the public under the Apache License 2.0.
|
|
-%>
|
|
|
|
<% export("uci_changelog", function(changes) -%>
|
|
<div class="cbi-section">
|
|
<strong><%:Legend:%></strong>
|
|
<div class="uci-change-legend">
|
|
<div class="uci-change-legend-label"><ins> </ins> <%:Section added%></div>
|
|
<div class="uci-change-legend-label"><del> </del> <%:Section removed%></div>
|
|
<div class="uci-change-legend-label"><var><ins> </ins></var> <%:Option changed%></div>
|
|
<div class="uci-change-legend-label"><var><del> </del></var> <%:Option removed%></div>
|
|
<br style="clear:both" />
|
|
</div>
|
|
<br />
|
|
|
|
<div class="uci-change-list"><%
|
|
local util = luci.util
|
|
local tpl = {
|
|
["add-3"] = "<ins>uci add %0 <strong>%3</strong> # =%2</ins>",
|
|
["set-3"] = "<ins>uci set %0.<strong>%2</strong></ins>=%3",
|
|
["set-4"] = "<var><ins>uci set %0.%2.%3=<strong>%4</strong></ins></var>",
|
|
["remove-2"] = "<del>uci del %0.<strong>%2</strong></del>",
|
|
["remove-3"] = "<var><del>uci del %0.%2.<strong>%3</strong></del></var>",
|
|
["order-3"] = "<var>uci reorder %0.%2=<strong>%3</strong></var>",
|
|
["list-add-4"] = "<var><ins>uci add_list %0.%2.%3=<strong>%4</strong></ins></var>",
|
|
["list-del-4"] = "<var><del>uci del_list %0.%2.%3=<strong>%4</strong></del></var>",
|
|
["rename-3"] = "<var>uci rename %0.%2=<strong>%3</strong></var>",
|
|
["rename-4"] = "<var>uci rename %0.%2.%3=<strong>%4</strong></var>"
|
|
}
|
|
|
|
local conf, deltas
|
|
for conf, deltas in util.kspairs(changes) do
|
|
write("<h3># /etc/config/%s</h3>" % conf)
|
|
|
|
local _, delta, added
|
|
for _, delta in pairs(deltas) do
|
|
local t = tpl["%s-%d" %{ delta[1], #delta }]
|
|
|
|
write(t:gsub("%%(%d)", function(n)
|
|
if n == "0" then
|
|
return conf
|
|
elseif n == "2" then
|
|
if added and delta[2] == added[1] then
|
|
return "@%s[-1]" % added[2]
|
|
else
|
|
return delta[2]
|
|
end
|
|
elseif n == "4" then
|
|
return util.shellquote(delta[4])
|
|
else
|
|
return delta[tonumber(n)]
|
|
end
|
|
end))
|
|
|
|
if delta[1] == "add" then
|
|
added = { delta[2], delta[3] }
|
|
end
|
|
end
|
|
|
|
write("<br />")
|
|
end
|
|
%></div>
|
|
</div>
|
|
<%- end) %>
|