Changeset 547 for trunk


Ignore:
Timestamp:
07/13/08 15:01:20 (15 years ago)
Author:
ramonb
Message:

job_monarch/overview.php:

  • set clusterimage height and width for Ext Window

job_monarch/libtoga.php:

  • added onclick call to node image map

job_monarch/js/jobgrid.js:

  • added seperate Window for ClusterImage?
  • added placeholder function for host selection in clusterimage
  • position window better

job_monarch/templates/overview.tpl:

job_monarch/templates/header.tpl:

Location:
trunk/web2/addons/job_monarch
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/web2/addons/job_monarch/js/jobgrid.js

    r546 r547  
    88
    99var filterfields = [ "jid", "queue", "name", "owner" ];
     10
     11function ClusterImageSelectHost( somehost )
     12{
     13 // reload clusterimage with somehost as arg
     14}
    1015
    1116function isset( somevar )
    … …  
    276281      loadMask: true,
    277282      selModel: new Ext.grid.RowSelectionModel({singleSelect:false}),
     283      stripeRows: true,
    278284      bbar: new Ext.PagingToolbar({
    279285                pageSize: 30,
    … …  
    291297    });
    292298
     299  ClusterImageWindow = new Ext.Window({
     300      id: 'ClusterImageWindow',
     301      title: 'Cluster Nodes Overview',
     302      closable:true,
     303      collapsible: true,
     304      animCollapse: true,
     305      width:100,
     306      height:100,
     307      y: 50,
     308      plain:true,
     309      shadow: true,
     310      resizable: false,
     311      shadowOffset: 10,
     312      layout: 'fit'
     313    });
     314
    293315  JobListingWindow = new Ext.Window({
    294316      id: 'JobListingWindow',
    … …  
    298320      animCollapse: true,
    299321      maximizable: true,
     322      y: 400,
    300323      width:900,
    301324      height:500,

  • trunk/web2/addons/job_monarch/libtoga.php

    r534 r547  
    11461146
    11471147                $area_tooltip           = $this->hostname;
     1148                $area_onclick           = "return ClusterImageSelectHost( \"" . $this->hostname . "\" )";
    11481149
    11491150                if( $this->down)
    … …  
    11581159                $area_tooltip           = $area_tooltip . ": " . implode( " ", $this->jobs );
    11591160
     1161                $tag_onclick            = "ONCLICK=\"" . $area_onclick . "\"";
    11601162                $tag_href               = "HREF=\"" . $area_href . "\"";
    11611163                $tag_coords             = "COORDS=\"" . $area_coords . "\"";
    … …  
    11631165                $tag_tooltip2           = "TITLE=\"" . $area_tooltip . "\"";
    11641166
    1165                 return ("<AREA SHAPE=\"RECT\" " . $tag_coords . " " . $tag_href . " " . $tag_tooltip1 . " " . $tag_tooltip2 . ">");
     1167                return ("<AREA SHAPE=\"RECT\" " . $tag_coords . " " . $tag_onclick . " " . $tag_href . " " . $tag_tooltip1 . " " . $tag_tooltip2 . ">");
    11661168        }
    11671169

  • trunk/web2/addons/job_monarch/overview.php

    r534 r547  
    7878        $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
    7979
    80         //$tpl->assign( "clusterimage_width", $ic->getWidth() );
    81         //$tpl->assign( "clusterimage_height", $ic->getHeight() );
     80        $tpl->assign( "clusterimage_width", $ic->getWidth() );
     81        $tpl->assign( "clusterimage_height", $ic->getHeight() );
    8282
    8383        $tpl->newBlock( "node_clustermap" );

  • trunk/web2/addons/job_monarch/templates/header.tpl

    r546 r547  
    2323        params = newparams;
    2424    });
     25  ClusterImageWindow.html = '<IMG SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
     26  ClusterImageWindow.height = '{clusterimage_height}';
     27  ClusterImageWindow.width = '{clusterimage_width}';
     28  ClusterImageWindow.show();
    2529  JobsDataStore.load( {params: {start: 0, limit: 30}} );
    2630  JobListingWindow.setTitle( "{cluster} Jobs Overview" );
    … …  
    3236<BODY BGCOLOR="#FFFFFF">
    3337
     38    <MAP NAME="MONARCH_CLUSTER_BIG">
     39    <!-- START BLOCK : node_clustermap -->
     40    {node_area_map}
     41    <!-- END BLOCK : node_clustermap -->
     42    </MAP>
     43
    3444  <A HREF="https://subtrac.sara.nl/oss/jobmonarch/">
    3545  <IMG SRC="./jobmonarch.gif" ALT="Job Monarch" BORDER="0"></IMG>

  • trunk/web2/addons/job_monarch/templates/overview.tpl

    r532 r547  
    131131
    132132  <TD ALIGN="CENTER"><CENTER>
    133 <!-- INCLUDESCRIPT BLOCK : ci_script -->
    134     <IMG SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">
    135     <MAP NAME="MONARCH_CLUSTER_BIG">
    136 <!-- START BLOCK : node_clustermap -->
    137 {node_area_map}
    138 <!-- END BLOCK : node_clustermap -->
    139     </MAP>
    140133    <BR>
    141134<FONT class="footer">Last updated: {report_time}</FONT></CENTER>
Note: See TracChangeset for help on using the changeset viewer.