Changeset 410

Timestamp:

07/06/07 14:20:56 (16 years ago)

Author:

bastiaans

Message:

job_monarch/search.php,
job_monarch/index.php:

• fixes to search page header

Location:

trunk/web/addons/job_monarch

Files:

• index.php (modified) (1 diff)
• search.php (modified) (1 diff)

trunk/web/addons/job_monarch/index.php

@@ -340 +340 @@
         //$ex_fn = $tpl->getVarValue( "_ROOT", "form_name" );
 
-        $context_ranges[]="hour";
-        $context_ranges[]="day";
-        $context_ranges[]="week";
-        $context_ranges[]="month";
-        $context_ranges[]="year";
-        $context_ranges[]="job";
-
-        $range_menu = "<B>Last</B>&nbsp;&nbsp;" ."<SELECT NAME=\"r\" OnChange=\"toga_form.submit();\">\n";
-        foreach ($context_ranges as $v) {
-                $url=rawurlencode($v);
-                $range_menu .= "<OPTION VALUE=\"$url\" ";
-                if ($v == $range)
-                        $range_menu .= "SELECTED";
-                $range_menu .= ">$v\n";
-        }
-        $range_menu .= "</SELECT>\n";
-
-        $tpl->assign("range_menu", $range_menu);
+        if( $view != "search" )
+        {
+                $context_ranges[]="hour";
+                $context_ranges[]="day";
+                $context_ranges[]="week";
+                $context_ranges[]="month";
+                $context_ranges[]="year";
+                $context_ranges[]="job";
+
+                $range_menu = "<B>Last</B>&nbsp;&nbsp;" ."<SELECT NAME=\"r\" OnChange=\"toga_form.submit();\">\n";
+                foreach ($context_ranges as $v) {
+                        $url=rawurlencode($v);
+                        $range_menu .= "<OPTION VALUE=\"$url\" ";
+                        if ($v == $range)
+                                $range_menu .= "SELECTED";
+                        $range_menu .= ">$v\n";
+                }
+                $range_menu .= "</SELECT>\n";
+
+                $tpl->assign("range_menu", $range_menu);
+
+        }
 
         if( $view == "search" or $view == "host" ) {

trunk/web/addons/job_monarch/search.php

@@ -260 +260 @@
         //printf("job_start = %s job_stop = %s\n", $job_start, $job_stop );
         //printf("start = %s stop = %s\n", $start, $stop );
+
+        $longtitle = "Batch Archive Search :: Powered by Job Monarch!";
+        $title = "Batch Archive Search";
+
+        makeHeader( 'search', $title, $longtitle );
 
         $tpl->assign( "cluster", $clustername );