From a459ba283aa0edaa2edf3fd0e99491ab52e2c554 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Mon, 25 Apr 2011 00:48:02 +0100
Subject: [PATCH] Updated status information on home page

---
 webui/source/pages/home.php     |  8 +++++---
 webui/source/templates/home.tpl | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/webui/source/pages/home.php b/webui/source/pages/home.php
index 1977aa7..2d5edd7 100644
--- a/webui/source/pages/home.php
+++ b/webui/source/pages/home.php
@@ -1,10 +1,12 @@
 <?php
 
-    $running_jobs   = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::RUNNING, 5);
-    $completed_jobs = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::COMPLETE, 5);
-    $failed_jobs    = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::FAILED, 5);
+    $running_jobs   = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::RUNNING, 10);
+    $queued_jobs    = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::QUEUED, 10);
+    $completed_jobs = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::COMPLETE, 10);
+    $failed_jobs    = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::FAILED, 10);
 
     $this->smarty->assign('running_jobs', $running_jobs);
+    $this->smarty->assign('queued_jobs', $queued_jobs);
     $this->smarty->assign('completed_jobs', $completed_jobs);
     $this->smarty->assign('failed_jobs', $failed_jobs);
 
diff --git a/webui/source/templates/home.tpl b/webui/source/templates/home.tpl
index f9c1417..c7289c5 100644
--- a/webui/source/templates/home.tpl
+++ b/webui/source/templates/home.tpl
@@ -4,7 +4,17 @@
 
 {if $running_jobs}
         {foreach from=$running_jobs item=job}
-            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">Job {$job->id()}</a></li>
+            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">{$job->name()} ({$job->currentStatus()->ripProgress()}%)</a></li>
+        {/foreach}
+{else}
+    <em>There are no currently running jobs.</em>
+{/if}
+
+<h3>Queued Jobs</h3>
+
+{if $queued_jobs}
+        {foreach from=$queued_jobs item=job}
+            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">{$job->name()}</a></li>
         {/foreach}
 {else}
     <em>There are no currently running jobs.</em>
@@ -15,7 +25,7 @@
 {if $completed_jobs}
     <ul>
         {foreach from=$completed_jobs item=job}
-            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">Job {$job->id()}</a></li>
+            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">{$job->name()}</a></li>
         {/foreach}
     </ul>
 {else}
@@ -27,7 +37,7 @@
 {if $failed_jobs}
     <ul>
         {foreach from=$failed_jobs item=job}
-            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">Job {$job->id()}</a></li>
+            <li><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">{$job->name()}</a></li>
         {/foreach}
     </ul>
 {else}