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:35 UTC
[36/39] git commit: Scoped hiding/showing of WebUI buttons to
"btn-toggle" class.
Scoped hiding/showing of WebUI buttons to "btn-toggle" class.
The "btn-mini" class is used in other places, like the "Browse" page,
and should not always be hidden when it is a descendant of
"table-condensed" or "inline".
Original review: https://reviews.apache.org/r/12616/
From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12737
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/804a8b0a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/804a8b0a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/804a8b0a
Branch: refs/heads/master
Commit: 804a8b0ab9e60219d42f467565ac35720d0e36b2
Parents: 5febc15
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Jul 18 16:36:40 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jul 18 16:36:40 2013 -0700
----------------------------------------------------------------------
src/webui/master/static/css/mesos.css | 8 ++++----
src/webui/master/static/framework.html | 4 ++--
src/webui/master/static/frameworks.html | 6 +++---
src/webui/master/static/home.html | 18 +++++++++---------
src/webui/master/static/slave.html | 6 +++---
src/webui/master/static/slaves.html | 4 ++--
6 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/804a8b0a/src/webui/master/static/css/mesos.css
----------------------------------------------------------------------
diff --git a/src/webui/master/static/css/mesos.css b/src/webui/master/static/css/mesos.css
index d1413b7..38b225b 100644
--- a/src/webui/master/static/css/mesos.css
+++ b/src/webui/master/static/css/mesos.css
@@ -44,8 +44,8 @@ th.unselected:after {
content: " ";
}
-.inline .btn-mini,
-.table-condensed .btn-mini {
+.inline .btn-toggle,
+.table-condensed .btn-toggle {
margin-bottom: -2px;
margin-top: -5px;
visibility: hidden;
@@ -53,8 +53,8 @@ th.unselected:after {
.inline .zeroclipboard-is-hover,
.table-condensed .zeroclipboard-is-hover,
-.flash dd:hover .btn-mini,
-.flash td:hover .btn-mini {
+.flash dd:hover .btn-toggle,
+.flash td:hover .btn-toggle {
visibility: visible;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/804a8b0a/src/webui/master/static/framework.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/framework.html b/src/webui/master/static/framework.html
index a192791..0cedb39 100644
--- a/src/webui/master/static/framework.html
+++ b/src/webui/master/static/framework.html
@@ -26,7 +26,7 @@
<dd>
<abbr title="{{framework.registered_time * 1000 | isoDate}}">
{{framework.registered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -39,7 +39,7 @@
<dd ng-show="framework.reregistered_time">
<abbr title="{{framework.reregistered_time * 1000 | isoDate}}">
{{framework.reregistered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.reregistered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/804a8b0a/src/webui/master/static/frameworks.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/frameworks.html b/src/webui/master/static/frameworks.html
index 0ea73ad..7c243d4 100644
--- a/src/webui/master/static/frameworks.html
+++ b/src/webui/master/static/frameworks.html
@@ -57,7 +57,7 @@
<td>
<a href="{{'#/frameworks/' + framework.id}}">
{{(framework.id | truncateMesosID) || framework.name}}</a>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.id}}"
tooltip="Copy ID"
@@ -74,7 +74,7 @@
<td>
<abbr title="{{framework.registered_time * 1000 | isoDate}}">
{{framework.registered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -86,7 +86,7 @@
<td ng-show="framework.reregistered_time">
<abbr title="{{framework.reregistered_time * 1000 | isoDate}}">
{{framework.reregistered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/804a8b0a/src/webui/master/static/home.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/home.html b/src/webui/master/static/home.html
index a77c172..409b17d 100644
--- a/src/webui/master/static/home.html
+++ b/src/webui/master/static/home.html
@@ -8,7 +8,7 @@
<div class="row">
<div class="span3">
<div class="well">
- <dl class="inline clearfix">
+ <dl class="inline inline-toggle clearfix">
<dt>Cluster:</dt>
<dd>
<span ng-show="clusterNamed">{{state.cluster}}</span>
@@ -26,7 +26,7 @@
<abbr title="{{state.build_time * 1000 | isoDate}}">
{{state.build_time * 1000 | relativeDate}}</abbr>
by <i>{{state.build_user}}</i>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{state.build_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -38,7 +38,7 @@
<dd>
<abbr title="{{state.start_time * 1000 | isoDate}}">
{{state.start_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{state.start_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -182,7 +182,7 @@
<td>
<a href="{{'#/frameworks/' + framework.id}}">
{{(framework.id | truncateMesosID) || framework.name}}</a>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.id}}"
tooltip="Copy ID"
@@ -199,7 +199,7 @@
<td>
<abbr title="{{framework.registered_time * 1000 | isoDate}}">
{{framework.registered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.registered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -211,7 +211,7 @@
<td ng-show="framework.reregistered_time">
<abbr title="{{framework.reregistered_time * 1000 | isoDate}}">
{{framework.reregistered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.reregistered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -254,7 +254,7 @@
<td>
<a href="{{'#/frameworks/' + framework.id}}" title="{{framework.id}}">
{{framework.id | truncateMesosID}}</a>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.id}}"
tooltip="Copy ID"
@@ -267,7 +267,7 @@
<td>
<abbr title="{{framework.registered_time * 1000 | isoDate}}">
{{framework.registered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.reregistered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -278,7 +278,7 @@
<td>
<abbr title="{{framework.unregistered_time * 1000 | isoDate}}">
{{framework.unregistered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.unregistered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/804a8b0a/src/webui/master/static/slave.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slave.html b/src/webui/master/static/slave.html
index 92f6250..36645df 100644
--- a/src/webui/master/static/slave.html
+++ b/src/webui/master/static/slave.html
@@ -34,7 +34,7 @@
<dd>
<abbr title="{{state.start_time * 1000 | isoDate}}">
{{state.start_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{state.start_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -47,7 +47,7 @@
<abbr title="{{state.build_time * 1000 | isoDate}}">
{{state.build_time * 1000 | relativeDate}}</abbr>
by <i>{{state.build_user}}</i>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{state.build_time * 1000 | isoDate}}"
tooltip="Copy timestamp"
@@ -148,7 +148,7 @@
<td>
<a href="{{'#/slaves/' + slave_id + '/frameworks/' + framework.id}}">
{{(framework.id | truncateMesosID) || framework.name}}</a>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{framework.id}}"
tooltip="Copy ID"
http://git-wip-us.apache.org/repos/asf/mesos/blob/804a8b0a/src/webui/master/static/slaves.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/slaves.html b/src/webui/master/static/slaves.html
index f4df71c..15877b7 100644
--- a/src/webui/master/static/slaves.html
+++ b/src/webui/master/static/slaves.html
@@ -41,7 +41,7 @@
<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"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{slave.id}}"
tooltip="Copy ID"
@@ -57,7 +57,7 @@
<td>
<abbr title="{{slave.registered_time * 1000 | isoDate}}">
{{slave.registered_time * 1000 | relativeDate}}</abbr>
- <button class="btn btn-mini"
+ <button class="btn btn-mini btn-toggle"
clipboard
data-clipboard-text="{{slave.registered_time * 1000 | isoDate}}"
tooltip="Copy timestamp"