darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mark active job in list

Browse source
This commit is contained in:
Brad Rydzewski 2015-08-09 20:52:08 -07:00
parent 819fa9db87
commit c1d18b65bb
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/drone-server/static/scripts/controllers/builds.js
View file

@ -71,6 +71,7 @@
var owner = $stateParams.owner; var owner = $stateParams.owner;
var name = $stateParams.name; var name = $stateParams.name;
var fullName = owner + '/' + name; var fullName = owner + '/' + name;
var step = parseInt($stateParams.step) || 1;
// Gets the currently authenticated user // Gets the currently authenticated user
users.getCached().then(function (payload) { users.getCached().then(function (payload) {
@ -86,6 +87,7 @@
// Gets the build // Gets the build
builds.get(fullName, number).then(function (payload) { builds.get(fullName, number).then(function (payload) {
$scope.step = step;
$scope.build = payload.data; $scope.build = payload.data;
}).catch(function (err) { }).catch(function (err) {
$scope.error = err; $scope.error = err;
@ -172,6 +174,7 @@
builds.get(fullName, number).then(function (payload) { builds.get(fullName, number).then(function (payload) {
$scope.build = payload.data; $scope.build = payload.data;
$scope.task = payload.data.jobs[step - 1]; $scope.task = payload.data.jobs[step - 1];
$scope.step = step;
if (['pending', 'killed'].indexOf($scope.task.status) !== -1) { if (['pending', 'killed'].indexOf($scope.task.status) !== -1) {
// do nothing // do nothing

4
cmd/drone-server/static/scripts/views/builds/show/content.html
View file

@ -12,8 +12,8 @@
</div> </div>
</div> </div>
<div class="list job-list"> <div ng-class="{'list':true, 'job-list':true, 'matrix-list': build.jobs && build.jobs.length > 1 }">
<a ng-repeat="job in build.jobs" ng-href="{{ repo.full_name }}/{{ build.number }}/{{ job.number }}"> <a ng-repeat="job in build.jobs" ng-href="{{ repo.full_name }}/{{ build.number }}/{{ job.number }}" ng-class="{'active': job.number == step }">
<div> <div>
<div class="status {{ job.status }} status-small"> <div class="status {{ job.status }} status-small">
<i class="material-icons">{{ job.status | icon }}</i> <i class="material-icons">{{ job.status | icon }}</i>

6
cmd/drone-server/static/styles/list.css
View file

@ -75,3 +75,9 @@
.list em { .list em {
color:#65737e; color:#65737e;
} }
.matrix-list a.active {
background-color: #eff1f5;
margin-left: -10px;
padding-left: 10px;
}