$Id$
-%>
+<%-
+local bit = require "bit"
+local rowcnt = 1
+
+function rowstyle()
+ rowcnt = rowcnt + 1
+ return (rowcnt % 2) + 1
+end
+
+function opkg_error(code)
+ code = bit.rshift(tonumber(code), 8)
+ return translate("OPKG error code %i" % code)
+end
+-%>
<%+header%>
-<h1><%:system%></h1>
-<h2><%:a_s_packages%></h2>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Software%></h3>
<br />
<% if install or remove or update or upgrade then %>
-<div class="code"><strong><%:status%>:</strong><br />
+<div class="code"><strong><%:Status%>:</strong><br />
<% if update then %>
- <%:a_s_packages_update%>: <% if update == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=update%>)</span><% end %><br />
+ <%:Package lists updated%>: <% if update == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(update)%>)</span><% end %><br />
<% end %>
<% if upgrade then%>
- <%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=upgrade%>)</span><% end %><br />
+ <%:Upgrade installed packages%>: <% if upgrade == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
<% end %>
<% if install then for k,v in pairs(install) do %>
- <%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=v%>)</span><% end %><br />
+ <%:Install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
<% end end %>
<% if remove then for k,v in pairs(remove) do %>
- <%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%:code%> <%=v%>)</span><% end %><br />
+ <%:Remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
<% end end %>
</div>
<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>
+<form method="post" action="<%=REQUEST_URI%>">
+ <div class="cbi-map">
+ <fieldset class="cbi-section">
+ <ul>
+ <li><a href="<%=REQUEST_URI%>/ipkg"><%:Edit package lists and installation targets%></a></li>
+ <li><a href="<%=REQUEST_URI%>?update=1"><%:Update package lists%></a></li>
+ </ul>
+ <br />
+ <fieldset class="cbi-section-node">
+ <div class="cbi-value">
+ <label class="cbi-value-title"><%:Download and install package%>:</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>
-<br />
-<br />
+ <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="<%:Find package%>" />
+ </div>
+ </div>
-<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 />
+ <table class="cbi-section-table">
+ <tr class="cbi-section-table-titles">
+ <th class="cbi-section-table-cell"><%:Package 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"><%:Description%></th>
+ </tr>
+ <% for k, pkg in pairs(pkgs) do %>
+ <tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
+ <td><%=luci.util.pcdata(pkg.Package)%></td>
+ <td><%=luci.util.pcdata(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 %><%:not installed%><% end %></td>
+ <td><%=luci.util.pcdata(pkg.Description)%></td>
+ </tr>
+ <% end %>
+ </table>
- <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>
+ <br />
+
+ <div style="text-align: right">
+ <input type="submit" class="cbi-input-apply" name="submit" value="<%:Perform Actions%>" />
+ </div>
+ </fieldset></fieldset>
</div>
- <br />
- <input type="submit" name="submit" value="<%:a_s_packages_do%>" />
</form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>