Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-11-23 12:30:41 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Improve looks of project dashboard

Browse Source
This commit is contained in:
Matej Kramny 2016-05-16 16:58:18 +01:00
parent abafffd994
commit 15eb0abe9c
5 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/css/semaphore.css
View File

@ -9611,18 +9611,28 @@ h5.no-top-margin,
h6.no-top-margin {
margin-top: 0;
}
.project-name {
padding-left: 15px;
}
ul.nav > li.active a {
background-color: #eee;
}
ul.nav.nav-pills li > a {
border-bottom: 1px solid #EEE;
transition: color 0.2s linear, border-bottom 0.2s linear;
}
ul.nav.nav-pills li > a:hover {
background: none;
border-bottom: 1px solid #00ab54;
border-bottom: 1px solid #CCC;
border-radius: 0;
}
ul.nav.nav-pills li.active > a {
border-bottom: 1px solid #CCC;
border-radius: 0;
background: none;
border-bottom: 1px solid #0058ab;
color: #003e78;
}
.task-history-list li > a {
padding-left: 0;
padding-right: 0;
}

38
public/css/semaphore.less
View File

@ -58,23 +58,39 @@ h1, h2, h3, h4, h5, h6 {
}
}
.project-name {
padding-left: 15px;
}
ul.nav {
& > li.active a {
background-color: #eee;
}
}
ul.nav.nav-pills li > a {
border-bottom: 1px solid #EEE;
ul.nav.nav-pills li {
& > a {
border-bottom: 1px solid #EEE;
transition: color 0.2s linear, border-bottom 0.2s linear;
}
& > a:hover {
background: none;
border-bottom: 1px solid #CCC;
border-radius: 0;
}
&.active > a {
border-bottom: 1px solid #CCC;
border-radius: 0;
background: none;
color: darken(@brand-success, 10%);
}
}
ul.nav.nav-pills li > a:hover {
background: none;
border-bottom: 1px solid @brand-primary;
}
ul.nav.nav-pills li.active > a {
background: none;
border-bottom: 1px solid @brand-success;
color: darken(@brand-success, 10%);
.task-history-list {
li > a {
padding-left: 0;
padding-right: 0;
}
}

4
public/html/projects/container.jade
View File

@ -1,6 +1,6 @@
.container-fluid: .row
.col-sm-4.col-md-3
h3.no-top-margin {{ project.name }}
h3.no-top-margin.project-name {{ project.name }}
ul.nav.nav-pills.nav-stacked
li(ng-class="{ active: $state.includes('project.dashboard') }"): a(ui-sref="project.dashboard") Dashboard
li(ng-class="{ active: $state.includes('project.templates') }"): a(ui-sref="project.templates") Task Templates
@ -10,5 +10,5 @@
li(ng-class="{ active: $state.includes('project.repositories') }"): a(ui-sref="project.repositories") Playbook Repositories
//- li(ng-class="{ active: $state.includes('project.schedule') }"): a(ui-sref="project.schedule") Task Schedule
li(ng-class="{ active: $state.includes('project.users') }"): a(ui-sref="project.users") Team
.col-sm-8.col-md-9
.col-sm-8.col-md-9(style="border-left: 1px solid #EEE;")
ui-view

18
public/html/projects/dashboard.jade
View File

@ -8,20 +8,16 @@
span(ng-bind="event.object_name")
span(ng-if="event.object_name.length > 0") - 
span {{ event.description }}
.col-sm-5
.col-sm-5(style="border-left: 1px solid #EEE;")
h4.no-top-margin Task history
ul.nav.nav-pills.nav-stacked
ul.nav.nav-pills.nav-stacked.task-history-list
li(ng-repeat="task in tasks"): a(ng-click="openTask(task)" href="#")
i.fa.fa-fw.fa-clock-o.text-warning(ng-if="task.status == 'waiting'")
i.fa.fa-fw.fa-times.text-danger(ng-if="task.status == 'error'")
i.fa.fa-fw.fa-check.text-success(ng-if="task.status == 'success'")
i.fa.fa-fw.fa-play.text-warning(ng-if="task.status == 'running'")
|  
span(ng-if="task.playbook.length == 0") {{ task.tpl_playbook }}
span(ng-if="task.playbook.length > 0") {{ task.playbook }}
span(ng-class="{ 'text-warning': task.status == 'waiting' || task.status == 'running', 'text-danger': task.status == 'error', 'text-success': task.status == 'success' }")
span(ng-if="task.playbook.length == 0") {{ task.tpl_playbook }}
span(ng-if="task.playbook.length > 0") {{ task.playbook }}
span.pull-right(ng-if="task.status == 'waiting'") {{ task.created | date:'short' }}
span.pull-right(ng-if="task.status != 'waiting'") {{ task.start | date:'short' }}
br
span Duration
span.pull-right {{ task.duration }}
span  
span.pull-right {{ task.duration }} minutes

3
public/js/controllers/projects/dashboard.js
View File

@ -12,7 +12,8 @@ define(['controllers/projects/taskRunner'], function () {
return;
}
t.duration = moment(t.start).from(moment(t.end), true);
// t.duration = moment(t.start).from(moment(t.end), true);
t.duration = moment(t.start).diff(moment(t.end), 'minutes');
})
});