From 22cb83183828c7a4828c54e9b30597d276cfd73f Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
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 () {
         '</a>'
   }
 });
+
+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 @@
+<div class="dogtag-big">
+  <a href="#/person/{{person.uuid}}">
+    <img width="80px" height="80px" ng-src="{{person.gravatar}}?default=identicon" title="{{person.name}}" style="float: left"/>
+  </a>
+  <a href="/#/person/{{person.uuid}}">{{person.name}}</a>
+  <br/>
+  <span ng-repeat="level in person.badges | countBadgeByLevel | gz">
+    <span class="badge-inverse badge-level-{{$index + 1}} badge">
+      <i class="icon-user"></i> x {{level}}
+    </span>
+  </span>
+</div>
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 @@
   <navbar/>
 
   <div class="page-header">
-    <h1>Badge</h1>
+    <h1>Build</h1>
   </div>
 
   <div class="row">
     <div class="span12">
-      The badge <badge-span badge="badge.badge"></badge-span> was awarded to <person-link person="badge.person"></person-link> at
-      {{badge.badge.createdDate | date:'medium'}}.
-    </div>
-  </div>
-
-  <div class="row" ng-switch="badge.badge.name">
-    <div class="span12" ng-switch-when="UNBREAKABLE">
-      <h2>Details</h2>
+      <p>
+        The badge <badge-span badge="badge.badge"></badge-span> was awarded to
+        <person-link person="badge.person"></person-link> at {{badge.badge.createdDate | date:'medium'}}.
+      </p>
       <p>
         The badge was awarded for having {{badge.personalBadge.builds.length}} successful builds in a row:
       </p>
       <ul class="unstyled">
         <li ng-repeat="b in badge.personalBadge.builds">
-          <a class="btn" href="/build/{{b}}">{{$index + 1}} <i class="icon-chevron-right"></i></a>
+          <a class="btn" href="#/build/{{b}}">{{$index + 1}} <i class="icon-chevron-right"></i></a>
         </li>
       </ul>
     </div>
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 @@
               <div><person-avatar person="badge.person"></person-avatar></div>
 
               <badge-span badge="badge.badge" ></badge-span> <br/>
-              <!--was awarded to<br/>-->
+              <a href="/#/badge/{{badge.badge.uuid}}">More</a>
             </div>
           </div>
         </x>
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 @@
+<div class="container">
+
+  <navbar/>
+
+  <div class="page-header">
+    <h1>Build</h1>
+  </div>
+
+  <div class="row">
+    <div class="span12">
+      <table class="table table-bordered">
+        <tbody>
+        <tr>
+          <th>Type</th>
+          <td>Jenkins</td>
+        </tr>
+        <tr>
+          <th>Duration</th>
+          <td>{{build.build.timestamp | date:'medium'}}</td>
+        </tr>
+        </tbody>
+      </table>
+
+      <h2>Participants</h2>
+      <span dogtagxl ng-repeat="p in build.participants" person="p"/>
+    </div>
+
+  </div>
+</div>
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'}}:
         <span class="success" ng-show="build.build.success">SUCCESS</span>
         <span class="error" ng-hide="build.build.success">FAILURE</span>
+<!--
+        <small>
+          <a href="#/build/{{build.build.uuid}}">more...</a>
+        </small>
+-->
+        <a class="btn" href="#/build/{{build.build.uuid}}"><i class="icon-chevron-right"></i></a>
       </h3>
 
       <h4>Participants</h4>
       <span ng-repeat="p in build.participants">
-        <person-avatar person="p"></person-avatar>
+        <dogtag-big person="p"></dogtag-big>
       </span>
     </div>
   </div>
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 @@
         <tr ng-repeat="build in recentBuilds" class="{{{true: 'success', false: 'error'}[build.success]}}">
           <td>{{build.timestamp | date:'medium'}}</td>
           <td>{{{true: 'Success', false: 'Failure'}[build.success]}}</td>
-          <td><a href="/build/{{build.uuid}}">Details</a></td>
+          <td><a href="#/build/{{build.uuid}}">Details</a></td>
         </tr>
         </tbody>
       </table>
@@ -71,7 +71,7 @@
         <td>{{build.timestamp | date:'medium'}}</td>
         <td>{{build.success}}</td>
         <td>
-          <a class="btn btn-small" href="/build/{{build.uuid}}"><i class="icon-chevron-right"></i></a>
+          <a class="btn btn-small" href="#/build/{{build.uuid}}"><i class="icon-chevron-right"></i></a>
         </td>
       </tr>
       </tbody>
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