From 5a92c0fc089f8af4cdd5c35e94a563526c872ffd Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 13 Aug 2008 14:09:33 +0000 Subject: libs/cbi: Improved user interface draft #1 --- libs/cbi/htdocs/luci-static/resources/cbi/add.gif | Bin 0 -> 378 bytes .../cbi/htdocs/luci-static/resources/cbi/apply.gif | Bin 0 -> 268 bytes .../htdocs/luci-static/resources/cbi/fieldadd.gif | Bin 0 -> 379 bytes libs/cbi/htdocs/luci-static/resources/cbi/help.gif | Bin 0 -> 266 bytes .../cbi/htdocs/luci-static/resources/cbi/reset.gif | Bin 0 -> 258 bytes libs/cbi/htdocs/luci-static/resources/cbi/save.gif | Bin 0 -> 263 bytes libs/cbi/luasrc/view/cbi/footer.htm | 6 ++--- libs/cbi/luasrc/view/cbi/full_valuefooter.htm | 1 + libs/cbi/luasrc/view/cbi/nsection.htm | 2 +- libs/cbi/luasrc/view/cbi/tblsection.htm | 28 ++++++++++----------- libs/cbi/luasrc/view/cbi/tsection.htm | 4 +-- libs/cbi/luasrc/view/cbi/ucisection.htm | 2 +- 12 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/add.gif create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/apply.gif create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/help.gif create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/reset.gif create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/save.gif (limited to 'libs') diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/add.gif b/libs/cbi/htdocs/luci-static/resources/cbi/add.gif new file mode 100644 index 000000000..0888abf85 Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/add.gif differ diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif b/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif new file mode 100644 index 000000000..82ae7ed82 Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/apply.gif differ diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif b/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif new file mode 100644 index 000000000..431ff64d1 Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/fieldadd.gif differ diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/help.gif b/libs/cbi/htdocs/luci-static/resources/cbi/help.gif new file mode 100644 index 000000000..9dfa0e196 Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/help.gif differ diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif b/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif new file mode 100644 index 000000000..c941c1902 Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/reset.gif differ diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/save.gif b/libs/cbi/htdocs/luci-static/resources/cbi/save.gif new file mode 100644 index 000000000..35e949963 Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/save.gif differ diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm index 732389c00..b71905820 100644 --- a/libs/cbi/luasrc/view/cbi/footer.htm +++ b/libs/cbi/luasrc/view/cbi/footer.htm @@ -14,9 +14,9 @@ $Id$ -%>
- - - + + +
diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm index a7b56e294..8933016d7 100644 --- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm +++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm @@ -14,6 +14,7 @@ $Id$ -%> <% if #self.description > 0 then -%> + <%:help%>
<%=self.description%>
<%- end %> diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/cbi/luasrc/view/cbi/nsection.htm index 3f8653109..27db4bfbf 100644 --- a/libs/cbi/luasrc/view/cbi/nsection.htm +++ b/libs/cbi/luasrc/view/cbi/nsection.htm @@ -35,7 +35,7 @@ $Id$ <%=self.title%> <%- end %>
<%=self.description%>
- + <% end %> diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm index 46f7e5115..cfee09f1c 100644 --- a/libs/cbi/luasrc/view/cbi/tblsection.htm +++ b/libs/cbi/luasrc/view/cbi/tblsection.htm @@ -11,6 +11,13 @@ You may obtain a copy of the License at $Id$ +-%> +<%- +local rowcnt = 1 +function rowstyle() + rowcnt = rowcnt + 1 + return (rowcnt % 2) + 1 +end -%> @@ -26,9 +33,7 @@ $Id$ <%- end -%> <%- for i, k in pairs(self.children) do -%> <%=k.title%> - <%- count = count + 1; end; if self.extedit then -%> -   - <%- count = count + 1; end; if self.addremove then -%> + <%- count = count + 1; end; if self.extedit or self.addremove then -%>   <%- count = count + 1; end -%> @@ -38,9 +43,7 @@ $Id$ <%- end -%> <%- for i, k in pairs(self.children) do -%> <%=k.description%> - <%- end; if self.extedit then -%> -   - <%- end; if self.addremove then -%> + <%- end; if self.extedit or self.addremove then -%>   <%- end -%> @@ -50,7 +53,7 @@ $Id$ isempty = false scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } -%> - + <% if not self.anonymous then -%>

<%=k%>

<%- end %> @@ -60,15 +63,10 @@ $Id$ <%- if self.extedit then -%> <%:edit%> <%- end; if self.addremove then %> - + <%- end -%> <%- end -%> - <%- if self.addremove then -%> - - - - <%- end -%> <%- end -%> @@ -84,10 +82,10 @@ $Id$
<% if self.anonymous then %> - + <% else %> - + <% end %> <% if self.err_invalid then %> diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/cbi/luasrc/view/cbi/tsection.htm index da44cdc13..a81715b0a 100644 --- a/libs/cbi/luasrc/view/cbi/tsection.htm +++ b/libs/cbi/luasrc/view/cbi/tsection.htm @@ -43,10 +43,10 @@ $Id$ <% if self.addremove then -%>
<% if self.anonymous then -%> - + <%- else -%> - + <%- end %> <% if self.err_invalid then -%> diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm index e06cb5392..2ae856003 100644 --- a/libs/cbi/luasrc/view/cbi/ucisection.htm +++ b/libs/cbi/luasrc/view/cbi/ucisection.htm @@ -31,6 +31,6 @@ $Id$ <% end %><% end %> <% end %> <% end %> - +
<% end %> -- cgit v1.2.3