From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 7 Dec 2008 21:27:52 +0000 (+0000)
Subject: luci-0.8: merge r3870
X-Git-Tag: 0.8.2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=57f8e6acd39a9811590a2cfe0f3faa037b2afaf5;p=oweals%2Fluci.git

luci-0.8: merge r3870
---

diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm
index a908b6a8b..ac18746b6 100644
--- a/modules/admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm
@@ -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 />
+<p><strong><%:uci_applied%>:</strong></p>
+
+<div class="cbi-section">
+	<code><%=(changes or "-")%></code>
 </div>
-<%+footer%>
\ No newline at end of file
+
+<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%>
diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm
index 6375aaf71..a9db8b49b 100644
--- a/modules/admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm
@@ -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>
+<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%>
diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm
index e8515dc41..9c98d452e 100644
--- a/modules/admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm
@@ -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>
-<%+footer%>
\ No newline at end of file
+
+<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%>