convert layout to nested tables

[angular-mojolicious.git] / public / app / monitor / printers.html

diff --git a/public/app/monitor/printers.html b/public/app/monitor/printers.html
index 4d2534d..4f6e82c 100644 (file)
--- a/public/app/monitor/printers.html
+++ b/public/app/monitor/printers.html
@@ -74,40 +74,36 @@ pages
 info
 </label>
 
-<ul>
-<li ng:repeat="printer in data">
-<a href="http://{{printer._key}}" target="{{printer._key}}"><tt>{{printer._key}}</tt></a>
-
-{{printer.hostname}}
-
-<tt ng:show="show_pages">{{printer.pages}}</tt>
-
-<span ng:show="show_info">{{printer.info}}</span>
-
-<div class=message ng:show="show_message" ng:repeat="m in printer.message">{{m}}</div>
-
-<ul ng:show="show_consumable">
-<b>Consumable</b>
-<li ng:repeat="c in printer.consumable">
-{{c.name}}
-<tt ng:class="'p'+((c.curr * 10 + 0.0001)/ c.max).toFixed(0)">
-{{ ((c.curr * 100 + 0.0001)/ c.max).toFixed(1) }}%
-</tt>
-</li>
-</ul>
-
-<ul ng:show="show_trays">
-<b>Trays</b>
-<li ng:repeat="t in printer.tray">
-{{t.dim_x}}*{{t.dim_y}}
-<tt ng:class="'p'+((t.capacity * 10 + 0.0001)/ t.max).toFixed(0)">
-{{t.capacity}}/{{t.max}}
-</tt>
-</li>
-</ul>
-
-</li>
-</ul>
+<table>
+<tr ng:repeat="printer in data">
+<td><a href="http://{{printer._key}}" target="{{printer._key}}"><tt>{{printer._key}}</tt></a></td>
+<td>{{printer.hostname}}</td>
+
+<td><div class=message ng:show="show_message" ng:repeat="m in printer.message">{{m}}</div></td>
+
+<td ng:show="show_consumable">
+       <table>
+       <tr ng:repeat="c in printer.consumable">
+       <td align="right" ng:class="'p'+((c.curr * 10 + 0.0001)/ c.max).toFixed(0)">{{ ((c.curr * 100 + 0.0001)/ c.max).toFixed(1) }}%</td>
+       <td>{{c.name}}</td>
+       </tr>
+       </table>
+</td>
+
+<td ng:show="show_trays">
+       <table>
+       <tr ng:repeat="t in printer.tray">
+       <td align="right" ng:class="'p'+((t.capacity * 10 + 0.0001)/ t.max).toFixed(0)">{{t.capacity}}/{{t.max}}</td>
+       <td>{{t.dim_x}}*{{t.dim_y}}</td>
+       </tr>
+       </table>
+</td>
+
+<td ng:show="show_pages">{{printer.pages}}</td>
+
+<td ng:show="show_info">{{printer.info}}</td>
+
+</table>
 
 <input name=debug type=checkbox>
 <pre ng:show="debug">