You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ss...@apache.org on 2014/01/13 20:34:32 UTC
[9/9] git commit: Updated to bootstrap-3.0.3.
Updated to bootstrap-3.0.3.
From: Thomas Rampelberg <th...@saunter.org>
Review: https://reviews.apache.org/r/16798
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2026b0dd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2026b0dd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2026b0dd
Branch: refs/heads/master
Commit: 2026b0dd2a337e3873283ba501d7a5eb75aa9cfa
Parents: 3a69423
Author: Ross Allen <ro...@mesosphere.io>
Authored: Mon Jan 13 11:20:28 2014 -0800
Committer: Ross Allen <ro...@mesosphere.io>
Committed: Mon Jan 13 11:33:05 2014 -0800
----------------------------------------------------------------------
src/Makefile.am | 18 +-
src/webui/master/static/browse.html | 23 +-
.../master/static/css/bootstrap-2.3.2.min.css | 9 -
.../master/static/css/bootstrap-3.0.3.min.css | 7 +
.../css/bootstrap-responsive-2.3.2.min.css | 9 -
src/webui/master/static/css/mesos.css | 15 +-
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 ++
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes
src/webui/master/static/framework.html | 19 +-
src/webui/master/static/frameworks.html | 13 +-
src/webui/master/static/home.html | 16 +-
.../static/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
.../master/static/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes
src/webui/master/static/index.html | 74 +-
src/webui/master/static/js/app.js | 2 +-
.../master/static/js/ui-bootstrap-tpls-0.7.0.js | 3583 -----------------
.../static/js/ui-bootstrap-tpls-0.7.0.min.js | 2 -
.../master/static/js/ui-bootstrap-tpls-0.9.0.js | 3599 ++++++++++++++++++
.../static/js/ui-bootstrap-tpls-0.9.0.min.js | 2 +
src/webui/master/static/offers.html | 11 +-
src/webui/master/static/slave.html | 15 +-
src/webui/master/static/slave_executor.html | 13 +-
src/webui/master/static/slave_framework.html | 12 +-
src/webui/master/static/slaves.html | 7 +-
26 files changed, 3960 insertions(+), 3718 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2026b0dd/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index ef70770..576023d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -433,8 +433,7 @@ nobase_dist_pkgdata_DATA += \
# Need to distribute/install webui CSS.
nobase_dist_pkgdata_DATA += \
- webui/master/static/css/bootstrap-responsive-2.3.2.min.css \
- webui/master/static/css/bootstrap-2.3.2.min.css \
+ webui/master/static/css/bootstrap-3.0.3.min.css \
webui/master/static/css/mesos.css
# Need to distribute/install webui HTML.
@@ -454,18 +453,23 @@ nobase_dist_pkgdata_DATA += \
# Need to distribute/install webui images.
nobase_dist_pkgdata_DATA += \
webui/master/static/img/loading.gif \
- webui/master/static/img/glyphicons-halflings-white.png \
- webui/master/static/img/glyphicons-halflings.png \
webui/master/static/ico/favicon.ico
+# Need to distribute/install webui fonts.
+nobase_dist_pkgdata_DATA +=
+ webui/master/static/fonts/glyphicons-halflings-regular.eot \
+ webui/master/static/fonts/glyphicons-halflings-regular.svg \
+ webui/master/static/fonts/glyphicons-halflings-regular.ttf \
+ webui/master/static/fonts/glyphicons-halflings-regular.wof
+
# Need to distribute/install third-party javascript.
nobase_dist_pkgdata_DATA += \
webui/master/static/js/angular-1.2.3.js \
webui/master/static/js/angular-1.2.3.min.js \
- webui/master/static/js/angular-route-1.2.3.js \
+ webui/master/static/js/angular-route-1.2.3.js \
webui/master/static/js/angular-route-1.2.3.min.js \
- webui/master/static/js/ui-bootstrap-tpls-0.7.0.js \
- webui/master/static/js/ui-bootstrap-tpls-0.7.0.min.js \
+ webui/master/static/js/ui-bootstrap-tpls-0.9.0.js \
+ webui/master/static/js/ui-bootstrap-tpls-0.9.0.min.js \
webui/master/static/js/underscore-1.4.3.js \
webui/master/static/js/underscore-1.4.3.min.js \
webui/master/static/js/jquery-1.7.1.js \
http://git-wip-us.apache.org/repos/asf/mesos/blob/2026b0dd/src/webui/master/static/browse.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/browse.html b/src/webui/master/static/browse.html
index fe8be00..ce55d6b 100644
--- a/src/webui/master/static/browse.html
+++ b/src/webui/master/static/browse.html
@@ -1,35 +1,32 @@
-<ul class="breadcrumb">
+<ol class="breadcrumb">
<li>
<a class="badge badge-type" href="#">Master</a>
- <span class="divider">/</span>
</li>
<li>
<a class="badge badge-type" href="#/slaves/{{slave_id}}" title="{{slave_id}}">
Slave</a>
- <span class="divider">/</span>
</li>
<li class="active">
Browse
</li>
-</ul>
+</ol>
-<ul class="breadcrumb">
+<ol class="breadcrumb">
<li ng-repeat="dir in path.split('/')">
<a href="#/slaves/{{slave_id}}/browse?path={{
encodeURIComponent(path.split('/').slice(0, $index + 1).join('/'))}}">
{{dir}}
</a>
- <span class="divider">/</span>
</li>
-</ul>
+</ol>
<div class="alert alert-error hide" id="alert">
<button class="close" data-dismiss="alert">×</button>
<strong>{{alert_message}}</strong>
</div>
-<div class="row hide" id="listing">
- <div class="span9">
+<div class="row" id="listing">
+ <div class="col-md-9">
<div class="well">
<div data-ng-show="listing.length == 0">
No files in this directory.
@@ -57,13 +54,13 @@
<td class="text-right">{{file.mtime * 1000 | unixDate}}</td>
<td>
<span data-ng-show="file.mode[0] == 'd'">
- <i class="icon-folder-close"></i>
+ <i class="glyphicon glyphicon-folder-close"></i>
<a href="#/slaves/{{slave_id}}/browse?path={{encodeURIComponent(file.path)}}">
{{basename(file.path)}}
</a>
</span>
<span data-ng-show="file.mode[0] != 'd'">
- <i class="icon-file" style="visibility: hidden;"></i>
+ <i class="glyphicon glyphicon-file" style="visibility: hidden;"></i>
<a href="" ng-click="pail($event, encodeURIComponent(file.path))">
{{basename(file.path)}}
</a>
@@ -72,7 +69,7 @@
<td>
<a data-ng-show="file.mode[0] != 'd'"
href="http://{{slave_host}}/files/download.json?path={{encodeURIComponent(file.path)}}">
- <button class="btn btn-mini" type="button">
+ <button class="btn btn-xs btn-default" type="button">
Download
</button>
</a>
@@ -82,4 +79,4 @@
</table>
</div>
</div>
-</div>
\ No newline at end of file
+</div>