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:31 UTC
[32/39] git commit: Organized WebUI static assets into directories.
Organized WebUI static assets into directories.
All static assets were previously in a single folder, except for
unused Bootstrap files. This makes template files more apparent
since they are the only files in the root of /static.
JavaScript lives in /js
CSS lives in /css
Images live in /img
Icons live in /ico
Objects (e.g. Flash) live in /obj
Original review: https://reviews.apache.org/r/12607/
From: Ross Allen <ro...@mesosphe.re>
Review: https://reviews.apache.org/r/12733
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5852eb93
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5852eb93
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5852eb93
Branch: refs/heads/master
Commit: 5852eb931dd7f69d2dfed2252fe60973e327657f
Parents: 52cde11
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Jul 18 16:19:21 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jul 18 16:19:21 2013 -0700
----------------------------------------------------------------------
src/Makefile.am | 86 +-
src/webui/master/static/angular-1.0.7.js | 14847 -----------------
src/webui/master/static/angular-1.0.7.min.js | 163 -
src/webui/master/static/app.js | 191 -
.../bootstrap/css/bootstrap-2.3.2.min.css | 9 -
.../css/bootstrap-responsive-2.3.2.min.css | 9 -
src/webui/master/static/bootstrap/css/docs.css | 841 -
.../master/static/bootstrap/ico/favicon.ico | Bin 1664 -> 0 bytes
src/webui/master/static/bootstrap/img/bird.png | Bin 3092 -> 0 bytes
.../bootstrap/img/bootstrap-mdo-sfmoma-01.jpg | Bin 130647 -> 0 bytes
.../bootstrap/img/bootstrap-mdo-sfmoma-02.jpg | Bin 84505 -> 0 bytes
.../bootstrap/img/bootstrap-mdo-sfmoma-03.jpg | Bin 50755 -> 0 bytes
.../master/static/bootstrap/img/browsers.png | Bin 19776 -> 0 bytes
.../master/static/bootstrap/img/github-16px.png | Bin 398 -> 0 bytes
.../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
.../bootstrap/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes
.../img/glyphicons/glyphicons_009_magic.png | Bin 316 -> 0 bytes
.../img/glyphicons/glyphicons_042_group.png | Bin 305 -> 0 bytes
.../img/glyphicons/glyphicons_079_podium.png | Bin 213 -> 0 bytes
.../glyphicons/glyphicons_082_roundabout.png | Bin 345 -> 0 bytes
.../glyphicons_155_show_thumbnails.png | Bin 117 -> 0 bytes
.../img/glyphicons/glyphicons_163_iphone.png | Bin 172 -> 0 bytes
.../glyphicons/glyphicons_214_resize_small.png | Bin 301 -> 0 bytes
.../img/glyphicons/glyphicons_266_book_open.png | Bin 292 -> 0 bytes
.../static/bootstrap/img/grid-18px-masked.png | Bin 405 -> 0 bytes
.../master/static/bootstrap/img/icon-css3.png | Bin 370 -> 0 bytes
.../master/static/bootstrap/img/icon-github.png | Bin 312 -> 0 bytes
.../master/static/bootstrap/img/icon-html5.png | Bin 452 -> 0 bytes
.../static/bootstrap/img/icon-twitter.png | Bin 264 -> 0 bytes
.../static/bootstrap/img/less-logo-large.png | Bin 13078 -> 0 bytes
.../master/static/bootstrap/img/less-small.png | Bin 1181 -> 0 bytes
.../bootstrap/img/responsive-illustrations.png | Bin 1077 -> 0 bytes
src/webui/master/static/bootstrap/js/README.md | 106 -
.../master/static/bootstrap/js/application.js | 184 -
.../js/google-code-prettify/prettify.css | 30 -
.../js/google-code-prettify/prettify.js | 28 -
.../master/static/bootstrap/js/jquery-1.7.1.js | 9252 ----------
.../static/bootstrap/js/jquery-1.7.1.min.js | 4 -
src/webui/master/static/bootstrap/js/jquery.js | 9252 ----------
src/webui/master/static/controllers.js | 792 -
.../master/static/css/bootstrap-2.3.2.min.css | 9 +
.../css/bootstrap-responsive-2.3.2.min.css | 9 +
src/webui/master/static/css/graph.css | 100 +
src/webui/master/static/css/mesos.css | 82 +
src/webui/master/static/cubism.v1.js | 975 --
src/webui/master/static/cubism.v1.min.js | 1 -
src/webui/master/static/d3.v2.js | 9382 -----------
src/webui/master/static/d3.v2.min.js | 4 -
src/webui/master/static/dashboard.js | 149 -
src/webui/master/static/graph.css | 100 -
src/webui/master/static/ico/favicon.ico | Bin 0 -> 1664 bytes
.../static/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes
.../master/static/img/glyphicons-halflings.png | Bin 0 -> 13826 bytes
src/webui/master/static/img/loading.gif | Bin 0 -> 4710 bytes
src/webui/master/static/index.html | 34 +-
src/webui/master/static/jquery.pailer.js | 335 -
src/webui/master/static/js/angular-1.0.7.js | 14847 +++++++++++++++++
src/webui/master/static/js/angular-1.0.7.min.js | 163 +
src/webui/master/static/js/app.js | 191 +
src/webui/master/static/js/controllers.js | 792 +
src/webui/master/static/js/cubism.v1.js | 975 ++
src/webui/master/static/js/cubism.v1.min.js | 1 +
src/webui/master/static/js/d3.v2.js | 9382 +++++++++++
src/webui/master/static/js/d3.v2.min.js | 4 +
src/webui/master/static/js/dashboard.js | 149 +
src/webui/master/static/js/jquery-1.7.1.js | 9252 ++++++++++
src/webui/master/static/js/jquery-1.7.1.min.js | 4 +
src/webui/master/static/js/jquery.pailer.js | 335 +
src/webui/master/static/js/relative-date.js | 48 +
.../master/static/js/ui-bootstrap-tpls-0.4.0.js | 3165 ++++
.../static/js/ui-bootstrap-tpls-0.4.0.min.js | 2 +
src/webui/master/static/js/underscore-1.4.3.js | 1221 ++
.../master/static/js/underscore-1.4.3.min.js | 1 +
.../master/static/js/zeroclipboard-1.1.7.js | 432 +
.../master/static/js/zeroclipboard-1.1.7.min.js | 8 +
src/webui/master/static/loading.gif | Bin 4710 -> 0 bytes
src/webui/master/static/mesos.css | 82 -
src/webui/master/static/pailer.html | 10 +-
src/webui/master/static/relative-date.js | 48 -
.../master/static/ui-bootstrap-tpls-0.4.0.js | 3165 ----
.../static/ui-bootstrap-tpls-0.4.0.min.js | 2 -
src/webui/master/static/underscore-1.4.3.js | 1221 --
src/webui/master/static/underscore-1.4.3.min.js | 1 -
src/webui/master/static/zeroclipboard-1.1.7.js | 432 -
.../master/static/zeroclipboard-1.1.7.min.js | 8 -
85 files changed, 41221 insertions(+), 51694 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5852eb93/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 4fdc41b..6fc38a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -366,15 +366,17 @@ mesos_mesos_LDADD = libmesos.la
# Need to distribute/install webui javascript.
nobase_dist_webui_DATA += \
- webui/master/static/controllers.js \
- webui/master/static/app.js \
- webui/master/static/dashboard.js \
- webui/master/static/jquery.pailer.js
+ webui/master/static/js/controllers.js \
+ webui/master/static/js/app.js \
+ webui/master/static/js/dashboard.js \
+ webui/master/static/js/jquery.pailer.js
# Need to distribute/install webui CSS.
nobase_dist_webui_DATA += \
- webui/master/static/graph.css \
- webui/master/static/mesos.css
+ 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/graph.css \
+ webui/master/static/css/mesos.css
# Need to distribute/install webui HTML.
nobase_dist_webui_DATA += \
@@ -391,63 +393,31 @@ nobase_dist_webui_DATA += \
webui/master/static/slaves.html
# Need to distribute/install webui images.
-nobase_dist_webui_DATA += webui/master/static/loading.gif
+nobase_dist_webui_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 third-party javascript.
nobase_dist_webui_DATA += \
- webui/master/static/angular-1.0.7.js \
- webui/master/static/angular-1.0.7.min.js \
- webui/master/static/ui-bootstrap-tpls-0.4.0.js \
- webui/master/static/ui-bootstrap-tpls-0.4.0.min.js \
- webui/master/static/underscore-1.4.3.js \
- webui/master/static/underscore-1.4.3.min.js \
- webui/master/static/cubism.v1.js \
- webui/master/static/cubism.v1.min.js \
- webui/master/static/d3.v2.js \
- webui/master/static/d3.v2.min.js \
- webui/master/static/relative-date.js \
- webui/master/static/zeroclipboard-1.1.7.js \
- webui/master/static/zeroclipboard-1.1.7.min.js \
+ webui/master/static/js/angular-1.0.7.js \
+ webui/master/static/js/angular-1.0.7.min.js \
+ webui/master/static/js/ui-bootstrap-tpls-0.4.0.js \
+ webui/master/static/js/ui-bootstrap-tpls-0.4.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/cubism.v1.js \
+ webui/master/static/js/cubism.v1.min.js \
+ webui/master/static/js/d3.v2.js \
+ webui/master/static/js/d3.v2.min.js \
+ webui/master/static/js/jquery-1.7.1.js \
+ webui/master/static/js/jquery-1.7.1.min.js \
+ webui/master/static/js/relative-date.js \
+ webui/master/static/js/zeroclipboard-1.1.7.js \
+ webui/master/static/js/zeroclipboard-1.1.7.min.js \
webui/master/static/obj/zeroclipboard-1.1.7.swf
-# Need to distribute/install bootstrap.
-nobase_dist_webui_DATA += \
- webui/master/static/bootstrap/css/bootstrap-responsive-2.3.2.min.css \
- webui/master/static/bootstrap/css/bootstrap-2.3.2.min.css \
- webui/master/static/bootstrap/css/docs.css \
- webui/master/static/bootstrap/ico/favicon.ico \
- webui/master/static/bootstrap/img/bird.png \
- webui/master/static/bootstrap/img/bootstrap-mdo-sfmoma-01.jpg \
- webui/master/static/bootstrap/img/bootstrap-mdo-sfmoma-02.jpg \
- webui/master/static/bootstrap/img/bootstrap-mdo-sfmoma-03.jpg \
- webui/master/static/bootstrap/img/browsers.png \
- webui/master/static/bootstrap/img/github-16px.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_009_magic.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_042_group.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_079_podium.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_082_roundabout.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_155_show_thumbnails.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_163_iphone.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_214_resize_small.png \
- webui/master/static/bootstrap/img/glyphicons/glyphicons_266_book_open.png \
- webui/master/static/bootstrap/img/glyphicons-halflings-white.png \
- webui/master/static/bootstrap/img/glyphicons-halflings.png \
- webui/master/static/bootstrap/img/grid-18px-masked.png \
- webui/master/static/bootstrap/img/icon-css3.png \
- webui/master/static/bootstrap/img/icon-github.png \
- webui/master/static/bootstrap/img/icon-html5.png \
- webui/master/static/bootstrap/img/icon-twitter.png \
- webui/master/static/bootstrap/img/less-logo-large.png \
- webui/master/static/bootstrap/img/less-small.png \
- webui/master/static/bootstrap/img/responsive-illustrations.png \
- webui/master/static/bootstrap/js/application.js \
- webui/master/static/bootstrap/js/google-code-prettify/prettify.css \
- webui/master/static/bootstrap/js/google-code-prettify/prettify.js \
- webui/master/static/bootstrap/js/jquery-1.7.1.js \
- webui/master/static/bootstrap/js/jquery-1.7.1.min.js \
- webui/master/static/bootstrap/js/README.md
-
-
# And the deploy related stuff.
nodist_sbin_SCRIPTS += deploy/mesos-daemon.sh \
deploy/mesos-start-cluster.sh deploy/mesos-start-masters.sh \