Permalink
Browse files

narcissus: upgrade jquery and fix graph layout

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
1 parent 3df9fb7 commit d2bff697e0ff8fc66b82b06013e3ebcf1694c08c @koenkooi koenkooi committed Feb 8, 2011
Showing with 222 additions and 158 deletions.
  1. +14 −3 graph.php
  2. +1 −1 index.html
  3. +0 −154 scripts/js/jquery-1.4.2.min.js
  4. +167 −0 scripts/js/jquery-1.4.4.min.js
  5. +40 −0 scripts/js/jquery.isotope.min.js
View
@@ -4,6 +4,8 @@
<meta http-equiv="refresh" content="600">
+<script language="javascript" type="text/javascript" src="scripts/js/jquery-1.4.4.min.js"></script>
+<script language="javascript" type="text/javascript" src="scripts/js/jquery.isotope.min.js"></script>
<script language="javascript" type="text/javascript" src="scripts/js/MochiKit.js"></script>
<script language="javascript" type="text/javascript" src="scripts/js/plotkit/Base.js"></script>
<script language="javascript" type="text/javascript" src="scripts/js/plotkit/Layout.js"></script>
@@ -138,22 +140,31 @@ function drawGraph() {
?>
}
MochiKit.DOM.addLoadEvent(drawGraph);
+
</script>
</head>
<body>
Statistics for the online image builder, number of builds per day<br>
<br>
+<div id="container">
<?
if(!isset($selectedmachine)) {
foreach ($builds as $machine => $foo) {
- print("<table align=left><td><br>$machine<br><div id='div-$machine'><canvas id='graph-$machine'></canvas></div></td></table>\n");
+ print("<div class='item'><table align=left><td><br>$machine<br><div id='div-$machine'><canvas id='graph-$machine'></canvas></div></td></table></div>\n");
}
} else {
- print("<table align=left><td><br>$selectedmachine<br><div id='div-$machine'><canvas id='graph-$selectedmachine'></canvas></div></td></table>\n");
+ print("<div class='item'><table align=left><td><br>$selectedmachine<br><div id='div-$machine'><canvas id='graph-$selectedmachine'></canvas></div></td></table></div>\n");
}
?>
-
+</div>
<br clear=all><br>Total builds for all machines: <? print $total; ?>
</body>
+ <script>
+$('#container').isotope({
+ // options
+ itemSelector : '.item',
+ //layoutMode : 'fitRows'
+});
+</script>
</html>
View
@@ -5,7 +5,7 @@
<title>Narcissus - Online image builder for the angstrom distribution</title>
<script language="javascript" type="text/javascript" src="scripts/js/MochiKit.js"></script>
<script language="javascript" type="text/javascript" src="scripts/js/narcissus.js"></script>
-<script language="javascript" type="text/javascript" src="scripts/js/jquery-1.4.2.min.js"></script>
+<script language="javascript" type="text/javascript" src="scripts/js/jquery-1.4.4.min.js"></script>
<script language="javascript" type="text/javascript" src="scripts/js/webtoolkit.md5.js"></script>
</head>
Oops, something went wrong.

0 comments on commit d2bff69

Please sign in to comment.