projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
29052f0
)
* luci-0.8: backport new layout for apply messages
author
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 25 Sep 2008 14:37:51 +0000
(14:37 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 25 Sep 2008 14:37:51 +0000
(14:37 +0000)
libs/cbi/luasrc/view/cbi/map.htm
patch
|
blob
|
history
themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
patch
|
blob
|
history
themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
patch
|
blob
|
history
themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
patch
|
blob
|
history
diff --git
a/libs/cbi/luasrc/view/cbi/map.htm
b/libs/cbi/luasrc/view/cbi/map.htm
index
1238b6a
..
6378f72
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>
<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>
<%- 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
e443664
..
70132fd
100644
(file)
--- a/
themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
+++ b/
themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
@@
-506,6
+506,10
@@
td.cbi-value-error {
padding: 3px;
}
padding: 3px;
}
+ul.cbi-apply {
+ font-size: 90%;
+}
+
.right {
text-align: right;
}
.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
6c841b2
..
ebc1c60
100644
(file)
--- a/
themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/
themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@
-491,6
+491,10
@@
td.cbi-value-error {
padding: 3px;
}
padding: 3px;
}
+ul.cbi-apply {
+ font-size: 90%;
+}
+
.right {
text-align: right;
}
.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
1e2e7eb
..
3c52300
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;
}
background-color: inherit;
}
+ul.cbi-apply {
+ font-size: 90%;
+}
+
input[type=submit],
input[type=reset],
input[type=image],
input[type=submit],
input[type=reset],
input[type=image],