diff options
Diffstat (limited to 'src/main/webapp')
-rwxr-xr-x[-rw-r--r--] | src/main/webapp/apps/app.css | 17 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/webapp/apps/app.js | 2 | ||||
-rwxr-xr-x | src/main/webapp/apps/buildApp/build.html | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/webapp/apps/buildApp/buildApp.js | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/webapp/apps/core/navbar.html | 7 | ||||
-rwxr-xr-x | src/main/webapp/apps/frontPageApp/buildList.html | 50 | ||||
-rwxr-xr-x | src/main/webapp/apps/frontPageApp/frontPageApp.js | 7 | ||||
-rwxr-xr-x | src/main/webapp/apps/frontPageApp/person.html | 2 |
8 files changed, 84 insertions, 14 deletions
diff --git a/src/main/webapp/apps/app.css b/src/main/webapp/apps/app.css index 5ffd104..3088282 100644..100755 --- a/src/main/webapp/apps/app.css +++ b/src/main/webapp/apps/app.css @@ -1,4 +1,7 @@ /* + * Badges + */ +/* bronze = #8c7853 bronze ii = #a67d3d */ @@ -7,6 +10,20 @@ .badge-level-2 { background-color: silver; color: #000000 } .badge-level-3 { background-color: #ffd700; color: #000000 } +/* + * Avatar + */ + +/* This has to match the Gravatar image */ +.avatar80 { + width: 80px; + height: 80px; +} + +/* + * + */ + #content { background-color: #ffffff; padding-bottom: 60px; diff --git a/src/main/webapp/apps/app.js b/src/main/webapp/apps/app.js index 36736cd..8c683b6 100644..100755 --- a/src/main/webapp/apps/app.js +++ b/src/main/webapp/apps/app.js @@ -91,6 +91,6 @@ directives.directive('personAvatar', function () { scope: { person: '=person' }, - template: '<img ng-src="{{person.gravatar}}?default=identicon" class="avatar-image" title="{{person.name}}"/>' + template: '<img ng-src="{{person.gravatar}}?default=identicon" class="avatar-image avatar80" title="{{person.name}}"/>' } }); diff --git a/src/main/webapp/apps/buildApp/build.html b/src/main/webapp/apps/buildApp/build.html index 2feee28..fec38d2 100755 --- a/src/main/webapp/apps/buildApp/build.html +++ b/src/main/webapp/apps/buildApp/build.html @@ -9,19 +9,19 @@ <table> <tr> <th>Date</th> - <td>{{build.timestamp | date:'medium'}}</td> + <td>{{build.build.timestamp | date:'medium'}}</td> </tr> <tr> <th>Status</th> <td> - <span ng-show="build.success">SUCCESS</span> - <span ng-hide="build.success">FAILURE</span> + <span ng-show="build.build.success">SUCCESS</span> + <span ng-hide="build.build.success">FAILURE</span> </td> </tr> </table> <h3>Participants</h3> - <p ng-repeat="participant in participants"> + <p ng-repeat="participant in build.participants"> <span>{{participant.name}}</span> </p> diff --git a/src/main/webapp/apps/buildApp/buildApp.js b/src/main/webapp/apps/buildApp/buildApp.js index 187b240..170af16 100644..100755 --- a/src/main/webapp/apps/buildApp/buildApp.js +++ b/src/main/webapp/apps/buildApp/buildApp.js @@ -7,9 +7,6 @@ var buildApp = angular.module('buildApp', ['build', 'buildParticipant']).config( function BuildCtrl($scope, Build, BuildParticipant) { Build.get({uuid: uuid}, function(build) { - window.build = $scope.build = build; - }); - BuildParticipant.query({uuid: uuid}, function(persons) { - $scope.participants = persons; + $scope.build = build; }); } diff --git a/src/main/webapp/apps/core/navbar.html b/src/main/webapp/apps/core/navbar.html index 871bfde..914258e 100644..100755 --- a/src/main/webapp/apps/core/navbar.html +++ b/src/main/webapp/apps/core/navbar.html @@ -4,9 +4,10 @@ <span class="brand"><a href="/">Wat</a></span> <div class="nav-collapse collapse"> <ul class="nav"> - <li class=""><a href="/#/">Home</a></li> - <li class=""><a href="/#/badge/">Badges</a></li> - <li class=""><a href="/#/person/">People</a></li> + <li class=""><a href="#/">Home</a></li> + <li class=""><a href="#/badge/">Badges</a></li> + <li class=""><a href="#/person/">People</a></li> + <li class=""><a href="#/build/">Builds</a></li> <li class="divider-vertical"></li> <li class=""><a href="/jenkins">Jenkins</a></li> </ul> diff --git a/src/main/webapp/apps/frontPageApp/buildList.html b/src/main/webapp/apps/frontPageApp/buildList.html new file mode 100755 index 0000000..13a1dc3 --- /dev/null +++ b/src/main/webapp/apps/frontPageApp/buildList.html @@ -0,0 +1,50 @@ +<div class="container"> + + <navbar/> + + <div class="page-header"> + <h1>Builds</h1> + </div> + + <style> + .avatar-image { + /* This has to match bootstrap's row margin. */ + margin-left: 30px; + padding-right: 1em; + float: left; + margin-top: 0; + } + </style> + + <div class="row"> + <div class="span12"> + <table class="table"> + <tbody ng-repeat="build in builds.rows"> + <tr class="{{{true: 'success', false: 'error'}[build.build.success]}}"> + <td>{{build.build.timestamp | date:'medium'}}</td> + <td> + <span ng-show="build.build.success">SUCCESS</span> + <span ng-hide="build.build.success">FAILURE</span> + </td> + <td><a class="btn" href="/build/{{build.build.uuid}}"><i class="icon-chevron-right"></i></a></td> + </tr> + <tr> + <td colspan="3"> + <span ng-repeat="p in build.participants"> + <person-avatar person="p"/> + </span> + </td> + </tr> + </tbody> + </table> + <ul class="pager"> + <li class="previous" ng-show="builds.startIndex > 0"> + <a ng-click="builds.prev()">← Prev</a> + </li> + <li class="next"> + <a ng-click="builds.next()">Next →</a> + </li> + </ul> + </div> + </div> +</div> diff --git a/src/main/webapp/apps/frontPageApp/frontPageApp.js b/src/main/webapp/apps/frontPageApp/frontPageApp.js index 5f1cf2c..a67e2dc 100755 --- a/src/main/webapp/apps/frontPageApp/frontPageApp.js +++ b/src/main/webapp/apps/frontPageApp/frontPageApp.js @@ -5,7 +5,8 @@ var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', when('/', {controller: FrontPageCtrl, templateUrl: '/apps/frontPageApp/frontPage.html?noCache=' + noCache}). when('/badge/', {controller: BadgeListCtrl, templateUrl: '/apps/frontPageApp/badgeList.html?noCache=' + noCache}). when('/person/', {controller: PersonListCtrl, templateUrl: '/apps/frontPageApp/personList.html?noCache=' + noCache}). - when('/person/:personUuid', {controller: PersonCtrl, templateUrl: '/apps/frontPageApp/person.html?noCache=' + noCache}); + when('/person/:personUuid', {controller: PersonCtrl, templateUrl: '/apps/frontPageApp/person.html?noCache=' + noCache}). + when('/build/', {controller: BuildListCtrl, templateUrl: '/apps/frontPageApp/buildList.html?noCache=' + noCache}); }); function FrontPageCtrl($scope, Person, Badge) { @@ -95,3 +96,7 @@ function PersonCtrl($scope, $routeParams, Person, Build, PagingTableService) { $scope.recentBuilds = builds; }); } + +function BuildListCtrl($scope, Build, PagingTableService) { + $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(Build, {fields: "detailed"})); +} diff --git a/src/main/webapp/apps/frontPageApp/person.html b/src/main/webapp/apps/frontPageApp/person.html index 0ca5679..ba5c18d 100755 --- a/src/main/webapp/apps/frontPageApp/person.html +++ b/src/main/webapp/apps/frontPageApp/person.html @@ -76,7 +76,7 @@ </tr> </thead> <tbody> - <tr ng-repeat="build in builds.rows" class="{{{true: 'success', false: 'error'}[build.success]}}"> + <tr ng-repeat="build in builds.rows" class="{{{true: 'build-success', false: 'build-error'}[build.success]}}"> <td>{{build.timestamp | date:'medium'}}</td> <td>{{build.success}}</td> </tr> |