From a4373cd0e6ce6c3b1c7ad31d9f12f1f87de028e5 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Wed, 23 Jan 2013 09:06:27 +0100 Subject: o Better look for tables showing some kind of details of an object. o Using smaller buttons for navigation so they don't change their container's size. --- src/main/resources/webapp/apps/app.css | 8 +++-- .../resources/webapp/apps/frontPageApp/badge.html | 4 +-- .../webapp/apps/frontPageApp/buildList.html | 10 +++--- .../resources/webapp/apps/frontPageApp/person.html | 36 ++-------------------- .../resources/webapp/apps/jenkinsApp/build.html | 2 +- .../resources/webapp/apps/jenkinsApp/jenkinsApp.js | 10 +++++- src/main/resources/webapp/apps/jenkinsApp/job.html | 8 +++-- .../webapp/apps/jenkinsApp/server-list.html | 2 +- .../resources/webapp/apps/jenkinsApp/server.html | 20 +++++++----- 9 files changed, 47 insertions(+), 53 deletions(-) (limited to 'src') diff --git a/src/main/resources/webapp/apps/app.css b/src/main/resources/webapp/apps/app.css index 77ea36d..dadaccf 100755 --- a/src/main/resources/webapp/apps/app.css +++ b/src/main/resources/webapp/apps/app.css @@ -24,8 +24,8 @@ * Common elements */ -table.text-baseline td { - vertical-align: baseline +table.align-middle td { + vertical-align: middle; } div.dogtag-big { @@ -43,6 +43,10 @@ div.dogtag-big img { margin-top: 0; } +table.details-table th:first-child { + width: 15em; +} + /* * Other */ diff --git a/src/main/resources/webapp/apps/frontPageApp/badge.html b/src/main/resources/webapp/apps/frontPageApp/badge.html index b501f15..1035b80 100755 --- a/src/main/resources/webapp/apps/frontPageApp/badge.html +++ b/src/main/resources/webapp/apps/frontPageApp/badge.html @@ -15,13 +15,13 @@

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

- +
{{b.timestamp | date:'medium'}} - {{$index + 1}} + {{$index + 1}}
diff --git a/src/main/resources/webapp/apps/frontPageApp/buildList.html b/src/main/resources/webapp/apps/frontPageApp/buildList.html index 7e795e4..4c4fe65 100755 --- a/src/main/resources/webapp/apps/frontPageApp/buildList.html +++ b/src/main/resources/webapp/apps/frontPageApp/buildList.html @@ -24,7 +24,7 @@

{{date | date:'mediumDate'}}

- +

@@ -35,10 +35,12 @@ -

+ No participants. -

- + + + +

diff --git a/src/main/resources/webapp/apps/frontPageApp/person.html b/src/main/resources/webapp/apps/frontPageApp/person.html index 11cfd0b..1da74ef 100755 --- a/src/main/resources/webapp/apps/frontPageApp/person.html +++ b/src/main/resources/webapp/apps/frontPageApp/person.html @@ -73,7 +73,9 @@ {{build.timestamp | date:'shortTime'}}: {{{true: 'SUCCESS', false: 'FAILURE'}[build.success]}} - + + + @@ -90,38 +92,6 @@
-
diff --git a/src/main/resources/webapp/apps/jenkinsApp/build.html b/src/main/resources/webapp/apps/jenkinsApp/build.html index 13e3b8b..61411f5 100755 --- a/src/main/resources/webapp/apps/jenkinsApp/build.html +++ b/src/main/resources/webapp/apps/jenkinsApp/build.html @@ -14,7 +14,7 @@

Overview

- +
diff --git a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js index f59c107..ea8eed8 100755 --- a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js +++ b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js @@ -13,7 +13,15 @@ function NavTabsService($location) { var onClick = function(tab) { currentTab = tab; - currentIndex = _.indexOf(tabs, tab); + var x = _.indexOf(tabs, tab); + if(x == -1) { + x = _.indexOf(keys, tab); + if(x == -1) { + throw "Unknown tab: " + tab; + } + } + + currentIndex = x; $location.search(name, keys[currentIndex]); }; diff --git a/src/main/resources/webapp/apps/jenkinsApp/job.html b/src/main/resources/webapp/apps/jenkinsApp/job.html index 4f21fad..91527dc 100755 --- a/src/main/resources/webapp/apps/jenkinsApp/job.html +++ b/src/main/resources/webapp/apps/jenkinsApp/job.html @@ -14,7 +14,7 @@

Overview

-
Timestamp
+
@@ -40,7 +40,11 @@ - + diff --git a/src/main/resources/webapp/apps/jenkinsApp/server-list.html b/src/main/resources/webapp/apps/jenkinsApp/server-list.html index 93e5e9e..7319fc7 100755 --- a/src/main/resources/webapp/apps/jenkinsApp/server-list.html +++ b/src/main/resources/webapp/apps/jenkinsApp/server-list.html @@ -24,7 +24,7 @@ - diff --git a/src/main/resources/webapp/apps/jenkinsApp/server.html b/src/main/resources/webapp/apps/jenkinsApp/server.html index bf54bb8..2cfd4db 100755 --- a/src/main/resources/webapp/apps/jenkinsApp/server.html +++ b/src/main/resources/webapp/apps/jenkinsApp/server.html @@ -20,7 +20,7 @@

Overview

-
URL
{{build.timestamp | date:'medium'}} {{build.result}} + + + +
{{server.url}} {{server.enabled}} Visit +
+
@@ -32,7 +32,7 @@ - + @@ -57,12 +57,16 @@
-
URL
Number of jobs{{server.jobCount}}{{server.jobCount}}
Number of builds
+
- + @@ -88,11 +92,13 @@
{{job.displayName}} {{job.createdDate | date:'medium'}} + + + +
- + - + -- cgit v1.2.3
{{b.timestamp | date:'medium'}}{{b.timestamp | date:'medium'}} {{b.result}}JobJob - + + +