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/19 01:45:01 UTC
[02/39] git commit: Removed the slaves table from main page of the
WebUI.
Removed the slaves table from main page of the WebUI.
Frameworks are now front and center. Slaves can still be accessed
via the navbar, but they no longer take valuable space and time on
the homepage of the web UI.
Original review: https://reviews.apache.org/r/12604/
From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12731
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a18f355b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a18f355b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a18f355b
Branch: refs/heads/master
Commit: a18f355ba516a2fe994be735be678abcad25bda5
Parents: 04d5d9b
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Jul 18 16:15:59 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jul 18 16:15:59 2013 -0700
----------------------------------------------------------------------
src/webui/master/static/home.html | 142 ++++++++++-----------------------
1 file changed, 40 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a18f355b/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index 4a76fcf..d698d89 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -223,66 +223,57 @@
</tbody>
</table>
- <h3>
- Active Slaves
- <small>(<a href="#/slaves">see all</a>)</small>
- </h3>
+ <h3>Terminated Frameworks</h3>
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
- <th ng-class="columnClass('slaves', 'id')"
- ng-click="selectColumn('slaves', 'id')">
+ <th ng-class="columnClass('completed_frameworks', 'id')"
+ ng-click="selectColumn('completed_frameworks', 'id')">
ID
</th>
- <th ng-class="columnClass('slaves', 'hostname')"
- ng-click="selectColumn('slaves', 'hostname')">
- Host
- </th>
- <th ng-class="columnClass('slaves', 'resources.cpus')"
- ng-click="selectColumn('slaves', 'resources.cpus')">
- CPUs
- </th>
- <th ng-class="columnClass('slaves', 'resources.mem')"
- ng-click="selectColumn('slaves', 'resources.mem')">
- Mem
+ <th ng-class="columnClass('completed_frameworks', 'user')"
+ ng-click="selectColumn('completed_frameworks', 'user')">
+ User
</th>
- <th ng-class="columnClass('slaves', 'resources.disk')"
- ng-click="selectColumn('slaves', 'resources.disk')">
- Disk
+ <th ng-class="columnClass('completed_frameworks', 'name')"
+ ng-click="selectColumn('completed_frameworks', 'name')">
+ Name
</th>
- <th ng-class="columnClass('slaves', 'registered_time')"
- ng-click="selectColumn('slaves', 'registered_time')">
+ <th ng-class="columnClass('completed_frameworks', 'registered_time')"
+ ng-click="selectColumn('completed_frameworks', 'registered_time')">
Registered
</th>
+ <th ng-class="columnClass('completed_frameworks', 'unregistered_time')"
+ ng-click="selectColumn('completed_frameworks', 'unregistered_time')">
+ Unregistered
+ </th>
</tr>
</thead>
- <tr ng-repeat="slave in _.values(slaves) | orderBy:tables['slaves'].selected_column:tables['slaves'].reverse">
- <td>
- <a href="#/slaves/{{slave.id}}">{{slave.id | truncateMesosID}}</a>
- <button class="btn btn-mini"
- clipboard
- data-clipboard-text="{{slave.id}}"
- tooltip="Copy ID"
- tooltip-placement="right"
- tooltip-trigger="clipboardhover">
- </button>
- </td>
- <td>{{slave.hostname}}</td>
- <td>{{slave.resources.cpus | number}}</td>
- <td>{{slave.resources.mem * (1024 * 1024) | dataSize}}</td>
- <td>{{slave.resources.disk * (1024 * 1024) | dataSize}}</td>
- <td>
- <abbr title="{{slave.registered_time * 1000 | mesosDate}}">
- {{slave.registered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
- clipboard
- data-clipboard-text="{{slave.registered_time * 1000 | mesosDate}}"
- tooltip="Copy timestamp"
- tooltip-placement="right"
- tooltip-trigger="clipboardhover">
- </button>
- </td>
- </tr>
+ <tbody>
+ <tr ng-repeat="framework in _.values(completed_frameworks) | orderBy:tables['completed_frameworks'].selected_column:tables['completed_frameworks'].reverse">
+ <td>
+ <abbr title="{{framework.id}}">{{framework.id | truncateMesosID}}</abbr>
+ </td>
+ <td>{{framework.user}}</td>
+ <td><a href="{{'#/frameworks/' + framework.id}}">{{framework.name}}</a></td>
+ <td>
+ <a href="javascript:void(0)"
+ popover="{{framework.registered_time * 1000 | mesosDate}}"
+ popover-placement="bottom"
+ popover-title="Registered">
+ {{framework.registered_time * 1000 | relativeDate}}
+ </a>
+ </td>
+ <td>
+ <a href="javascript:void(0)"
+ popover="{{framework.unregistered_time * 1000 | mesosDate}}"
+ popover-placement="bottom"
+ popover-title="Unregistered">
+ {{framework.unregistered_time * 1000 | relativeDate}}
+ </a>
+ </td>
+ </tr>
+ </tbody>
</table>
<h3>Offers</h3>
@@ -328,58 +319,5 @@
</tbody>
</table>
- <h3>Terminated Frameworks</h3>
- <table class="table table-striped table-bordered table-condensed">
- <thead>
- <tr>
- <th ng-class="columnClass('completed_frameworks', 'id')"
- ng-click="selectColumn('completed_frameworks', 'id')">
- ID
- </th>
- <th ng-class="columnClass('completed_frameworks', 'user')"
- ng-click="selectColumn('completed_frameworks', 'user')">
- User
- </th>
- <th ng-class="columnClass('completed_frameworks', 'name')"
- ng-click="selectColumn('completed_frameworks', 'name')">
- Name
- </th>
- <th ng-class="columnClass('completed_frameworks', 'registered_time')"
- ng-click="selectColumn('completed_frameworks', 'registered_time')">
- Registered
- </th>
- <th ng-class="columnClass('completed_frameworks', 'unregistered_time')"
- ng-click="selectColumn('completed_frameworks', 'unregistered_time')">
- Unregistered
- </th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="framework in _.values(completed_frameworks) | orderBy:tables['completed_frameworks'].selected_column:tables['completed_frameworks'].reverse">
- <td>
- <abbr title="{{framework.id}}">{{framework.id | truncateMesosID}}</abbr>
- </td>
- <td>{{framework.user}}</td>
- <td><a href="{{'#/frameworks/' + framework.id}}">{{framework.name}}</a></td>
- <td>
- <a href="javascript:void(0)"
- popover="{{framework.registered_time * 1000 | mesosDate}}"
- popover-placement="bottom"
- popover-title="Registered">
- {{framework.registered_time * 1000 | relativeDate}}
- </a>
- </td>
- <td>
- <a href="javascript:void(0)"
- popover="{{framework.unregistered_time * 1000 | mesosDate}}"
- popover-placement="bottom"
- popover-title="Unregistered">
- {{framework.unregistered_time * 1000 | relativeDate}}
- </a>
- </td>
- </tr>
- </tbody>
- </table>
-
</div>
</div>