[Midnightbsd-cvs] mports: data/magus: sync with our current working version.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Mon Nov 5 18:40:58 EST 2007


Log Message:
-----------
sync with our current working version.

Modified Files:
--------------
    mports/Tools/magus/www/data/magus:
        index.cgi (r1.3 -> r1.4)
    mports/Tools/magus/www/data/magus/elements:
        magus.css (r1.12 -> r1.13)
        magus.js (r1.1 -> r1.2)

-------------- next part --------------
Index: index.cgi
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/index.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -L Tools/magus/www/data/magus/index.cgi -L Tools/magus/www/data/magus/index.cgi -u -r1.3 -r1.4
--- Tools/magus/www/data/magus/index.cgi
+++ Tools/magus/www/data/magus/index.cgi
@@ -91,7 +91,7 @@
     arch    => $_->arch,
     summary => $_->summary,
     has_details => ($_->summary eq 'pass') ? 0 : 1,
-  }} $port->results;
+  }} sort { $b->id <=> $a->id } $port->results;
   
   if (@results) {
     $tmpl->param(
@@ -148,6 +148,8 @@
 sub list_page {
   my ($p, $summary) = @_;
   
+  Magus::Result->set_sql(current_results => "SELECT results.* FROM results JOIN ports ON results.port=ports.name AND results.version=ports.version WHERE summary=? ORDER BY id DESC");  
+
   my @results = map {{
     summary => $_->summary,
     port    => $_->port,
@@ -156,7 +158,7 @@
     arch    => $_->arch, 
     id      => $_->id,
     has_details => ($_->summary eq 'pass') ? 0 : 1,
-  }} sort { $b->id <=> $a->id } Magus::Result->search(summary => $summary);
+  }} Magus::Result->search_current_results($summary);
   
   my $tmpl = template($p, 'list.tmpl');
   
Index: magus.js
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/elements/magus.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Tools/magus/www/data/magus/elements/magus.js -L Tools/magus/www/data/magus/elements/magus.js -u -r1.1 -r1.2
--- Tools/magus/www/data/magus/elements/magus.js
+++ Tools/magus/www/data/magus/elements/magus.js
@@ -1,12 +1,17 @@
+var loader = new Image(220, 19);
+loader.src = '/magus/elements/ajax-loader.gif';
+
 function details_link(id) {
 	var row = document.getElementById("result_" + id + "_row");
 	var div = document.getElementById("result_" + id + "_details");
 
 	if (!row.style.display || row.style.display == 'none') {
+		row.style.display = 'table-row';
 		if (!div.innerHTML) {
+			var td = document.getElementById("result_" + id + "_details");
+			td.innerHTML = '<p style="text-align: center"><img src="' + loader.src + '" /></p>';
 			sendAsycQuery(id);
 		} else {
-			row.style.display = 'table-row';
 			twiddle_link(id, 'hide');
 		}
 	} else {
@@ -50,7 +55,6 @@
         if (req.status == 200) {
             var result = eval( "(" + req.responseText + ")" );
 
-	    var row = document.getElementById("result_" + result.id + "_row");
             var td = document.getElementById("result_" + result.id + "_details");
 
 	    var html = '';
Index: magus.css
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/elements/magus.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -L Tools/magus/www/data/magus/elements/magus.css -L Tools/magus/www/data/magus/elements/magus.css -u -r1.12 -r1.13
--- Tools/magus/www/data/magus/elements/magus.css
+++ Tools/magus/www/data/magus/elements/magus.css
@@ -50,9 +50,10 @@
 	background: transparent;
 }
 
-table tr:hover {
-	background: #FCFCFF;
-}
+/* table tr:hover {
+	background: #D0D0DF;
+}*/
+
 
 table th {
 	border-bottom: solid 1px #888;
@@ -120,6 +121,9 @@
 }
 
 pre.log {
+	border: solid 1px #ddd;
+	margin: 4px;
+	padding: 4px;
 	overflow: auto;
 }
 


More information about the Midnightbsd-cvs mailing list