diff options
| author | Daniel F. Dickinson <cshored@thecshore.com> | 2018-08-02 09:39:48 -0400 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-09-19 20:08:19 +0200 |
| commit | 6ec0353201435e0d0d7d32820d8ba600b4ca7b5b (patch) | |
| tree | 8f37ae726c257f81fe105cb85e7c6aebe09c0095 /themes | |
| parent | 1a0316bbbaad3f6befce34014d7e204cb1c76ec0 (diff) | |
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>
Diffstat (limited to 'themes')
3 files changed, 9 insertions, 3 deletions
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm index 4347f133a..a6bb32697 100644 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm +++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm @@ -193,7 +193,9 @@ <div class="alert-message warning"> <h4><%:No password set!%></h4> <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p> - <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div> + <% if disp.lookup("amdin/system/admin") then %> + <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div> + <% end %> </div> <%- end -%> diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index c070b1a61..564c680f1 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -239,7 +239,9 @@ <div class="alert-message warning"> <h4><%:No password set!%></h4> <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p> - <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div> + <% if disp.lookup("admin/system/admin") then %> + <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div> + <% end %> </div> <%- end -%> diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm index 6fc657ddc..1d2161168 100644 --- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm @@ -257,6 +257,8 @@ <div class="alert-message warning"> <h4><%:No password set!%></h4> <p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p> - <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div> + <% if disp.lookup("admin/system/admin") then %> + <div class="right"><a class="btn" href="<%=url("admin/system/admin")%>"><%:Go to password configuration...%></a></div> + <% end %> </div> <%- end -%> |