From aedddd8afe975b59828ca4e72280edd51a2d4345 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 15 Mar 2013 19:22:24 +0100
Subject: [PATCH] Display only jobs and workers in tabs

---
 assets/scripts/app/controllers/sidebar.coffee    | 3 +++
 assets/scripts/app/templates/jobs/running.hbs    | 2 --
 assets/scripts/app/templates/layouts/sidebar.hbs | 7 ++-----
 assets/scripts/app/templates/workers/list.hbs    | 5 +----
 assets/scripts/app/views/sidebar.coffee          | 5 +++++
 assets/styles/right/lists.sass                   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assets/scripts/app/controllers/sidebar.coffee b/assets/scripts/app/controllers/sidebar.coffee
index 42bfd638..e691cd6f 100644
--- a/assets/scripts/app/controllers/sidebar.coffee
+++ b/assets/scripts/app/controllers/sidebar.coffee
@@ -1,5 +1,8 @@
 Travis.reopen
   SidebarController: Em.ArrayController.extend
+    needs: ['runningJobs']
+    jobsBinding: 'controllers.runningJobs'
+
     init: ->
       @_super.apply this, arguments
       @tickables = []
diff --git a/assets/scripts/app/templates/jobs/running.hbs b/assets/scripts/app/templates/jobs/running.hbs
index 44f4e396..6be98a9a 100644
--- a/assets/scripts/app/templates/jobs/running.hbs
+++ b/assets/scripts/app/templates/jobs/running.hbs
@@ -1,5 +1,3 @@
-<h4>Running Jobs ({{view.jobs.length}})</h4>
-
 <ul class="groups">
   {{#each group in view.groups}}
     {{view view.GroupView groupBinding="group"}}
diff --git a/assets/scripts/app/templates/layouts/sidebar.hbs b/assets/scripts/app/templates/layouts/sidebar.hbs
index 3921f4dd..4b11b8fa 100644
--- a/assets/scripts/app/templates/layouts/sidebar.hbs
+++ b/assets/scripts/app/templates/layouts/sidebar.hbs
@@ -11,11 +11,8 @@
 {{view view.DecksView}}
 
 <ul class="tabs">
-  <li id="tab_queues" {{bindAttr class="view.classQueues"}}>
-    <h5><a href="#" {{action activate "queues" target="view"}}>{{t layouts.application.queues}}</a></h5>
-  </li>
   <li id="tab_jobs" {{bindAttr class="view.classJobs"}}>
-    <h5><a href="#" {{action activate "jobs" target="view"}}>{{t layouts.application.jobs}}</a></h5>
+    <h5><a href="#" {{action activate "jobs" target="view"}}>{{t layouts.application.jobs}} ({{jobs.length}})</a></h5>
   </li>
   <li id="tab_workers" {{bindAttr class="view.classWorkers"}}>
     <h5><a href="#" {{action activate "workers" target="view"}}>{{t layouts.application.workers}}</a></h5>
@@ -25,7 +22,7 @@
 <div class="pane">
   {{outlet pane}}
 </div>
-
+{{view view.QueuesView}}
 {{view view.LinksView}}
 
 <div id="about" class="box">
diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs
index af00a44b..c9b777e6 100644
--- a/assets/scripts/app/templates/workers/list.hbs
+++ b/assets/scripts/app/templates/workers/list.hbs
@@ -1,8 +1,5 @@
 {{#view Travis.WorkersView}}
-  <h4>
-    {{t workers}}
-    <a id="toggle-workers" {{action toggleWorkers target="view"}}></a>
-  </h4>
+  <a id="toggle-workers" {{action toggleWorkers target="view"}}></a>
   <ul id="workers">
     {{#each group in controller.groups}}
       {{#view Travis.WorkersListView}}
diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee
index 47bbdd7b..b9401d5b 100644
--- a/assets/scripts/app/views/sidebar.coffee
+++ b/assets/scripts/app/views/sidebar.coffee
@@ -2,6 +2,11 @@
   SidebarView: Travis.View.extend
     templateName: 'layouts/sidebar'
 
+    didInsertElement: ->
+      @_super.apply this, arguments
+
+      @activate('jobs')
+
     activate: (name) ->
       @set('activeTab', name)
       @connectOutlet 'pane', @["#{name.capitalize()}View"].create(controller: @get('controller'))
diff --git a/assets/styles/right/lists.sass b/assets/styles/right/lists.sass
index e2eb78f8..b74cd3a8 100644
--- a/assets/styles/right/lists.sass
+++ b/assets/styles/right/lists.sass
@@ -9,7 +9,7 @@
     li
       display: inline-block
       height: 24px
-      margin-right: 3px
+      margin-right: 5px
       background-color: $color-bg-right
       border: 1px solid $color-bg-right
       border-bottom-color: $color-border-light