From fa756d1fbbb1af713bb75541eebdf0df127db4f6 Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 9 Feb 2018 15:12:21 +0100
Subject: luci-base: fix browser.htm template

If cbi_init() is not called first browser gif will not be found.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 modules/luci-base/luasrc/view/cbi/browser.htm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

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%>
-- 
cgit v1.2.3


From 10fbf9b2e45c8b723c4c5d58a9183a55715f3d04 Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Wed, 24 Jan 2018 14:57:08 +0100
Subject: luci-mod-admin-full: add hint on backup restore

Add a hint to backup restore that files could remain on the system.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules')

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 />
-- 
cgit v1.2.3