Changeset 240 for trunk/web/addons

Timestamp:

04/07/06 10:30:31 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/styles.css:

• changed jobname_hint style

web/addons/job_monarch/templates/overview.tpl:

• added jobname_hint blocks
• some columns names altered
• added tooltips in some places

web/addons/job_monarch/overview.php:

• addedd short/full jobname assignment

Location:

trunk/web/addons/job_monarch

Files:

• overview.php (modified) (1 diff)
• styles.css (modified) (1 diff)
• templates/overview.tpl (modified) (2 diffs)

trunk/web/addons/job_monarch/overview.php

@@ -562 +562 @@
                                 $tpl->assign("id", $jobid );
                                 $tpl->assign("state", $jobs[$jobid][status] );
+
+                                $fullstate = '';
+                                if( $jobs[$jobid][status] == 'R' ) {
+                                        $fullstate = "Running";
+                                } else if( $jobs[$jobid][status] == 'Q' ) {
+                                        $fullstate = "Queued";
+                                }
+
+                                $tpl->assign("fullstate", $fullstate );
+                                
                                 $tpl->assign("user", $jobs[$jobid][owner] );
                                 $tpl->assign("queue", $jobs[$jobid][queue] );
-                                $tpl->assign("name", $jobs[$jobid][name] );
+
+                                $fulljobname = $jobs[$jobid][name];
+                                $shortjobname = '';
+
+                                $tpl->assign("fulljobname", $fulljobname );
+
+                                if( mb_strwidth( $fulljobname ) > 10 ) {
+                                        $tpl->newBlock("jobname_hint_start");
+                                        $tpl->gotoBlock("node");
+
+                                        $shortjobname = mb_strimwidth( $fulljobname, 0, 9 ) . '..';
+                                } else {
+                                        $shortjobname = $fulljobname;
+                                }
+                                
+                                $tpl->assign("name", $shortjobname );
+
+                                if( strlen( $fulljobname ) > 10 ) {
+                                        $tpl->newBlock("jobname_hint_end");
+                                        $tpl->gotoBlock("node");
+                                }
+
                                 $domain = $jobs[$jobid][domain];
                                 $tpl->assign("req_cpu", makeTime( timeToEpoch( $jobs[$jobid][requested_time] ) ) );

trunk/web/addons/job_monarch/styles.css

@@ -231 +231 @@
 }
 
-tr.jobname_hint
-{
-   border-collapse: collapse;
-   border-width: medium;
-   border-bottom-style: dotted;
-   border-bottom-color: rgb(0,0,255);
+.jobname_hint
+{
+   border-bottom: thin dotted;
+   border-bottom-color: rgb(255,0,0);
 }
 

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

@@ -139 +139 @@
 <TABLE WIDTH="100%" CELLPADDING="8" CELLSPACING="3" BORDER=0>
 <TR CLASS="monarch">
-<TH><B><A HREF="#" onClick="setSort( 'id' )">Id</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'state' )">State</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'id' )" ALT="Jobid" TITLE="Jobid">Id</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'state' )" ALT="State" TITLE="State">S</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'user' )">User</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'queue' )">Queue</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'name' )">Name</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'name' )" ALT="Jobname" TITLE="Jobname">Name</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'req_cpu' )">Req. CPU time</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'req_mem' )">Req. Memory</A></B></TH>
-<TH><B><A HREF="#" onClick="setSort( 'nodes' )">Nodes</A>/<A HREF="#" onClick="setSort( 'cpus' )">Cpus</A></B></TH>
+<TH><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">N</A>/<A HREF="#" onClick="setSort( 'cpus' )" ALT="Processors" TITLE="Processors">P</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'runningtime' )">Runningtime</A></B></TH>
@@ -154 +154 @@
   <TR CLASS="{nodeclass}">
     <TD><A HREF="#" onClick="setFilter( 'id', '{id}' )">{id}</A></TD>
-    <TD><A HREF="#" onClick="setFilter( 'state', '{state}' )">{state}</A></TD>
+    <TD><A HREF="#" onClick="setFilter( 'state', '{state}' )" ALT="{fullstate}" TITLE="{fullstate}">{state}</A></TD>
     <TD><A HREF="#" onClick="setFilter( 'user', '{user}' )">{user}</A></TD>
     <TD><A HREF="#" onClick="setFilter( 'queue', '{queue}' )">{queue}</A></TD>
-    <TD>{name}</TD>
+    <TD alt="{fulljobname}" title="{fulljobname}">
+<!-- START BLOCK : jobname_hint_start -->
+    <FONT CLASS="jobname_hint">
+<!-- END BLOCK : jobname_hint_start -->
+    {name}
+<!-- START BLOCK : jobname_hint_end -->
+    </FONT>
+<!-- END BLOCK : jobname_hint_end -->
+    </TD>
     <TD>{req_cpu}</TD>
     <TD>{req_memory}</TD>