* luci/themes: layout changes for smalltext tables in openwrt.org theme

* luci/olsr:	layout fixes for status pages

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index 777fd2dcf534aba7a83406abe63a970445dc4b8a..35dec2d8e34c9e1204a0da040a0bee781f4f4f5f 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -15,7 +15,7 @@ $Id$
 <%+header%>
 <h1><%:olsrhna%></h1>
 <br />
-<table cellspacing="0" cellpadding="6">
+<table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
 <th><%:destination%></th>
 <th><%:gateway%></th>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index a38b63a36ce53a8562a5f35e098ff9dd351921a7..659d1a1a433bfc2fe3ebe981114a725125cc8d6f 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -16,7 +16,7 @@ $Id$
 <h1><%:olsr_links%></h1>
 <p><%:olsr_links1%></p>
 <br />
-<table cellspacing="0" cellpadding="6">
+<table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
 <th><%:destination%></th>
 <th><%:local%></th>
@@ -30,7 +30,7 @@ $Id$
        end
        local color = "#bb3333"
        
-       link.ETX = tonumber(link.ETX)
+       link.ETX = tonumber(link.ETX) or 0
        if link.ETX == 0 then
                color = "#bb3333"
        elseif link.ETX < 4 then
@@ -46,7 +46,7 @@ $Id$
 <td><%=link["Local IP"]%></td>
 <td><%=link.LinkQuality%></td>
 <td><%=link.NLQ%></td>
-<td style="background-color:<%=color%>"><%=link.ETX%></td>
+<td style="background-color:<%=color%>"><%=string.format("%%.3f", link.ETX)%></td>
 </tr>
 <% end %>
 </table>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index 8792f269d530535e5c2e82a2f5e1257a1ea03c90..d82ac924a6167ad532640e34fe36d4d71d8efe6c 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -15,7 +15,7 @@ $Id$
 <%+header%>
 <h1><%:olsr_mid%></h1>
 <br />
-<table cellspacing="0" cellpadding="6">
+<table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
 <th><%:node%></th>
 <th><%:aliases%></th>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index c8785b32cbfed6d6b08365f0289907ff2c9524a4..6f5b61edbe9feaac733b59d25d791842f2f0c3ea 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -15,7 +15,7 @@ $Id$
 <%+header%>
 <h1><%:olsr_routes%></h1>
 <br />
-<table cellspacing="0" cellpadding="6">
+<table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
 <th><%:destination%></th>
 <th><%:gateway%></th>
@@ -42,7 +42,7 @@ $Id$
 <td><%=route.Gateway%></td>
 <td><%=route.Interface%></td>
 <td><%=route.Metric%></td>
-<td style="background-color:<%=color%>"><%=route.ETX%></td>
+<td style="background-color:<%=color%>"><%=string.format("%%.3f", tonumber(route.ETX) or 0)%></td>
 </tr>
 <% end %>
 </table>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index 3e7f7596dd1fafdeb95841b196ab0b37b6c21e3b..bc699b23c05cba8ddb7da7a36a5b909e4a3fd328 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -15,7 +15,7 @@ $Id$
 <%+header%>
 <h1><%:olsr_topology%></h1>
 <br />
-<table cellspacing="0" cellpadding="6">
+<table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
 <th><%:destination%></th>
 <th><%:olsr_lasthop%></th>
@@ -33,7 +33,7 @@ $Id$
 <td><a href="http://<%=route["Last hop IP"]%>"><%=route["Last hop IP"]%></a></td>
 <td><%=route.LQ%></td>
 <td><%=route.ILQ%></td>
-<td><%=route.ETX%></td>
+<td><%=string.format("%%.3f", tonumber(route.ETX) or 0)%></td>
 </tr>
 <% end %>
 </table>

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 89b4f6ac01abad79c1870fe0e6fa85c1318ca47a..f0cd1e0c9ad03d5fe295a391f45c02b50b37378e 100644 (file)
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -247,11 +247,19 @@ table.smalltext {
        border-right: 1px solid #666666;
        border-bottom: 1px solid #666666;
        font-size: 90%;
+       width: 80%;
+       margin-left: auto;
+       margin-right: auto;
+}
+
+table.smalltext tr:hover td {
+       background-color: #bbddee;
 }
 
 table.smalltext tr th {
        padding: 0 0.25em;
        border-left: 1px solid #666666;
+       text-align: left;
 }
 
 table.smalltext tr td {