* luci/libs/cbi: better layout for apply output

* luci/themes: introduce new css class for apply ul

diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/cbi/luasrc/view/cbi/map.htm
index 1238b6adb03982dc156876029b979da4c9fe1f0e..6378f72abf498b7d0e37be419f4abf92b15ab391 100644 (file)
--- 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 4663ff5831d4c1d2d0185df4570aa63864322f89..7deeaebeab6200f29dc44d04cef70266d47111e8 100644 (file)
--- 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 dd6fe5e9bfb2cbfce4779718baa8234737aa1970..064b4e63c8260cf1a965d236e90d7d7ab768f5a8 100644 (file)
--- 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 bc01339e7eb2ba8b8b32ff635c1cf2b633014382..3f44f202e267977bebdfb02bd7a46fac797bd78f 100644 (file)
--- 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],