luci-0.8: merge r3870

This commit is contained in:
Jo-Philipp Wich 2008-12-07 21:27:52 +00:00
parent 338391eacb
commit 57f8e6acd3
3 changed files with 67 additions and 56 deletions

View file

@ -13,27 +13,30 @@ $Id$
-%>
<%+header%>
<div>
<a href="<%=luci.http.formvalue("redir")%>">&lt;&lt; <%:back%></a>
<br />
<br />
</div>
<h2><a id="content" name="content"><%:config%></a></h2>
<p><%:uci_applied%>:</p>
<code><%=(changes or "-")%>
<%
local fp = reload()
local line = fp:read()
while line do
write(line.."\n")
line = fp:read()
end
fp:close()
%></code>
<div>
<a href="<%=luci.http.formvalue("redir")%>">&lt;&lt; <%:back%></a>
<br />
<br />
<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>
<%+footer%>

View file

@ -12,28 +12,34 @@ You may obtain a copy of the License at
$Id$
-%>
<%+header%>
<div>
<a href="<%=luci.http.formvalue("redir")%>">&lt;&lt; <%:back%></a>
<br />
<br />
</div>
<h2><a id="content" name="content"><%:config%></a></h2>
<h3><%:changes%></h3>
<code><%=changes%></code>
<br /><br />
<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
<input type="submit" value="<%:apply%>" />
</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
<input type="submit" value="<%:saveapply%>" />
</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
<input type="submit" value="<%:revert%>" />
</form>
<div>
<br />
<a href="<%=luci.http.formvalue("redir")%>">&lt;&lt; <%:back%></a>
<%+header%>
<h2><a id="content" name="content"><%:config%></a></h2>
<p><strong><%:changes%>:</strong></p>
<div class="cbi-section">
<code><%=changes%></code>
</div>
<div class="cbi-page-actions">
<div style="float:left">
<form class="inline" method="get" action="<%=luci.util.pcdata(luci.http.formvalue("redir"))%>">
<input class="cbi-button" style="float:left; margin:0" type="submit" value="« <%:back%>" />
</form>
</div>
<div style="text-align:right">
<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
<input class="cbi-button cbi-button-apply" type="submit" value="<%:apply%>" />
</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
<input class="cbi-button cbi-button-save" type="submit" value="<%:saveapply%>" />
</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
<input class="cbi-button cbi-button-reset" type="submit" value="<%:revert%>" />
</form>
</div>
</div>
<%+footer%>

View file

@ -12,18 +12,20 @@ You may obtain a copy of the License at
$Id$
-%>
<%+header%>
<div>
<a href="<%=luci.http.formvalue("redir")%>">&lt;&lt; <%:back%></a>
<br />
<br />
</div>
<h2><a id="content" name="content"><%:config%></a></h2>
<p><%:uci_reverted%>:</p>
<code><%=(changes or "-")%></code>
<div>
<a href="<%=luci.http.formvalue("redir")%>">&lt;&lt; <%:back%></a>
<br />
<br />
<p><strong><%:uci_reverted%>:</strong></p>
<div class="cbi-section">
<code><%=(changes or "-")%></code>
</div>
<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>
<%+footer%>