about summary refs log tree commit diff
path: root/views
diff options
context:
space:
mode:
authorfranck cuny <franck@lumberjaph.net>2011-02-13 16:20:59 +0100
committerfranck cuny <franck@lumberjaph.net>2011-02-13 16:20:59 +0100
commite81938b20ae19d472a6f835f8af01a428b8724de (patch)
treed6cea5e811f60fcd8f3c94ee1d9b4cf247404531 /views
parentMake jitterbug::Test use the current perl interp (diff)
parentMerge branch 'feature/stack_builds' into devel (diff)
downloadjitterbug-e81938b20ae19d472a6f835f8af01a428b8724de.tar.gz
Merge branch 'devel'
* devel:
  add more tests
  inside the hook, we check if we can add more than one task for this project
  add configuration option to skip some branches; add tests for the Hook
  that's why we want datetime
  use DateTime
  update templates to show informations about running tasks
  column started_when: datetime when the build started
  prepare to update schema again
  display current build if any
  add sql schema for various version
  don't ignore .sql files
  script to migrate/upgrade dbix schema
  add version to our schema
  update templates and css
  we want a find, not a search here
  add pending status to the schema (TODO: need a script to migrate the schema)
  load tasks and display them on the dashboard
Diffstat (limited to 'views')
-rw-r--r--views/index.tt17
-rw-r--r--views/task/index.tt7
2 files changed, 19 insertions, 5 deletions
diff --git a/views/index.tt b/views/index.tt
index 6359157..4e7eba2 100644
--- a/views/index.tt
+++ b/views/index.tt
@@ -2,6 +2,17 @@
   <div id="content">
     <h2>Dashboard</h2>
 
+    <div class="builds-running">
+    : if $runnings {
+      <div class="running-build">
+      The following project is building:
+        : for $runnings -> $running {
+          <a href="<: $uri_base :>/task/<: $running.id :>"><: $running.project :></a>
+        : }
+        </div>
+    : }
+    </div>
+    
     <div class="columns">
 
       <div class="first"> 
@@ -26,13 +37,15 @@
       </div>
 
       <div class="last">
-        <h3>Builds pending</h3>
+        <h3>Builds pending (<: $builds.size :>)</h3>
 
+        <div class="comming-builds">
         <ul>
           : for $builds -> $build {
-          <li><a href="<: $uri_base :>task/<: $build :>"><: $build :></a></li>
+          <li><a href="<: $uri_base :>task/<: $build.id :>"><: $build.project :> (id: <: $build.id :>)</a></li>
           : }
         </ul>
+        </div>
       </div>
 
     </div>
diff --git a/views/task/index.tt b/views/task/index.tt
index 1c1f904..25bdeb9 100644
--- a/views/task/index.tt
+++ b/views/task/index.tt
@@ -1,5 +1,6 @@
 <div id="page">
-<div id="content">
-<h2>Task </h2>
-</div>
+     <div id="content">
+     <h2>Task <: $task.id :></h2>
+     started : <: $task.started_when :>
+     </div>
 </div>