UI Improvements

diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua
index c0c9e43d5c6b50f1ba426dfef9665c99bfe4f9d9..078c1e8d3109beb083379296cad5a20ad4bc6249 100644 (file)
--- 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 (file)
index 0000000..9ae5e34
Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/find.gif differ

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif b/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif
new file mode 100644 (file)
index 0000000..8268958
Binary files /dev/null and b/libs/cbi/htdocs/luci-static/resources/cbi/reload.gif differ

diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm
index 42d338e1db3626e88613629119823364e14d7e31..a288e0be2b08ff63073b9d108f6c1c3f95f152e1 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_system/backup.htm
+++ b/modules/admin-full/luasrc/view/admin_system/backup.htm
@@ -34,7 +34,7 @@ $Id$
                <input type="file" size="30" name="archive" />
        </div>
        <div>
-               <input type="submit" value="<%:a_s_backup_restore%>" />
+               <input type="submit" class="cbi-input-apply" value="<%:a_s_backup_restore%>" />
        </div>
 </form>
 <%+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 0f8f2c16ebefd688a500a1c3262f508a234575ae..d28b60ccae281e2c2c0096e4f96446de1400da49 100644 (file)
--- 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%>
 <h1><%:system%></h1>
@@ -36,56 +43,57 @@ $Id$
 <br />
 <% end %>
 
-<div>
-<a href="<%=controller%>/admin/system/packages/ipkg"><%:a_s_packages_ipkg%></a><br />
-<a href="<%=controller%>/admin/system/packages?update=1"><%:a_s_packages_updatelist%></a><br />
-<a href="<%=controller%>/admin/system/packages?upgrade=1"><%:a_s_packages_upgrade%></a>
-</div>
-
-<br />
-<br />
-
-<form method="post" action="<%=controller%>/admin/system/packages">
-       <div>
-               <span class="bold"><%:a_s_packages_installurl%>:</span><br />
-               <input type="text" name="url" size="30" value="" />
-               <input type="submit" name="submit" value="<%:ok%>" />
-       </div>
-       
-       <br />
-       <br />
-
-       <div>
-               <span class="bold"><%:filter%>:</span>
-               <input type="text" name="query" size="20" value="<%=query%>" />
-               <input type="submit" name="search" value="<%:a_s_packages_search%>" />
-               <input type="submit" name="submit" value="<%:a_s_packages_do%>" />
-       </div>
-       
-       <br />
-       <br />
-       
-       <div>
-       <table style="font-size: 0.8em">
-               <tr>
-                       <th><%:a_s_packages_name%></th>
-                       <th><%:version%></th>
-                       <th><%:install%></th>
-                       <th><%:delete%></th>
-                       <th><%:descr%></th>
-               </tr>
-               <% for k, pkg in pairs(pkgs) do %>      
-               <tr>
-                       <td><%=pkg.Package%></td>
-                       <td><%=pkg.Version%></td>
-                       <td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td>
-                       <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td>
-                       <td><%=pkg.Description%></td>
-               </tr>
-               <% end %>
-       </table>
+<form method="post" action="<%=REQUEST_URI%>">
+       <div class="cbi-map">
+               <fieldset class="cbi-section">
+                       <ul>
+                               <li><a href="<%=REQUEST_URI%>/ipkg"><%:a_s_packages_ipkg%></a></li>
+                               <li><a href="<%=REQUEST_URI%>?update=1"><%:a_s_packages_updatelist%></a></li>
+                               <li><a href="<%=REQUEST_URI%>?upgrade=1"><%:a_s_packages_upgrade%></a></li>
+                       </ul>
+                       <br />
+                       <fieldset class="cbi-section-node">
+                       <div class="cbi-value">
+                               <label class="cbi-value-title"><%:a_s_packages_installurl%>:</label>
+                               <div class="cbi-value-field">
+                                       <input type="text" name="url" size="30" value="" />
+                                       <input class="cbi-input-save" type="submit" name="submit" value="<%:ok%>" />
+                               </div>
+                       </div>
+               
+                       <div class="cbi-value">
+                               <label class="cbi-value-title"><%:filter%>:</label>
+                               <div class="cbi-value-field">
+                                       <input type="text" name="query" size="20" value="<%=query%>" />
+                                       <input type="submit" class="cbi-input-find" name="search" value="<%:a_s_packages_search%>" />
+                               </div>
+                       </div>
+                       
+                       <table class="cbi-section-table">
+                               <tr class="cbi-section-table-titles">
+                                       <th class="cbi-section-table-cell"><%:a_s_packages_name%></th>
+                                       <th class="cbi-section-table-cell"><%:version%></th>
+                                       <th class="cbi-section-table-cell"><%:install%></th>
+                                       <th class="cbi-section-table-cell"><%:delete%></th>
+                                       <th class="cbi-section-table-cell"><%:descr%></th>
+                               </tr>
+                               <% for k, pkg in pairs(pkgs) do %>      
+                               <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
+                                       <td><%=pkg.Package%></td>
+                                       <td><%=pkg.Version%></td>
+                                       <td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td>
+                                       <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td>
+                                       <td><%=pkg.Description%></td>
+                               </tr>
+                               <% end %>
+                       </table>
+                       
+                       <br />
+                       
+                       <div style="text-align: right">
+                               <input type="submit" class="cbi-input-apply" name="submit" value="<%:a_s_packages_do%>" />
+                       </div>
+               </fieldset></fieldset>
        </div>
-       <br />
-       <input type="submit" name="submit" value="<%:a_s_packages_do%>" />
 </form>
 <%+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 42d338e1db3626e88613629119823364e14d7e31..a288e0be2b08ff63073b9d108f6c1c3f95f152e1 100644 (file)
--- a/modules/admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/admin-mini/luasrc/view/mini/backup.htm
@@ -34,7 +34,7 @@ $Id$
                <input type="file" size="30" name="archive" />
        </div>
        <div>
-               <input type="submit" value="<%:a_s_backup_restore%>" />
+               <input type="submit" class="cbi-input-apply" value="<%:a_s_backup_restore%>" />
        </div>
 </form>
 <%+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 8fbdf318fe0e4d4d29d17017c59c0a4cdf5ef635..c39396886291b2271001a05b11a8b2342b6be816 100644 (file)
--- 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 9a83623ba9dbb6875c9d9c88c2e48031c901a02a..119b86cd281c75862b059d00a80434791317a4a5 100644 (file)
--- 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 22c9d1ff39190801c446c9396c8a839e78c9767e..add60dfb1c19f513e7a1256ffe674d2aa30d74c4 100644 (file)
--- 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;