Changeset 240 for trunk/web/addons/job_monarch/overview.php

Timestamp:

04/07/06 10:30:31 (18 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

File:

• trunk/web/addons/job_monarch/overview.php (modified) (1 diff)

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] ) ) );