[Midnightbsd-cvs] mports: www/tmpls: Sync with currently deplayed version: now with

ctriv at midnightbsd.org ctriv at midnightbsd.org
Wed Nov 7 16:45:43 EST 2007


Log Message:
-----------
Sync with currently deplayed version: now with searching!

Modified Files:
--------------
    mports/Tools/magus/www/data/magus:
        index.cgi (r1.4 -> r1.5)
    mports/Tools/magus/www/data/magus/elements:
        magus.css (r1.13 -> r1.14)
    mports/Tools/magus/www/tmpls:
        header.tmpl (r1.6 -> r1.7)
        index.tmpl (r1.6 -> r1.7)

-------------- next part --------------
Index: index.cgi
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/index.cgi,v
retrieving revision 1.4
retrieving revision 1.5
diff -L Tools/magus/www/data/magus/index.cgi -L Tools/magus/www/data/magus/index.cgi -u -r1.4 -r1.5
--- Tools/magus/www/data/magus/index.cgi
+++ Tools/magus/www/data/magus/index.cgi
@@ -28,6 +28,8 @@
     port_page($p, $1);
   } elsif ($path =~ m:/results/async/(\d+):) {
     result_details_async($p, $1);
+  } elsif ($path =~ m:/search:) {
+    return search($p);
   } else {
     die "Unknown path: $path\n";
   }
@@ -130,7 +132,7 @@
 	type  => $_->type,
 	name  => $_->name,
 	msg   => $_->msg,
-  }} $result->subresults;
+  } } $result->subresults;
 
   if (@subresults) {
     $details{subresults} = \@subresults;
@@ -141,7 +143,7 @@
   if ($log) {
     $details{log} = $log->data;
   }
-#  use Data::Dumper
+
   print $p->header(-type => 'text/plain'), to_json(\%details);
 }
 
@@ -174,6 +176,37 @@
 
   print $p->header, $tmpl->output;
 }
+
+
+sub search {
+  my ($p) = @_;
+  
+  my $query = $p->param('q');
+  
+  my @ports = Magus::Port->retrieve_from_sql("name LIKE ?", "%$query%");
+  
+  if (@ports == 1) {
+    print $p->redirect("http://cs.emich.edu/magus/index.cgi/ports/$ports[0]");
+    return;
+  } 
+  
+  my @results = map {{
+    summary => $_->summary,
+    port    => $_->port,
+    version => $_->version,
+    machine => $_->machine->name,
+    arch    => $_->arch,
+    id      => $_->id,
+    has_details => ($_->summary eq 'pass') ? 0 : 1,
+  }} map { $_->current_result } @ports;
+
+  my $tmpl = template($p, 'list.tmpl');
+
+  $tmpl->param(results => \@results, title => "Search Results for "$query"", count => scalar @results);
+  
+  print $p->header, $tmpl->output;
+}
+
   
 
 sub error {
@@ -214,8 +247,12 @@
   $sth->execute;
   my ($untested) = $sth->fetchrow_array;
   $sth->finish;
+
+  my $query = $p->param('q');
+  $query ||= '';
   
   $tmpl->param(
+    query     => $query,
     ports_tested => $count,
     ports_untested => $untested,
     stats     => $stats,
Index: magus.css
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/data/magus/elements/magus.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -L Tools/magus/www/data/magus/elements/magus.css -L Tools/magus/www/data/magus/elements/magus.css -u -r1.13 -r1.14
--- Tools/magus/www/data/magus/elements/magus.css
+++ Tools/magus/www/data/magus/elements/magus.css
@@ -13,7 +13,7 @@
 
 h1 {
 	letter-spacing: .1em;
-	font-size: 2em;
+	font-size: 2.7em;
 	font-family: Verdana, Helvetica, Arial, sans-serif;
 	margin: 0;
 }
@@ -142,7 +142,13 @@
 	color: white;
 	// width: 100%;
 	margin: 0;
-	padding: 4px;
+	padding: 4px 4px 8px;	
+}
+
+#topsearch {
+	position: absolute;
+	top: 24px;
+	right: 16px;
 }	
 
 ul.stats {
Index: index.tmpl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/tmpls/index.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -L Tools/magus/www/tmpls/index.tmpl -L Tools/magus/www/tmpls/index.tmpl -u -r1.6 -r1.7
--- Tools/magus/www/tmpls/index.tmpl
+++ Tools/magus/www/tmpls/index.tmpl
@@ -1,8 +1,6 @@
 <TMPL_INCLUDE NAME="header.tmpl">
 
-<h1>Summary</h1>
-
-<div class="right">
+<div class="right" style="width: 35%">
 <TMPL_IF NAME="locks">
 <h3>Currently Building</h3>
 <table class="locks">
@@ -28,7 +26,7 @@
 
 </div>
 
-<div class="left">
+<div class="left" style="width: 60%">
 
 <h3>Latest Results</h3>
 <table class="result-list">
Index: header.tmpl
===================================================================
RCS file: /home/cvs/mports/Tools/magus/www/tmpls/header.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -L Tools/magus/www/tmpls/header.tmpl -L Tools/magus/www/tmpls/header.tmpl -u -r1.6 -r1.7
--- Tools/magus/www/tmpls/header.tmpl
+++ Tools/magus/www/tmpls/header.tmpl
@@ -20,6 +20,11 @@
 </TMPL_LOOP>
 </ul>
 
+<form id="topsearch" action="<TMPL_VAR NAME=root>/search" method="get">
+<input type="text" name="q" value="<TMPL_VAR NAME=query>">
+<input type="submit">
+</form>
+
 </div>
 <!-- header: end -->
 


More information about the Midnightbsd-cvs mailing list