You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/07/10 01:52:27 UTC
[2/2] git commit: Changed the slave*.html breadcrumbs to use SlaveIDs,
not hostnames.
Changed the slave*.html breadcrumbs to use SlaveIDs, not hostnames.
From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12284
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d61d1cdc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d61d1cdc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d61d1cdc
Branch: refs/heads/master
Commit: d61d1cdce7da932a0a7c05b73810072dcdd2247c
Parents: 50f150c
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Tue Jul 9 16:16:28 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Jul 9 16:16:28 2013 -0700
----------------------------------------------------------------------
src/webui/master/static/slave.html | 12 +++---------
src/webui/master/static/slave_executor.html | 2 +-
src/webui/master/static/slave_framework.html | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d61d1cdc/src/webui/master/static/slave.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave.html b/src/webui/master/static/slave.html
index fb7d897..74ede1d 100644
--- a/src/webui/master/static/slave.html
+++ b/src/webui/master/static/slave.html
@@ -6,7 +6,7 @@
<a href="#/slaves">Slaves</a> <span class="divider">/</span>
</li>
<li class="active">
- <em>{{state.hostname}}</em>
+ {{slave_id}}
</li>
</ul>
@@ -31,10 +31,6 @@
<div class="span3">
<div class="well">
<dl class="inline clearfix">
- <dt>{{state.hostname}}</dt>
- </dl>
-
- <dl class="inline clearfix">
<dt>Cluster:</dt>
<dd>{{cluster}}</dd>
<dt>Master:</dt>
@@ -51,11 +47,9 @@
{{state.build_time * 1000 | relativeDate}}
</a> by <i>{{state.build_user}}</i>
</dd>
- <dt>ID:</dt>
+ <dt>Host:</dt>
<dd>
- <a href="" rel="popover" ng-click="popover($event, 'right')" data-content="{{slave_id}}" data-original-title="ID">
- {{slave_id | truncateMesosID}}
- </a>
+ {{state.hostname}}
</dd>
</dl>
<p><a href="" ng-click="log($event)">LOG</a></p>
http://git-wip-us.apache.org/repos/asf/mesos/blob/d61d1cdc/src/webui/master/static/slave_executor.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave_executor.html b/src/webui/master/static/slave_executor.html
index 230d143..354832e 100644
--- a/src/webui/master/static/slave_executor.html
+++ b/src/webui/master/static/slave_executor.html
@@ -8,7 +8,7 @@
<span class="divider">/</span>
</li>
<li>
- <a href="#/slaves/{{slave_id}}">{{state.hostname}}</a>
+ <a href="#/slaves/{{slave_id}}">{{slave_id | truncateMesosID}}</a>
<span class="divider">/</span>
</li>
<li>
http://git-wip-us.apache.org/repos/asf/mesos/blob/d61d1cdc/src/webui/master/static/slave_framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave_framework.html b/src/webui/master/static/slave_framework.html
index ff3b4f8..74fba64 100644
--- a/src/webui/master/static/slave_framework.html
+++ b/src/webui/master/static/slave_framework.html
@@ -8,7 +8,7 @@
<span class="divider">/</span>
</li>
<li>
- <a href="#/slaves/{{slave_id}}">{{state.hostname}}</a>
+ <a href="#/slaves/{{slave_id}}">{{slave_id | truncateMesosID}}</a>
<span class="divider">/</span>
</li>
<li class="active">