[MediaWiki-commits] [Gerrit] zuul: Match zuul_version display logic with upstream - change (integration/docroot)

2015-04-02 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/201648

Change subject: zuul: Match zuul_version display logic with upstream
..

zuul: Match zuul_version display logic with upstream

Follows-up 37632ae. Makes it easier to pull in upstream patches
in the future.

(cherry-picked from https://github.com/openstack-infra/zuul/commit/df550c54)

Change-Id: I81122aaae9f525ceb04a7fbb63cf3111b4770f51
---
M org/wikimedia/integration/zuul/default.html
M org/wikimedia/integration/zuul/status.js
2 files changed, 12 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/48/201648/1

diff --git a/org/wikimedia/integration/zuul/default.html 
b/org/wikimedia/integration/zuul/default.html
index 4d07c26..0e76921 100644
--- a/org/wikimedia/integration/zuul/default.html
+++ b/org/wikimedia/integration/zuul/default.html
@@ -41,8 +41,6 @@
 amp;title=Zuul%20Geard%20job%20queue (8 hours) /
 
h4Zuul infos/h4
-   Version: span id=zuul-version/spanbr/
-   Last reconfigured: span id=zuul-last-reconfigured/span/br
-!--
---
+   pZuul version: span id=zuul-version-span/span/p
+   pLast reconfigured: span id=last-reconfigured-span/span/p
 /div
diff --git a/org/wikimedia/integration/zuul/status.js 
b/org/wikimedia/integration/zuul/status.js
index 3126d79..ad65c70 100644
--- a/org/wikimedia/integration/zuul/status.js
+++ b/org/wikimedia/integration/zuul/status.js
@@ -79,8 +79,12 @@
cache: false
})
.done(function (data) {
-   var html = '', last_reconfigured,
-   total_queued = 0, total_completed = 0,  
total_running = 0;
+   var last_reconfigured,
+   html = '',
+   total_queued = 0,
+   total_completed = 0,
+   total_running = 0;
+
data = data || {};
 
if ('message' in data) {
@@ -130,15 +134,12 @@

$('#zuul-total-jobs-completed').text(total_completed);
$('#zuul-total-jobs-queued').text(total_queued);
 
-   // Borrowed from OpenStack
-   $('#zuul-version').text(
-   data.zuul_version ? data.zuul_version : 
'unknown'
-   );
+   if ('zuul_version' in data) {
+   
$('#zuul-version-span').text(data.zuul_version);
+   }
if ('last_reconfigured' in data) {
last_reconfigured = new 
Date(data.last_reconfigured);
-   $('#zuul-last-reconfigured').text(
-   last_reconfigured.toString()
-   );
+   
$('#last-reconfigured-span').text(last_reconfigured.toString());
}
 
})

-- 
To view, visit https://gerrit.wikimedia.org/r/201648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81122aaae9f525ceb04a7fbb63cf3111b4770f51
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] zuul: Match zuul_version display logic with upstream - change (integration/docroot)

2015-04-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: zuul: Match zuul_version display logic with upstream
..


zuul: Match zuul_version display logic with upstream

Follows-up 37632ae. Makes it easier to pull in upstream patches
in the future.

(cherry-picked from https://github.com/openstack-infra/zuul/commit/df550c54)

Change-Id: I81122aaae9f525ceb04a7fbb63cf3111b4770f51
---
M org/wikimedia/integration/zuul/default.html
M org/wikimedia/integration/zuul/status.js
2 files changed, 12 insertions(+), 13 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/org/wikimedia/integration/zuul/default.html 
b/org/wikimedia/integration/zuul/default.html
index 4d07c26..0e76921 100644
--- a/org/wikimedia/integration/zuul/default.html
+++ b/org/wikimedia/integration/zuul/default.html
@@ -41,8 +41,6 @@
 amp;title=Zuul%20Geard%20job%20queue (8 hours) /
 
h4Zuul infos/h4
-   Version: span id=zuul-version/spanbr/
-   Last reconfigured: span id=zuul-last-reconfigured/span/br
-!--
---
+   pZuul version: span id=zuul-version-span/span/p
+   pLast reconfigured: span id=last-reconfigured-span/span/p
 /div
diff --git a/org/wikimedia/integration/zuul/status.js 
b/org/wikimedia/integration/zuul/status.js
index 3126d79..ad65c70 100644
--- a/org/wikimedia/integration/zuul/status.js
+++ b/org/wikimedia/integration/zuul/status.js
@@ -79,8 +79,12 @@
cache: false
})
.done(function (data) {
-   var html = '', last_reconfigured,
-   total_queued = 0, total_completed = 0,  
total_running = 0;
+   var last_reconfigured,
+   html = '',
+   total_queued = 0,
+   total_completed = 0,
+   total_running = 0;
+
data = data || {};
 
if ('message' in data) {
@@ -130,15 +134,12 @@

$('#zuul-total-jobs-completed').text(total_completed);
$('#zuul-total-jobs-queued').text(total_queued);
 
-   // Borrowed from OpenStack
-   $('#zuul-version').text(
-   data.zuul_version ? data.zuul_version : 
'unknown'
-   );
+   if ('zuul_version' in data) {
+   
$('#zuul-version-span').text(data.zuul_version);
+   }
if ('last_reconfigured' in data) {
last_reconfigured = new 
Date(data.last_reconfigured);
-   $('#zuul-last-reconfigured').text(
-   last_reconfigured.toString()
-   );
+   
$('#last-reconfigured-span').text(last_reconfigured.toString());
}
 
})

-- 
To view, visit https://gerrit.wikimedia.org/r/201648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I81122aaae9f525ceb04a7fbb63cf3111b4770f51
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits