From 8d372d2f284e1d74d210a30a03681bc86395574d Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 8 Sep 2008 16:51:50 +0000
Subject: [PATCH] * luci/libs/cbi: better layout for apply output *
luci/themes: introduce new css class for apply ul
---
libs/cbi/luasrc/view/cbi/map.htm | 28 ++++++++++---------
.../htdocs/luci-static/fledermaus/cascade.css | 4 +++
.../luci-static/openwrt-light/cascade.css | 4 +++
.../luci-static/openwrt.org/cascade.css | 4 +++
4 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/cbi/luasrc/view/cbi/map.htm
index 1238b6adb..6378f72ab 100644
--- a/libs/cbi/luasrc/view/cbi/map.htm
+++ b/libs/cbi/luasrc/view/cbi/map.htm
@@ -16,19 +16,21 @@ $Id$
<div class="cbi-map" id="cbi-<%=self.config%>">
<h1><%=self.title%></h1>
<div class="cbi-map-descr"><%=self.description%></div>
- <%- if self._apply then -%><code><%:cbi_applying%>:
-
-<%
- local fp = self._apply()
- self._apply = nil
- local line = fp:read()
- while line do
- write(line.."\n")
- line = fp:read()
- end
- fp:close()
- -%>
- </code><%- end -%>
+ <%- if self._apply then -%>
+ <fieldset class="cbi-section">
+ <legend><%:cbi_applying%></legend>
+ <ul class="cbi-apply"><%-
+ local fp = self._apply()
+ self._apply = nil
+ local line = fp:read()
+ while line do
+ write("<li>" .. luci.util.pcdata(line) .. "</li>\n")
+ line = fp:read()
+ end
+ fp:close()
+ -%></ul>
+ </fieldset>
+ <%- end -%>
<%- self:render_children() %>
<br />
</div>
diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
index 4663ff583..7deeaebea 100644
--- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
+++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
@@ -507,6 +507,10 @@ td.cbi-value-error {
padding: 3px;
}
+ul.cbi-apply {
+ font-size: 90%;
+}
+
.right {
text-align: right;
}
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
index dd6fe5e9b..064b4e63c 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@ -492,6 +492,10 @@ td.cbi-value-error {
padding: 3px;
}
+ul.cbi-apply {
+ font-size: 90%;
+}
+
.right {
text-align: right;
}
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index bc01339e7..3f44f202e 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -222,6 +222,10 @@ div#content ul {
background-color: inherit;
}
+ul.cbi-apply {
+ font-size: 90%;
+}
+
input[type=submit],
input[type=reset],
input[type=image],
--
2.25.1