[Midnightbsd-cvs] mports: www/tmpls: colorize the depends link based on their status.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Sat Mar 22 01:32:06 EDT 2008


Log Message:
-----------
colorize the depends link based on their status.

Modified Files:
--------------
    mports/Tools/magus/www/data/magus:
        index.cgi (r1.12 -> r1.13)
    mports/Tools/magus/www/data/magus/elements:
        magus.css (r1.17 -> r1.18)
    mports/Tools/magus/www/tmpls:
        port.tmpl (r1.7 -> r1.8)

-------------- next part --------------
Index: index.cgi
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/index.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -L Tools/magus/www/data/magus/index.cgi -L Tools/magus/www/data/magus/index.cgi -u -r1.12 -r1.13
--- Tools/magus/www/data/magus/index.cgi
+++ Tools/magus/www/data/magus/index.cgi
@@ -172,8 +172,9 @@
   }
     
   my @depends = map { {
-    port => $_->name,
-    id   => $_->id
+    port   => $_->name,
+    id     => $_->id,
+    status => $_->status,
   } } $port->depends;
 
   if (@depends) {
@@ -181,8 +182,9 @@
   }
   
   my @depends_of = map { {
-    port => $_->name,
-    id   => $_->id
+    port   => $_->name,
+    id     => $_->id,
+    status => $_->status,
   } } map { Magus::Port->retrieve($_->port) } Magus::Depend->search(dependency => $port);
   
   if ($port->log) {
@@ -231,6 +233,7 @@
   my ($p) = @_;
   
   my $query = $p->param('q');
+  my $origq = $query;
   my %where;
   while ($query =~ s/(\S+):(\S+)//) {
     push(@{$where{$1}}, $2)
@@ -269,7 +272,7 @@
 
   my $tmpl = template($p, 'list.tmpl');
 
-  $tmpl->param(results => \@results, title => "Search Results for "$query"", count => scalar @results);
+  $tmpl->param(results => \@results, title => "Search Results for "$origq"", count => scalar @results);
   
   print $p->header, $tmpl->output;
 }
Index: magus.css
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/elements/magus.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -L Tools/magus/www/data/magus/elements/magus.css -L Tools/magus/www/data/magus/elements/magus.css -u -r1.17 -r1.18
--- Tools/magus/www/data/magus/elements/magus.css
+++ Tools/magus/www/data/magus/elements/magus.css
@@ -40,7 +40,7 @@
 }
 
 a {
-	color: #405491;
+	color: #204a87;
 }
 
 table {
@@ -68,7 +68,7 @@
 }
 
 tr.even {
-	background: #eaeaea;
+	background: #eaeae9;
 }
 
 tr.details {
@@ -76,24 +76,32 @@
 }
 
 
-*.fail {
-	color: #C0000B;
+.fail {
+	color: #a40000;
 }
 
-*.warn {
-	color: orange;
+.warn {
+	color: #c4a000;
 }
 
-*.internal {
+.internal {
 	color: blue;
 }
 
-*.pass {
-	color: green;
+.pass {
+	color: #4e9a06;
 }
 
-*.skip {
-	color: #666;
+.skip {
+	color: #555753;
+}
+
+.untested {
+	color: #75507b;
+}
+
+.info {
+	color: #2e3436;
 }
 
 .stats {
@@ -143,7 +151,7 @@
 }
 
 #tophead {
-	background: #405491;
+	background: #204a87;
 	color: white;
 	// width: 100%;
 	margin: 0;
Index: port.tmpl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/tmpls/port.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -L Tools/magus/www/tmpls/port.tmpl -L Tools/magus/www/tmpls/port.tmpl -u -r1.7 -r1.8
--- Tools/magus/www/tmpls/port.tmpl
+++ Tools/magus/www/tmpls/port.tmpl
@@ -10,7 +10,7 @@
 <TMPL_IF NAME="depends">
 <ul class="depends">
     <TMPL_LOOP NAME="depends">
-	<li><a href="<TMPL_VAR NAME=port_root>/<TMPL_VAR NAME=id>"><TMPL_VAR NAME="port"></a></li>
+	<li><a class="<TMPL_VAR NAME="status">" href="<TMPL_VAR NAME=port_root>/<TMPL_VAR NAME=id>"><TMPL_VAR NAME="port"></a></li>
     </TMPL_LOOP>
 </ul>
 <TMPL_ELSE>
@@ -22,7 +22,7 @@
 <TMPL_IF NAME="depends_of">
 <ul class="depends">
     <TMPL_LOOP NAME="depends_of">
-	<li><a href="<TMPL_VAR NAME=port_root>/<TMPL_VAR NAME=id>"><TMPL_VAR NAME="port"></a></li>
+	<li><a class="<TMPL_VAR NAME="status">" href="<TMPL_VAR NAME=port_root>/<TMPL_VAR NAME=id>"><TMPL_VAR NAME="port"></a></li>
     </TMPL_LOOP>
 </ul>
 <TMPL_ELSE>


More information about the Midnightbsd-cvs mailing list