From 09b829a9c795477a637b265ceeca2eacabca427b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Sat, 16 Aug 2008 15:37:28 +0000 Subject: [PATCH] UI Improvements --- i18n/german/luasrc/i18n/default.de.lua | 2 +- .../htdocs/luci-static/resources/cbi/find.gif | Bin 0 -> 273 bytes .../luci-static/resources/cbi/reload.gif | Bin 0 -> 248 bytes .../luasrc/view/admin_system/backup.htm | 2 +- .../luasrc/view/admin_system/packages.htm | 108 ++++++++++-------- .../admin-mini/luasrc/view/mini/backup.htm | 2 +- .../htdocs/luci-static/fledermaus/cascade.css | 12 ++ .../luci-static/openwrt-light/cascade.css | 12 ++ .../luci-static/openwrt.org/cascade.css | 12 ++ 9 files changed, 97 insertions(+), 53 deletions(-) create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/find.gif create mode 100644 libs/cbi/htdocs/luci-static/resources/cbi/reload.gif diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua index c0c9e43d5..078c1e8d3 100644 --- a/i18n/german/luasrc/i18n/default.de.lua +++ b/i18n/german/luasrc/i18n/default.de.lua @@ -18,7 +18,7 @@ configfile = "Konfigurationsdatei" confirmation = "Bestätigung" delete = "Löschen" -descr = "Beschriebung" +descr = "Beschreibung" design = "Design" device = "Gerät" devices = "Geräte" diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/find.gif b/libs/cbi/htdocs/luci-static/resources/cbi/find.gif new file mode 100644 index 0000000000000000000000000000000000000000..9ae5e3489bb888d198eb923bb095b48b04403705 GIT binary patch literal 273 zcmV+s0q*`sNk%w1VGsZi0K^{vc9*og-TcMk{nhCBh_A@i+vHYljktnV?e+bOcW6yp zbLH*z_4)kq_4;Q^Gl{$GpO1s<@%ZNQ{aZUCuG8g1OkMl^{;_vPn!whm%ie)&TXr4L_o{y)q5EzYtB;xTCWf;e!643y9FwiJ6z-cH%*eE2C&?LHF520~{Ks*+N*(+Kf z6ATMOGH`g(00>C|cno`e9u*=05rZ2M2z-c&9*lzt8600y!Ov51h?dP)!|<#Vc>gJ1)O z9Y&Xm98YHe08|
- +
<%+footer%> \ No newline at end of file diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm index 0f8f2c16e..d28b60cca 100644 --- a/modules/admin-full/luasrc/view/admin_system/packages.htm +++ b/modules/admin-full/luasrc/view/admin_system/packages.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 -%> <%+header%>

<%:system%>

@@ -36,56 +43,57 @@ $Id$
<% end %> - - -
-
- -
-
- <%:a_s_packages_installurl%>:
- - -
- -
-
- -
- <%:filter%>: - - - -
- -
-
- -
- - - - - - - - - <% for k, pkg in pairs(pkgs) do %> - - - - - - - - <% end %> -
<%:a_s_packages_name%><%:version%><%:install%><%:delete%><%:descr%>
<%=pkg.Package%><%=pkg.Version%><% if not pkg.Status or not pkg.Status.installed then %><% else %><%:installed%><% end %><% if pkg.Status and pkg.Status.installed then %><% else %><%:notinstalled%><% end %><%=pkg.Description%>
+ +
+
+ +
+
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+ + + + + + + + + + <% for k, pkg in pairs(pkgs) do %> + + + + + + + + <% end %> +
<%:a_s_packages_name%><%:version%><%:install%><%:delete%><%:descr%>
<%=pkg.Package%><%=pkg.Version%><% if not pkg.Status or not pkg.Status.installed then %><% else %><%:installed%><% end %><% if pkg.Status and pkg.Status.installed then %><% else %><%:notinstalled%><% end %><%=pkg.Description%>
+ +
+ +
+ +
+
-
- <%+footer%> \ No newline at end of file diff --git a/modules/admin-mini/luasrc/view/mini/backup.htm b/modules/admin-mini/luasrc/view/mini/backup.htm index 42d338e1d..a288e0be2 100644 --- a/modules/admin-mini/luasrc/view/mini/backup.htm +++ b/modules/admin-mini/luasrc/view/mini/backup.htm @@ -34,7 +34,7 @@ $Id$
- +
<%+footer%> \ No newline at end of file diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css index 8fbdf318f..c39396886 100644 --- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css +++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css @@ -283,6 +283,18 @@ input.cbi-input-key { padding-left: 17px; } +input.cbi-input-find { + background: url('../resources/cbi/find.gif') no-repeat scroll 1px center; + background-color: inherit; + padding-left: 17px; +} + +input.cbi-input-reload { + background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center; + background-color: inherit; + padding-left: 17px; +} + input.cbi-input-add, input.cbi-button-add { background: url('../resources/cbi/add.gif') no-repeat scroll 1px center; 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 9a83623ba..119b86cd2 100644 --- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css +++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css @@ -268,6 +268,18 @@ input.cbi-input-key { padding-left: 17px; } +input.cbi-input-find { + background: url('../resources/cbi/find.gif') no-repeat scroll 1px center; + background-color: inherit; + padding-left: 17px; +} + +input.cbi-input-reload { + background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center; + background-color: inherit; + padding-left: 17px; +} + input.cbi-input-add, input.cbi-button-add { background: url('../resources/cbi/add.gif') no-repeat scroll 1px center; 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 22c9d1ff3..add60dfb1 100644 --- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css @@ -276,6 +276,18 @@ input.cbi-input-key { padding-left: 17px; } +input.cbi-input-find { + background: url('../resources/cbi/find.gif') no-repeat scroll 1px center; + background-color: inherit; + padding-left: 17px; +} + +input.cbi-input-reload { + background: url('../resources/cbi/reload.gif') no-repeat scroll 1px center; + background-color: inherit; + padding-left: 17px; +} + input.cbi-input-add, input.cbi-button-add { background: url('../resources/cbi/add.gif') no-repeat scroll 1px center; -- 2.25.1