Index: /trunk/web/addons/job_monarch/overview.php =================================================================== --- /trunk/web/addons/job_monarch/overview.php (revision 239) +++ /trunk/web/addons/job_monarch/overview.php (revision 240) @@ -562,7 +562,38 @@ $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] ) ) ); Index: /trunk/web/addons/job_monarch/styles.css =================================================================== --- /trunk/web/addons/job_monarch/styles.css (revision 239) +++ /trunk/web/addons/job_monarch/styles.css (revision 240) @@ -231,10 +231,8 @@ } -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); } Index: /trunk/web/addons/job_monarch/templates/overview.tpl =================================================================== --- /trunk/web/addons/job_monarch/templates/overview.tpl (revision 239) +++ /trunk/web/addons/job_monarch/templates/overview.tpl (revision 240) @@ -139,12 +139,12 @@
Id | -State | +Id | +S | User | Queue | -Name | +Name | Req. CPU time | Req. Memory | -Nodes/Cpus | +N/P | Started | Runningtime | @@ -154,8 +154,16 @@
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{id} | -{state} | +{state} | {user} | {queue} | -{name} | ++ + + + {name} + + + + | {req_cpu} | {req_memory} |