From 79a35fe82515580995416eb44f33c0dbc36d8220 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 16 Jul 2008 02:38:45 +0000
Subject: [PATCH] * luci/themes:	layout changes for smalltext tables in
 openwrt.org theme * luci/olsr:	layout fixes for status pages

---
 applications/luci-olsr/luasrc/view/status-olsr/hna.htm        | 2 +-
 applications/luci-olsr/luasrc/view/status-olsr/index.htm      | 6 +++---
 applications/luci-olsr/luasrc/view/status-olsr/mid.htm        | 2 +-
 applications/luci-olsr/luasrc/view/status-olsr/routes.htm     | 4 ++--
 applications/luci-olsr/luasrc/view/status-olsr/topology.htm   | 4 ++--
 themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css | 8 ++++++++
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index 777fd2dcf..35dec2d8e 100644
--- 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 a38b63a36..659d1a1a4 100644
--- 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 8792f269d..d82ac924a 100644
--- 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 c8785b32c..6f5b61edb 100644
--- 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 3e7f7596d..bc699b23c 100644
--- 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 89b4f6ac0..f0cd1e0c9 100644
--- 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 {
-- 
2.11.0