Changeset 648 for trunk/web/addons/job_monarch/templates

Timestamp:

11/12/09 17:08:03 (14 years ago)

Author:

ramonb

Message:

job_monarch/overview.php,
job_monarch/index.php:

• old code cleanup

job_monarch/index.php,
job_monarch/image.php,
job_monarch/jobstore.php

• rewrote session handling

job_monarch/image.php:

• supply DataGather? object to ClusterImage?

job_monarch/templates/header.tpl:

• add session to clusterimage
• (temp?) disabled pie chart

job_monarch/libtoga.php:

• wrote new SessionHandler? class to handle all sessions
• DataSource? now uses interactive port so can retrieve only relevant XML
• disable XML_OPTION_CASE_FOLDING to speed up xml parsing
• use jobmond poll interval to only reload XML when useful
• use strpos instead of strstr, should be faster xml parsing
• dont parse XML in ClusterImage? anymore, instead supply DataGather? object

job_monarch/conf.php:

• use interactive gmetad port now

File:

• trunk/web/addons/job_monarch/templates/header.tpl (modified) (3 diffs)

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

@@ -47 +47 @@
         GraphSummaryWindow.show();
 
-        ClusterImageWindow.html                 = '<IMG ID="clusterimage" SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
+        ClusterImageWindow.html                 = '<IMG ID="clusterimage" SRC="./image.php?{session_name}={session_id}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
         ClusterImageWindow.show();
         setClusterImagePosition();
@@ -59 +59 @@
 
         Ext.get( 'rjqjgraph' ).update( '<IMG ID="rjqj_graph" SRC="{rjqj_graph}" BORDER=0>' );
-        Ext.get( 'pie' ).update( '<IMG ID="pie" SRC="{pie}" BORDER=0>' );
+        //Ext.get( 'pie' ).update( '<IMG ID="pie" SRC="./image.php?{session_name}={session_id}&c={uue_clustername}&view=big-clusterimage" BORDER=0>' );
 });
 </script>
@@ -73 +73 @@
 
     <MAP NAME="MONARCH_CLUSTER_BIG">
-    <!-- START BLOCK : node_clustermap -->
     {node_area_map}
-    <!-- END BLOCK : node_clustermap -->
     </MAP>