modules/admin-full: new interface overview page, other template changes

[project/luci.git] / modules / admin-full / luasrc / view / admin_uci / apply.htm

diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm
index ac18746..a9fbbfe 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm
@@ -12,31 +12,21 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
+
 <%+header%>
 
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:uci_applied%>:</strong></p>
-
-<div class="cbi-section">
-       <code><%=(changes or "-")%></code>
-</div>
-
-<fieldset class="cbi-section">
-       <ul class="cbi-apply"><%-
-               local fp = reload()
-               local line = fp:read()
-               while line do
-                       write("<li>" .. luci.util.pcdata(line) .. "</li>\n")
-                       line = fp:read()
-               end
-               fp:close()
-       -%></ul>
-</fieldset>
-
-<div class="cbi-page-actions">
-       <form class="inline" method="get" action="<%=luci.util.pcdata(luci.http.formvalue("redir"))%>">
-               <input class="cbi-button" style="margin:0" type="submit" value="« <%:back%>" />
-       </form>
-</div>
+<h2><a id="content" name="content"><%:Configuration / Apply%></a></h2>
+
+<% if changes then %>
+       <%+cbi/apply_xhr%>
+       <%+admin_uci/changelog%>
+
+       <%- cbi_apply_xhr('uci-apply', configs) -%>
+
+       <p><strong><%:The following changes have been comitted%>:</strong></p>
+       <%- uci_changelog(changes) -%>
+<% else %>
+       <p><strong><%:There are no pending changes to apply!%></strong></p>
+<% end %>
 
 <%+footer%>