diff options
| author | franck cuny <franck@lumberjaph.net> | 2011-02-13 14:15:23 +0100 |
|---|---|---|
| committer | franck cuny <franck@lumberjaph.net> | 2011-02-13 14:15:23 +0100 |
| commit | 412587ddac4ba483d06bef9a8a89c07b4d3cf44b (patch) | |
| tree | 3b58b44657d4e3c2817228a7984f2436e90f1244 /views | |
| parent | Merge branch 'refactor_builder' (diff) | |
| parent | update templates to show informations about running tasks (diff) | |
| download | jitterbug-412587ddac4ba483d06bef9a8a89c07b4d3cf44b.tar.gz | |
resolve merge conflict
Diffstat (limited to 'views')
| -rw-r--r-- | views/index.tt | 17 | ||||
| -rw-r--r-- | views/task/index.tt | 7 |
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> |