Changeset 555 for trunk


Ignore:
Timestamp:
07/16/08 16:15:15 (14 years ago)
Author:
ramonb
Message:

job_monarch/js/jobgrid.js:

job_monarch/templates/header.tpl:

  • removed some positioning stuff

job_monarch/index.php,
job_monarch/image.php:

  • more memory limits
Location:
trunk/web2/addons/job_monarch
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/web2/addons/job_monarch/image.php

    r550 r555  
    2222 * SVN $Id: image.php 329 2007-04-22 13:36:26Z bastiaans $
    2323 */
     24
     25ini_set("memory_limit","200M");
     26set_time_limit(0);
    2427
    2528include_once "./libtoga.php";
  • trunk/web2/addons/job_monarch/index.php

    r532 r555  
    2323 */
    2424
    25 ini_set("memory_limit","100M");
     25ini_set("memory_limit","200M");
    2626set_time_limit(0);
    2727
  • trunk/web2/addons/job_monarch/js/jobgrid.js

    r554 r555  
    173173  newClusterImage.loadEvent = function( url, image )
    174174    {
     175      resizeClusterImage();
    175176      ClusterImageWindow.getBottomToolbar().clearStatus( { useDefaults:true } );
    176177    }
     
    180181}
    181182
     183function getCiWindowWidth()
     184{
     185  return (document.getElementById( "clusterimage" ).width + ClusterImageWindow.getFrameWidth());
     186}
     187function getCiWindowHeight()
     188{
     189  return (document.getElementById( "clusterimage" ).height + ClusterImageWindow.getFrameHeight());
     190}
     191
     192function resizeClusterImage()
     193{
     194  var ci_height = getCiWindowHeight();
     195  var ci_width = getCiWindowWidth();
     196
     197  ClusterImageWindow.setSize( ci_width, ci_height );
     198}
     199
    182200function initJobGrid() {
    183201
    184202  Ext.QuickTips.init();
     203
     204  function clusterImageResize( window, width, heigth )
     205  {
     206    var ci_height = getCiWindowHeight();
     207    var ci_width = getCiWindowWidth();
     208
     209    if( ci_height != heigth || ci_width != width )
     210    {
     211      resizeClusterImage();
     212    }
     213  }
    185214
    186215  function jobCellClick(grid, rowIndex, columnIndex, e)
     
    401430      collapsible: true,
    402431      animCollapse: true,
    403       width: 100,
    404       height: 100,
     432      width: 1,
     433      height: 1,
    405434      y: 15,
    406435      plain: true,
    407436      shadow: true,
    408       resizable: false,
     437      //resizable: false,
     438      resizable: true,
    409439      shadowOffset: 10,
    410440      layout: 'fit',
     
    474504
    475505  JobListingEditorGrid.addListener( 'cellclick', jobCellClick );
    476 }
     506  ClusterImageWindow.addListener( 'resize', clusterImageResize );
     507}
  • trunk/web2/addons/job_monarch/templates/header.tpl

    r554 r555  
    2929
    3030  ClusterImageWindow.html = '<IMG ID="clusterimage" SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
    31   ClusterImageWindow.height = '{clusterimage_height}';
    32   ClusterImageWindow.width = '{clusterimage_width}';
    33   ClusterImageWindow.x = (window.innerWidth - ClusterImageWindow.width - 25);
    3431  ClusterImageWindow.show();
    3532  reloadClusterImage();
    3633
    3734  JobListingWindow.setTitle( "{cluster} Jobs Overview" );
    38   JobListingWindow.y = ({clusterimage_height} + 150);
     35  JobListingWindow.y = (ClusterImageWindow.getSize()['height'] + 150);
    3936  JobListingWindow.show();
    4037  reloadJobStore();
Note: See TracChangeset for help on using the changeset viewer.