Changeset 555 for trunk/web2/addons

Timestamp:

07/16/08 16:15:15 (15 years ago)

Author:

ramonb

Message:

job_monarch/js/jobgrid.js:

• some tricks to get ClusterImageWindow? the correct size

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:

• image.php (modified) (1 diff)
• index.php (modified) (1 diff)
• js/jobgrid.js (modified) (4 diffs)
• templates/header.tpl (modified) (1 diff)

trunk/web2/addons/job_monarch/image.php

@@ -22 +22 @@
  * SVN $Id: image.php 329 2007-04-22 13:36:26Z bastiaans $
  */
+
+ini_set("memory_limit","200M");
+set_time_limit(0);
 
 include_once "./libtoga.php";

trunk/web2/addons/job_monarch/index.php

@@ -23 +23 @@
  */
 
-ini_set("memory_limit","100M");
+ini_set("memory_limit","200M");
 set_time_limit(0);
 

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

@@ -173 +173 @@
   newClusterImage.loadEvent = function( url, image ) 
     {
+      resizeClusterImage();
       ClusterImageWindow.getBottomToolbar().clearStatus( { useDefaults:true } );
     }
@@ -180 +181 @@
 }
 
+function getCiWindowWidth()
+{
+  return (document.getElementById( "clusterimage" ).width + ClusterImageWindow.getFrameWidth());
+}
+function getCiWindowHeight()
+{
+  return (document.getElementById( "clusterimage" ).height + ClusterImageWindow.getFrameHeight());
+}
+
+function resizeClusterImage()
+{
+  var ci_height = getCiWindowHeight();
+  var ci_width = getCiWindowWidth();
+
+  ClusterImageWindow.setSize( ci_width, ci_height );
+}
+
 function initJobGrid() {
 
   Ext.QuickTips.init();
+
+  function clusterImageResize( window, width, heigth )
+  {
+    var ci_height = getCiWindowHeight();
+    var ci_width = getCiWindowWidth();
+
+    if( ci_height != heigth || ci_width != width )
+    {
+      resizeClusterImage();
+    }
+  }
 
   function jobCellClick(grid, rowIndex, columnIndex, e)
@@ -401 +430 @@
       collapsible: true,
       animCollapse: true,
-      width: 100,
-      height: 100,
+      width: 1,
+      height: 1,
       y: 15,
       plain: true,
       shadow: true,
-      resizable: false,
+      //resizable: false,
+      resizable: true,
       shadowOffset: 10,
       layout: 'fit',
@@ -474 +504 @@
 
   JobListingEditorGrid.addListener( 'cellclick', jobCellClick );
-}
+  ClusterImageWindow.addListener( 'resize', clusterImageResize );
+}

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

@@ -29 +29 @@
 
   ClusterImageWindow.html = '<IMG ID="clusterimage" SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
-  ClusterImageWindow.height = '{clusterimage_height}';
-  ClusterImageWindow.width = '{clusterimage_width}';
-  ClusterImageWindow.x = (window.innerWidth - ClusterImageWindow.width - 25);
   ClusterImageWindow.show();
   reloadClusterImage();
 
   JobListingWindow.setTitle( "{cluster} Jobs Overview" );
-  JobListingWindow.y = ({clusterimage_height} + 150);
+  JobListingWindow.y = (ClusterImageWindow.getSize()['height'] + 150);
   JobListingWindow.show();
   reloadJobStore();