You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/05/23 19:19:38 UTC
git commit: Fix for web UI redirect message not showing up.
Repository: mesos
Updated Branches:
refs/heads/master 96f590b3f -> a31d81f11
Fix for web UI redirect message not showing up.
There was a bug that caused the "We're redirecting you to the leader"
message to not show up when visiting the web UI on a follower. Looks
to me like it was caused by an upgrade in twitter bootstrap, either
way it's a simple fix. I also changed the style from error to warning,
since the red message seemed a little harsh.
Review: https://reviews.apache.org/r/21850
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a31d81f1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a31d81f1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a31d81f1
Branch: refs/heads/master
Commit: a31d81f1179d10954f859afafd5d726b1550e492
Parents: 96f590b
Author: Tom Arnfeld <ta...@me.com>
Authored: Fri May 23 10:19:00 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Fri May 23 10:19:00 2014 -0700
----------------------------------------------------------------------
src/webui/master/static/index.html | 2 +-
src/webui/master/static/js/controllers.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a31d81f1/src/webui/master/static/index.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/index.html b/src/webui/master/static/index.html
index f7f3d24..25caf53 100644
--- a/src/webui/master/static/index.html
+++ b/src/webui/master/static/index.html
@@ -57,7 +57,7 @@
<div class="alert" data-ng-show="state && !state.leader">
<strong>No master is currently leading ...</strong>
</div>
- <div class="alert alert-error hide" id="not-leader-alert">
+ <div class="alert alert-warning hide" id="not-leader-alert">
<button class="close" data-dismiss="alert">×</button>
<strong>This master is <u>not the leader</u>, redirecting in {{redirect / 1000}} seconds ...</strong>
<a href="/master/redirect">go now</a>
http://git-wip-us.apache.org/repos/asf/mesos/blob/a31d81f1/src/webui/master/static/js/controllers.js
----------------------------------------------------------------------
diff --git a/src/webui/master/static/js/controllers.js b/src/webui/master/static/js/controllers.js
index afb24fb..41a70a8 100644
--- a/src/webui/master/static/js/controllers.js
+++ b/src/webui/master/static/js/controllers.js
@@ -59,7 +59,7 @@
// Redirect if we aren't the leader.
if ($scope.state.leader != $scope.state.pid) {
$scope.redirect = 6000;
- $("#not-leader-alert").show();
+ $("#not-leader-alert").removeClass("hide");
var countdown = function() {
if ($scope.redirect == 0) {