diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-15 21:53:28 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-15 21:53:28 +0000 |
| commit | 670648ad214ed26e74b25801e04f1430662de470 (patch) | |
| tree | 9bb6ed3cc1da52383f2224411a8411d54a38d568 /modules/admin-full/luasrc/view/admin_uci/apply.htm | |
| parent | 79674ec6ab2cd034f33c3ffffc2cae3a94631928 (diff) | |
modules/admin-full: rework changes/apply/revert pages
Diffstat (limited to 'modules/admin-full/luasrc/view/admin_uci/apply.htm')
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_uci/apply.htm | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm index e9de29a91a..a9fbbfe9e5 100644 --- 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"><%:Configuration%></a></h2> -<p><strong><%:The following changes have been 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%> |