From 34546b9c5b5a9be2180e8b4801b72a48feb94d1d Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Fri, 18 Jan 2013 16:40:40 +0100 Subject: o timestamp => createdDate in the JSON to be consistent. o Better builds list. o Renaming person-avatar to avatar-xl. --- .../esper/testing/web/resource/CoreResource.java | 6 ++-- src/main/resources/webapp/apps/app.js | 2 +- src/main/resources/webapp/apps/buildApp/build.html | 2 +- .../webapp/apps/frontPageApp/badgeList.html | 2 +- .../resources/webapp/apps/frontPageApp/build.html | 2 +- .../webapp/apps/frontPageApp/buildList.html | 42 ++++++++++++---------- .../webapp/apps/frontPageApp/frontPageApp.js | 42 +++++++++++++--------- .../resources/webapp/apps/frontPageApp/person.html | 6 ++-- .../webapp/apps/frontPageApp/personList.html | 2 +- .../resources/webapp/apps/jenkinsApp/build.html | 2 +- src/main/resources/webapp/apps/jenkinsApp/job.html | 2 +- 11 files changed, 62 insertions(+), 48 deletions(-) mode change 100644 => 100755 src/main/resources/webapp/apps/jenkinsApp/build.html (limited to 'src/main') diff --git a/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java b/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java index 9a69a75..158e9ab 100755 --- a/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java +++ b/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java @@ -244,12 +244,12 @@ public class CoreResource extends AbstractResource { class BuildJson { public final UUID uuid; - public final DateTime timestamp; + public final DateTime createdDate; public final boolean success; - public BuildJson(UUID uuid, DateTime timestamp, boolean success) { + public BuildJson(UUID uuid, DateTime createdDate, boolean success) { this.uuid = uuid; - this.timestamp = timestamp; + this.createdDate = createdDate; this.success = success; } } diff --git a/src/main/resources/webapp/apps/app.js b/src/main/resources/webapp/apps/app.js index df540f8..a1fd343 100755 --- a/src/main/resources/webapp/apps/app.js +++ b/src/main/resources/webapp/apps/app.js @@ -86,7 +86,7 @@ directives.directive('personLink', function () { } }); -directives.directive('personAvatar', function () { +directives.directive('avatarXl', function () { return { restrict: 'E', scope: { diff --git a/src/main/resources/webapp/apps/buildApp/build.html b/src/main/resources/webapp/apps/buildApp/build.html index fec38d2..2a24b16 100755 --- a/src/main/resources/webapp/apps/buildApp/build.html +++ b/src/main/resources/webapp/apps/buildApp/build.html @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/webapp/apps/frontPageApp/badgeList.html b/src/main/resources/webapp/apps/frontPageApp/badgeList.html index 6b795bd..c7f1714 100755 --- a/src/main/resources/webapp/apps/frontPageApp/badgeList.html +++ b/src/main/resources/webapp/apps/frontPageApp/badgeList.html @@ -27,7 +27,7 @@
-
+

More diff --git a/src/main/resources/webapp/apps/frontPageApp/build.html b/src/main/resources/webapp/apps/frontPageApp/build.html index 0972758..cbf8f8e 100755 --- a/src/main/resources/webapp/apps/frontPageApp/build.html +++ b/src/main/resources/webapp/apps/frontPageApp/build.html @@ -16,7 +16,7 @@
- +
Date{{build.build.timestamp | date:'medium'}}{{build.build.createdDate | date:'medium'}}
Status
Duration{{build.build.timestamp | date:'medium'}}{{build.build.createdDate | date:'medium'}}
diff --git a/src/main/resources/webapp/apps/frontPageApp/buildList.html b/src/main/resources/webapp/apps/frontPageApp/buildList.html index 8fb4a60..ddbffe2 100755 --- a/src/main/resources/webapp/apps/frontPageApp/buildList.html +++ b/src/main/resources/webapp/apps/frontPageApp/buildList.html @@ -16,26 +16,32 @@ } -
-
-

- {{build.build.timestamp | date:'medium'}}: - SUCCESS - FAILURE - -

- - - - - -
-
-
+
+ +
+

{{date | date:'mediumDate'}}

+
+
+ + + + +
+

+ {{build.build.createdDate | date:'shortTime'}}: + {{{true: 'SUCCESS', false: 'FAILURE'}[build.build.success]}} +

+ + + + + +
+
+
+