Ignore:
Timestamp:
04/08/13 22:15:47 (11 years ago)
Author:
ramonb
Message:

index.php:

  • dont show metric menu for search anymore
  • preparation for meta view

search.php,
templates/search.tpl:

  • set metric menu next to period selection now
  • populate metric menu from archive, since we no longer parse XML in search
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.4/web/addons/job_monarch/index.php

    r794 r811  
    6161$filter = array();
    6262
    63 if( !isset($view) ) $view = "overview";
     63if( !isset($view) && $clustername!='') $view = "overview";
    6464if( !isset($sortorder) ) $sortorder = "desc";
    6565if( !isset($sortby) ) $sortby = "id";
     
    238238    }
    239239
    240     if (!count($metrics) && $view!='search' && $view!='host')
     240    if (!count($metrics) && $view!='' && $view!='search' && $view!='host')
    241241    {
    242242        echo "<h4>Cannot find any metrics for selected cluster \"$clustername\", exiting.</h4>\n";
     
    322322        #$range = "job";
    323323
    324         if( $page_call != "host_view" )
     324        if( ( $page_call != "host_view" ) && ( $page_call != "search" ) )
    325325        {
    326326
     
    505505    default:
    506506
    507         include "./overview.php";
    508         makeOverview();
     507        include "./meta_view.php";
     508        makeMetaview();
    509509        break;
    510510}
Note: See TracChangeset for help on using the changeset viewer.