From 22cb83183828c7a4828c54e9b30597d276cfd73f Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 13 Jan 2013 09:35:27 +0100 Subject: o Implemented "build" view. o Created a better 'dogtag' directive, should be more reusable. --- src/main/resources/webapp/apps/app.css | 15 +++++++++++ src/main/resources/webapp/apps/app.js | 10 +++++++ src/main/resources/webapp/apps/dogtagBig.html | 12 +++++++++ .../resources/webapp/apps/frontPageApp/badge.html | 16 +++++------- .../webapp/apps/frontPageApp/badgeList.html | 2 +- .../resources/webapp/apps/frontPageApp/build.html | 29 +++++++++++++++++++++ .../webapp/apps/frontPageApp/buildList.html | 8 +++++- .../webapp/apps/frontPageApp/frontPageApp.js | 2 +- .../resources/webapp/apps/frontPageApp/person.html | 4 +-- .../webapp/apps/jenkinsApp/jenkins-headshot.png | Bin 0 -> 9424 bytes 10 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/webapp/apps/dogtagBig.html create mode 100755 src/main/resources/webapp/apps/frontPageApp/build.html create mode 100644 src/main/resources/webapp/apps/jenkinsApp/jenkins-headshot.png (limited to 'src') diff --git a/src/main/resources/webapp/apps/app.css b/src/main/resources/webapp/apps/app.css index a53238d..77ea36d 100755 --- a/src/main/resources/webapp/apps/app.css +++ b/src/main/resources/webapp/apps/app.css @@ -28,6 +28,21 @@ table.text-baseline td { vertical-align: baseline } +div.dogtag-big { + display: inline-block; + width: 300px; + height: 80px; + margin-right: 1em; + margin-bottom: 1em; +} + +/* This has to match bootstrap's row margin. */ +div.dogtag-big img { + padding-right: 1em; + float: left; + margin-top: 0; +} + /* * Other */ diff --git a/src/main/resources/webapp/apps/app.js b/src/main/resources/webapp/apps/app.js index 960f704..f74206c 100755 --- a/src/main/resources/webapp/apps/app.js +++ b/src/main/resources/webapp/apps/app.js @@ -97,3 +97,13 @@ directives.directive('personAvatar', function () { '' } }); + +directives.directive('dogtagxl', function () { + return { + restrict: 'EACM', + scope: { + person: '=person' + }, + templateUrl: '/apps/dogtagBig.html' + } +}); diff --git a/src/main/resources/webapp/apps/dogtagBig.html b/src/main/resources/webapp/apps/dogtagBig.html new file mode 100644 index 0000000..9c862ad --- /dev/null +++ b/src/main/resources/webapp/apps/dogtagBig.html @@ -0,0 +1,12 @@ +
+ + + + {{person.name}} +
+ + + x {{level}} + + +
diff --git a/src/main/resources/webapp/apps/frontPageApp/badge.html b/src/main/resources/webapp/apps/frontPageApp/badge.html index 92fc7ae..48d15ce 100755 --- a/src/main/resources/webapp/apps/frontPageApp/badge.html +++ b/src/main/resources/webapp/apps/frontPageApp/badge.html @@ -3,25 +3,21 @@
- The badge was awarded to at - {{badge.badge.createdDate | date:'medium'}}. -
-
- -
-
-

Details

+

+ The badge was awarded to + at {{badge.badge.createdDate | date:'medium'}}. +

The badge was awarded for having {{badge.personalBadge.builds.length}} successful builds in a row:

diff --git a/src/main/resources/webapp/apps/frontPageApp/badgeList.html b/src/main/resources/webapp/apps/frontPageApp/badgeList.html index 972e1ec..6b795bd 100755 --- a/src/main/resources/webapp/apps/frontPageApp/badgeList.html +++ b/src/main/resources/webapp/apps/frontPageApp/badgeList.html @@ -30,7 +30,7 @@

- + More
diff --git a/src/main/resources/webapp/apps/frontPageApp/build.html b/src/main/resources/webapp/apps/frontPageApp/build.html new file mode 100755 index 0000000..0972758 --- /dev/null +++ b/src/main/resources/webapp/apps/frontPageApp/build.html @@ -0,0 +1,29 @@ +
+ + + + + +
+
+ + + + + + + + + + + +
TypeJenkins
Duration{{build.build.timestamp | date:'medium'}}
+ +

Participants

+ +
+ +
+
diff --git a/src/main/resources/webapp/apps/frontPageApp/buildList.html b/src/main/resources/webapp/apps/frontPageApp/buildList.html index c6196d4..18a4d35 100755 --- a/src/main/resources/webapp/apps/frontPageApp/buildList.html +++ b/src/main/resources/webapp/apps/frontPageApp/buildList.html @@ -22,11 +22,17 @@ {{build.build.timestamp | date:'medium'}}: SUCCESS FAILURE + +

Participants

- + diff --git a/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js index de8a7b6..9e507b4 100755 --- a/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js +++ b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js @@ -118,7 +118,7 @@ function BuildListCtrl($scope, Build, PagingTableService) { $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(Build, {fields: "detailed"})); } -function BuildCtrl($scope, Build, PagingTableService) { +function BuildCtrl($scope, $routeParams, Build, PagingTableService) { var buildUuid = $routeParams.buildUuid; Build.get({uuid: buildUuid}, function (build) { diff --git a/src/main/resources/webapp/apps/frontPageApp/person.html b/src/main/resources/webapp/apps/frontPageApp/person.html index a2e522d..189523c 100755 --- a/src/main/resources/webapp/apps/frontPageApp/person.html +++ b/src/main/resources/webapp/apps/frontPageApp/person.html @@ -50,7 +50,7 @@ {{build.timestamp | date:'medium'}} {{{true: 'Success', false: 'Failure'}[build.success]}} - Details + Details @@ -71,7 +71,7 @@ {{build.timestamp | date:'medium'}} {{build.success}} - + diff --git a/src/main/resources/webapp/apps/jenkinsApp/jenkins-headshot.png b/src/main/resources/webapp/apps/jenkinsApp/jenkins-headshot.png new file mode 100644 index 0000000..f15af49 Binary files /dev/null and b/src/main/resources/webapp/apps/jenkinsApp/jenkins-headshot.png differ -- cgit v1.2.3