diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-03-15 09:52:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 09:52:22 +0100 |
| commit | 005f4fb7d4069d1d19506b539fd190a95eacf1e2 (patch) | |
| tree | 08f7c67416fd4379c63c3f107d8dfa1e54d0e574 /modules | |
| parent | de88c2ee697fe73e406cebc55f59325003cdffcc (diff) | |
| parent | 10fbf9b2e45c8b723c4c5d58a9183a55715f3d04 (diff) | |
Merge pull request #1654 from TDT-AG/pr/20180301-luci-several-fixes
luci-app-firewall/luci-base/luci-mod-admin-full: some fixes and improvements
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/luasrc/view/cbi/browser.htm | 1 | ||||
| -rw-r--r-- | modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/luci-base/luasrc/view/cbi/browser.htm b/modules/luci-base/luasrc/view/cbi/browser.htm index a18120141..2abc975e8 100644 --- a/modules/luci-base/luasrc/view/cbi/browser.htm +++ b/modules/luci-base/luasrc/view/cbi/browser.htm @@ -2,6 +2,7 @@ <%+cbi/valueheader%> <input class="cbi-input-text" type="text"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> /> <script type="text/javascript"> +cbi_init() cbi_browser_init('<%=cbid%>', '<%=resource%>', '<%=url('admin/filebrowser')%>'<%=self.default_path and ", '"..self.default_path.."'"%>); </script> <%+cbi/valuefooter%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm index 3e3f65d91..b32ef7826 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm @@ -54,6 +54,9 @@ </div> </form> </div> + <% if reset_avail then %> + <div class="alert-message warning"><%:Custom files (certificates, scripts) may remain on the system. To prevent this, perform a factory-reset first.%></div> + <% end %> </fieldset> <br /> |