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/13 00:16:12 UTC
[2/7] git commit: Updated the webui breadcrumbs to use badges to
represent the Master, Slave, Framework,
and Executor. The rightmost crumb always shows the non-truncated ID.
Updated the webui breadcrumbs to use badges to represent the Master,
Slave, Framework, and Executor. The rightmost crumb always shows the
non-truncated ID.
From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12393
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9dac716e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9dac716e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9dac716e
Branch: refs/heads/master
Commit: 9dac716e2d1d2eacb91d717a43e2ce23c6857a83
Parents: 4f934cb
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Fri Jul 12 15:13:49 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Fri Jul 12 15:13:49 2013 -0700
----------------------------------------------------------------------
src/webui/master/static/browse.html | 11 ++++------
src/webui/master/static/framework.html | 15 ++++----------
src/webui/master/static/frameworks.html | 5 +++--
src/webui/master/static/home.html | 13 ++++++------
src/webui/master/static/mesos.css | 13 ++++++++++++
src/webui/master/static/slave.html | 7 +++----
src/webui/master/static/slave_executor.html | 25 +++++++----------------
src/webui/master/static/slave_framework.html | 25 ++++++-----------------
src/webui/master/static/slaves.html | 5 +++--
9 files changed, 50 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/browse.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/browse.html b/src/webui/master/static/browse.html
index 6a3d290..366e999 100644
--- a/src/webui/master/static/browse.html
+++ b/src/webui/master/static/browse.html
@@ -1,18 +1,15 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a>
+ <a class="badge badge-type" href="#">Master</a>
<span class="divider">/</span>
</li>
<li>
- <a href="#/slaves">Slaves</a>
- <span class="divider">/</span>
- </li>
- <li>
- <a href="#/slaves/{{slave_id}}">{{slaves[slave_id].hostname}}</a>
+ <a class="badge badge-type" href="#/slaves/{{slave_id}}" title="{{slave_id}}">
+ Slave</a>
<span class="divider">/</span>
</li>
<li class="active">
- <em>browse</em>
+ Browse
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/framework.html b/src/webui/master/static/framework.html
index 77c6455..3af4b83 100644
--- a/src/webui/master/static/framework.html
+++ b/src/webui/master/static/framework.html
@@ -1,12 +1,11 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a> <span class="divider">/</span>
- </li>
- <li>
- <a href="#/frameworks">Frameworks</a> <span class="divider">/</span>
+ <a class="badge badge-type" href="#">Master</a>
+ <span class="divider">/</span>
</li>
<li class="active">
- {{framework.name}}
+ <span class="badge badge-type">Framework</span>
+ {{framework.id}}
</li>
</ul>
@@ -21,12 +20,6 @@
<dl class="inline clearfix">
<dt>Name:</dt>
<dd>{{framework.name}}</dd>
- <dt>ID:</dt>
- <dd>
- <a href="" rel="popover" ng-click="popover($event, 'right')" data-content="{{framework.id}}" data-original-title="ID">
- {{framework.id | truncateMesosID}}
- </a>
- </dd>
<dt>User:</dt>
<dd>{{framework.user}}</dd>
<dt>Registered:</dt>
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/frameworks.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/frameworks.html b/src/webui/master/static/frameworks.html
index 0e2c691..49306ca 100644
--- a/src/webui/master/static/frameworks.html
+++ b/src/webui/master/static/frameworks.html
@@ -1,9 +1,10 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a> <span class="divider">/</span>
+ <a class="badge badge-type" href="#">Master</a>
+ <span class="divider">/</span>
</li>
<li class="active">
- Frameworks
+ <span class="badge badge-type">Frameworks</span>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index e98c975..f08abbb 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -10,6 +10,13 @@
</div>
</div>
+<ul class="breadcrumb">
+ <li class="active">
+ <span class="badge badge-type">Master</span>
+ {{state.id}}
+ </li>
+</ul>
+
<div class="row">
<div class="span3">
<div class="well">
@@ -30,12 +37,6 @@
{{state.start_time * 1000 | relativeDate}}
</a>
</dd>
- <dt>ID:</dt>
- <dd>
- <a href="" rel="popover" ng-click="popover($event, 'right')" data-content="{{state.id}}" data-original-title="ID">
- {{state.id | truncateMesosID}}
- </a>
- </dd>
</dl>
<p><a href="" ng-click="log($event)">LOG</a></p>
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/mesos.css
----------------------------------------------------------------------
diff --git a/src/webui/master/static/mesos.css b/src/webui/master/static/mesos.css
index 9a5b4e1..34f6067 100644
--- a/src/webui/master/static/mesos.css
+++ b/src/webui/master/static/mesos.css
@@ -43,3 +43,16 @@ th.unselected:after {
padding-left: 5px;
content: " ";
}
+.badge-type {
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ font-weight: normal;
+ padding-left: 4px;
+ padding-right: 4px;
+ text-shadow: none;
+}
+
+a.badge-type:hover {
+ text-decoration: underline;
+}
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/slave.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave.html b/src/webui/master/static/slave.html
index 74ede1d..378079c 100644
--- a/src/webui/master/static/slave.html
+++ b/src/webui/master/static/slave.html
@@ -1,11 +1,10 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a> <span class="divider">/</span>
- </li>
- <li>
- <a href="#/slaves">Slaves</a> <span class="divider">/</span>
+ <a class="badge badge-type" href="#">Master</a>
+ <span class="divider">/</span>
</li>
<li class="active">
+ <span class="badge badge-type">Slave</span>
{{slave_id}}
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/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 354832e..4d7e8d0 100644
--- a/src/webui/master/static/slave_executor.html
+++ b/src/webui/master/static/slave_executor.html
@@ -1,24 +1,21 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a>
+ <a class="badge badge-type" href="#">Master</a>
<span class="divider">/</span>
</li>
<li>
- <a href="#/slaves">Slaves</a>
+ <a class="badge badge-type" href="#/slaves/{{slave_id}}" title="{{slave_id}}">
+ Slave</a>
<span class="divider">/</span>
</li>
<li>
- <a href="#/slaves/{{slave_id}}">{{slave_id | truncateMesosID}}</a>
- <span class="divider">/</span>
- </li>
- <li>
- <a href="#/slaves/{{slave_id}}/frameworks/{{framework_id}}">
- {{framework.name}}
- </a>
+ <a class="badge badge-type" href="#/slaves/{{slave_id}}/frameworks/{{framework_id}}" title="{{framework_id}}">
+ Framework</a>
<span class="divider">/</span>
</li>
<li class="active">
- <em>{{executor_id}}</em>
+ <span class="badge badge-type">Executor</span>
+ {{executor_id}}
</li>
</ul>
@@ -31,8 +28,6 @@
<div class="span3">
<div class="well">
<dl class="inline clearfix">
- <dt>Executor ID:</dt>
- <dd>{{executor_id}}</dd>
<dt>Executor Name:</dt>
<dd>{{executor.name}}</dd>
<dt>Executor Source:</dt>
@@ -44,12 +39,6 @@
<dd>{{cluster}}</dd>
<dt>Master:</dt>
<dd>{{state.master_hostname}}</dd>
- <dt>Framework ID:</dt>
- <dd>
- <a href="" rel="popover" ng-click="popover($event, 'right')" data-content="{{framework_id}}" data-original-title="ID">
- {{framework_id | truncateMesosID}}
- </a>
- </dd>
</dl>
<dl class="inline clearfix">
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/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 74fba64..d97684e 100644
--- a/src/webui/master/static/slave_framework.html
+++ b/src/webui/master/static/slave_framework.html
@@ -1,18 +1,16 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a>
+ <a class="badge badge-type" href="#">Master</a>
<span class="divider">/</span>
</li>
<li>
- <a href="#/slaves">Slaves</a>
- <span class="divider">/</span>
- </li>
- <li>
- <a href="#/slaves/{{slave_id}}">{{slave_id | truncateMesosID}}</a>
+ <a class="badge badge-type" href="#/slaves/{{slave_id}}" title="{{slave_id}}">
+ Slave</a>
<span class="divider">/</span>
</li>
<li class="active">
- <em>{{framework.name}}</em>
+ <span class="badge badge-type">Framework</span>
+ {{framework.id}}
</li>
</ul>
@@ -25,19 +23,8 @@
<div class="span3">
<div class="well">
<dl class="inline clearfix">
- <dt>{{framework.name}}</dt>
- </dl>
-
- <dl class="inline clearfix">
- <dt>Cluster:</dt><dd>{{cluster}}</dd>
+ <dt>Name:</dt><dd>{{framework.name}}</dd>
<dt>Master:</dt><dd>{{state.master_hostname}}</dd>
- <dt>ID:</dt>
- <dd>
- <a href="" rel="popover" ng-click="popover($event, 'right')"
- data-content="{{framework_id}}" data-original-title="ID">
- {{framework_id | truncateMesosID}}
- </a>
- </dd>
</dl>
<dl class="inline clearfix">
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dac716e/src/webui/master/static/slaves.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slaves.html b/src/webui/master/static/slaves.html
index 9c73ecf..64baba9 100644
--- a/src/webui/master/static/slaves.html
+++ b/src/webui/master/static/slaves.html
@@ -1,9 +1,10 @@
<ul class="breadcrumb">
<li>
- <a href="#">Home</a> <span class="divider">/</span>
+ <a class="badge badge-type" href="#">Master</a>
+ <span class="divider">/</span>
</li>
<li class="active">
- Slaves
+ <span class="badge badge-type">Slaves</span>
</li>
</ul>