From bc54871dac7ef10102edecf91a747d6595a4640f Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Wed, 9 Jan 2013 17:04:10 +0100 Subject: o Adding basic build list in the front page application. --- src/main/webapp/apps/app.css | 17 ++++++++ src/main/webapp/apps/app.js | 2 +- src/main/webapp/apps/buildApp/build.html | 8 ++-- src/main/webapp/apps/buildApp/buildApp.js | 5 +-- src/main/webapp/apps/core/navbar.html | 7 ++-- src/main/webapp/apps/frontPageApp/buildList.html | 50 +++++++++++++++++++++++ src/main/webapp/apps/frontPageApp/frontPageApp.js | 7 +++- src/main/webapp/apps/frontPageApp/person.html | 2 +- 8 files changed, 84 insertions(+), 14 deletions(-) mode change 100644 => 100755 src/main/webapp/apps/app.css mode change 100644 => 100755 src/main/webapp/apps/app.js mode change 100644 => 100755 src/main/webapp/apps/buildApp/buildApp.js mode change 100644 => 100755 src/main/webapp/apps/core/navbar.html create mode 100755 src/main/webapp/apps/frontPageApp/buildList.html (limited to 'src/main/webapp/apps') diff --git a/src/main/webapp/apps/app.css b/src/main/webapp/apps/app.css old mode 100644 new mode 100755 index 5ffd104..3088282 --- a/src/main/webapp/apps/app.css +++ b/src/main/webapp/apps/app.css @@ -1,3 +1,6 @@ +/* + * 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 old mode 100644 new mode 100755 index 36736cd..8c683b6 --- 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: '' + template: '' } }); 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 @@ - +
Date{{build.timestamp | date:'medium'}}{{build.build.timestamp | date:'medium'}}
Status - SUCCESS - FAILURE + SUCCESS + FAILURE

Participants

-

+

{{participant.name}}

diff --git a/src/main/webapp/apps/buildApp/buildApp.js b/src/main/webapp/apps/buildApp/buildApp.js old mode 100644 new mode 100755 index 187b240..170af16 --- 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 old mode 100644 new mode 100755 index 871bfde..914258e --- a/src/main/webapp/apps/core/navbar.html +++ b/src/main/webapp/apps/core/navbar.html @@ -4,9 +4,10 @@ Wat
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 @@ +
+ + + +
+

Builds

+
+ + + +
+
+ + + + + + + + + + + +
{{build.build.timestamp | date:'medium'}} + SUCCESS + FAILURE +
+ + + +
+ +
+
+
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 @@ - + {{build.timestamp | date:'medium'}} {{build.success}} -- cgit v1.2.3