Display only jobs and workers in tabs
This commit is contained in:
parent
b06d7f9628
commit
aedddd8afe
|
@ -1,5 +1,8 @@
|
||||||
Travis.reopen
|
Travis.reopen
|
||||||
SidebarController: Em.ArrayController.extend
|
SidebarController: Em.ArrayController.extend
|
||||||
|
needs: ['runningJobs']
|
||||||
|
jobsBinding: 'controllers.runningJobs'
|
||||||
|
|
||||||
init: ->
|
init: ->
|
||||||
@_super.apply this, arguments
|
@_super.apply this, arguments
|
||||||
@tickables = []
|
@tickables = []
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
<h4>Running Jobs ({{view.jobs.length}})</h4>
|
|
||||||
|
|
||||||
<ul class="groups">
|
<ul class="groups">
|
||||||
{{#each group in view.groups}}
|
{{#each group in view.groups}}
|
||||||
{{view view.GroupView groupBinding="group"}}
|
{{view view.GroupView groupBinding="group"}}
|
||||||
|
|
|
@ -11,11 +11,8 @@
|
||||||
{{view view.DecksView}}
|
{{view view.DecksView}}
|
||||||
|
|
||||||
<ul class="tabs">
|
<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"}}>
|
<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>
|
||||||
<li id="tab_workers" {{bindAttr class="view.classWorkers"}}>
|
<li id="tab_workers" {{bindAttr class="view.classWorkers"}}>
|
||||||
<h5><a href="#" {{action activate "workers" target="view"}}>{{t layouts.application.workers}}</a></h5>
|
<h5><a href="#" {{action activate "workers" target="view"}}>{{t layouts.application.workers}}</a></h5>
|
||||||
|
@ -25,7 +22,7 @@
|
||||||
<div class="pane">
|
<div class="pane">
|
||||||
{{outlet pane}}
|
{{outlet pane}}
|
||||||
</div>
|
</div>
|
||||||
|
{{view view.QueuesView}}
|
||||||
{{view view.LinksView}}
|
{{view view.LinksView}}
|
||||||
|
|
||||||
<div id="about" class="box">
|
<div id="about" class="box">
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
{{#view Travis.WorkersView}}
|
{{#view Travis.WorkersView}}
|
||||||
<h4>
|
<a id="toggle-workers" {{action toggleWorkers target="view"}}></a>
|
||||||
{{t workers}}
|
|
||||||
<a id="toggle-workers" {{action toggleWorkers target="view"}}></a>
|
|
||||||
</h4>
|
|
||||||
<ul id="workers">
|
<ul id="workers">
|
||||||
{{#each group in controller.groups}}
|
{{#each group in controller.groups}}
|
||||||
{{#view Travis.WorkersListView}}
|
{{#view Travis.WorkersListView}}
|
||||||
|
|
|
@ -2,6 +2,11 @@
|
||||||
SidebarView: Travis.View.extend
|
SidebarView: Travis.View.extend
|
||||||
templateName: 'layouts/sidebar'
|
templateName: 'layouts/sidebar'
|
||||||
|
|
||||||
|
didInsertElement: ->
|
||||||
|
@_super.apply this, arguments
|
||||||
|
|
||||||
|
@activate('jobs')
|
||||||
|
|
||||||
activate: (name) ->
|
activate: (name) ->
|
||||||
@set('activeTab', name)
|
@set('activeTab', name)
|
||||||
@connectOutlet 'pane', @["#{name.capitalize()}View"].create(controller: @get('controller'))
|
@connectOutlet 'pane', @["#{name.capitalize()}View"].create(controller: @get('controller'))
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
li
|
li
|
||||||
display: inline-block
|
display: inline-block
|
||||||
height: 24px
|
height: 24px
|
||||||
margin-right: 3px
|
margin-right: 5px
|
||||||
background-color: $color-bg-right
|
background-color: $color-bg-right
|
||||||
border: 1px solid $color-bg-right
|
border: 1px solid $color-bg-right
|
||||||
border-bottom-color: $color-border-light
|
border-bottom-color: $color-border-light
|
||||||
|
|
Loading…
Reference in New Issue
Block a user