summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base/luasrc/view/cbi/map.htm
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-05-18 16:44:33 +0200
committerGitHub <noreply@github.com>2018-05-18 16:44:33 +0200
commit828202ef5237f48e6f53d15ca198e2c6815b7cd7 (patch)
treea59276e5df1ebe77edca65b06b2a3b72f10ba70c /modules/luci-base/luasrc/view/cbi/map.htm
parent80cb4fef8c7db0dadc373fef122d7abb092a7191 (diff)
parent9f796fad3a0cc89df57d4e27ef6d7223a093071c (diff)
Merge pull request #1769 from jow-/master
UCI apply/rollback workflow
Diffstat (limited to 'modules/luci-base/luasrc/view/cbi/map.htm')
-rw-r--r--modules/luci-base/luasrc/view/cbi/map.htm17
1 files changed, 14 insertions, 3 deletions
diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm
index e3210add6..69ef3615a 100644
--- a/modules/luci-base/luasrc/view/cbi/map.htm
+++ b/modules/luci-base/luasrc/view/cbi/map.htm
@@ -2,12 +2,23 @@
<div class="errorbox"><%=pcdata(msg)%></div>
<%- end end -%>
-<%-+cbi/apply_xhr-%>
-
<div class="cbi-map" id="cbi-<%=self.config%>">
<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
- <%- if firstmap and applymap then cbi_apply_xhr(self.config, parsechain, redirect) end -%>
+ <%- if firstmap and (applymap or confirmmap) then -%>
+ <%+cbi/apply_widget%>
+ <% cbi_apply_widget(redirect) %>
+ <div class="alert-message" id="cbi_apply_status" style="display:none"></div>
+ <script type="text/javascript">
+ document.addEventListener("DOMContentLoaded", function() {
+ <% if confirmmap then -%>
+ uci_confirm(true, Date.now() + <%=confirmmap%> * 1000);
+ <%- else -%>
+ uci_apply(true);
+ <%- end %>
+ });
+ </script>
+ <%- end -%>
<% if self.tabbed then %>
<ul class="cbi-tabmenu map">