Changeset 306 for trunk

Timestamp:

04/16/07 17:56:08 (16 years ago)

Author:

bastiaans

Message:

web/templates/job_monarch/cluster_extra.tpl:

• removed text: is now incorporated in cluster image

web/addons/job_monarch/libtoga.php:

• added: joblist text

Location:

trunk/web

Files:

• addons/job_monarch/libtoga.php (modified) (2 diffs)
• templates/job_monarch/cluster_extra.tpl (modified) (1 diff)

trunk/web/addons/job_monarch/libtoga.php

@@ -1042 +1042 @@
                 }
 
-                //printf( "imagecreate: %dx%d", ($nodes_per_row*$node_width), ($node_rows*$node_width) );
-                //$image = imageCreateTrueColor( ($nodes_per_row*$node_width)+1, ($node_rows*$node_width)+1 );
-                $image = imageCreateTrueColor( $max_width, ($node_rows*$node_width)+1 );
+                $y_offset       = 0;
+                $font           = 2;
+                $fontheight     = ImageFontHeight( $font );
+                $fontspaceing   = 2;
+                $y_offset       = $fontheight + (2 * $fontspaceing);
+
+                $image = imageCreateTrueColor( $max_width, ($y_offset + (($node_rows*$node_width)+1) ) );
                 $colorwhite = imageColorAllocate( $image, 255, 255, 255 );
                 imageFill( $image, 0, 0, $colorwhite );
+
+                if( $this->isSmall() ) {
+
+                        $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
+
+                        imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
+                }
 
                 $jobs = $mydatag->getJobs();
@@ -1059 +1070 @@
                         
                                 $x = ($m * $node_width);
-                                $y = ($n * $node_width);
+                                $y = $y_offset + ($n * $node_width);
 
                                 $cur_node = ($n * $nodes_per_row) + ($m);
                                 $host = $nodes_hosts[$cur_node];
-
 
                                 if( isset( $nodes[$host] ) ) {

trunk/web/templates/job_monarch/cluster_extra.tpl

@@ -1 @@
-<hr>
-<table>
-<tr>
- <td valign=center>
-  <a href="./addons/job_monarch/?c={cluster}"><b>Joblist</b></a>
- </td>
-</tr>
-<tr>
- <td>
-  <a href="./addons/job_monarch/?c={cluster}">
-  <IMG SRC="./addons/job_monarch/image.php?c={cluster}&view=small-clusterimage" BORDER=0>
-  </a>
- </td>
-</tr>
-</table>
+<HR>
+<A HREF="./addons/job_monarch/?c={cluster}">
+<IMG SRC="./addons/job_monarch/image.php?c={cluster}&view=small-clusterimage" BORDER=0>
+</A>