You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/03/19 21:18:12 UTC
[09/10] storm git commit: Merge branch 'STORM-570' of
https://github.com/revans2/incubator-storm
Merge branch 'STORM-570' of https://github.com/revans2/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/43ed102f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/43ed102f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/43ed102f
Branch: refs/heads/master
Commit: 43ed102f25dd5df5b7e43205dfc96a157b7a715b
Parents: bb8d48d b54b3b4
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Thu Mar 19 15:16:08 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Thu Mar 19 15:16:08 2015 -0500
----------------------------------------------------------------------
LICENSE | 117 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 47 +-
.../src/clj/backtype/storm/ui/helpers.clj | 21 -
storm-core/src/ui/public/component.html | 167 +-
.../src/ui/public/css/bootstrap-1.4.0.css | 2469 ------------------
.../src/ui/public/css/bootstrap-3.3.1.min.css | 5 +
.../src/ui/public/css/dataTables.bootstrap.css | 319 +++
.../public/css/jquery.dataTables.1.10.4.min.css | 1 +
storm-core/src/ui/public/css/style.css | 94 +-
.../src/ui/public/images/back_disabled.png | Bin 0 -> 1361 bytes
.../src/ui/public/images/back_enabled.png | Bin 0 -> 1379 bytes
.../src/ui/public/images/back_enabled_hover.png | Bin 0 -> 1375 bytes
.../src/ui/public/images/forward_disabled.png | Bin 0 -> 1363 bytes
.../src/ui/public/images/forward_enabled.png | Bin 0 -> 1380 bytes
.../ui/public/images/forward_enabled_hover.png | Bin 0 -> 1379 bytes
storm-core/src/ui/public/images/sort_asc.png | Bin 0 -> 1118 bytes
.../src/ui/public/images/sort_asc_disabled.png | Bin 0 -> 2916 bytes
storm-core/src/ui/public/images/sort_both.png | Bin 0 -> 1136 bytes
storm-core/src/ui/public/images/sort_desc.png | Bin 0 -> 1127 bytes
.../src/ui/public/images/sort_desc_disabled.png | Bin 0 -> 1045 bytes
storm-core/src/ui/public/index.html | 99 +-
.../src/ui/public/js/bootstrap-3.3.1.min.js | 7 +
storm-core/src/ui/public/js/bootstrap-twipsy.js | 310 ---
.../ui/public/js/dataTables.bootstrap.min.js | 8 +
.../src/ui/public/js/jquery-1.11.1.min.js | 4 +
storm-core/src/ui/public/js/jquery-1.6.2.min.js | 18 -
.../public/js/jquery.dataTables.1.10.4.min.js | 157 ++
.../src/ui/public/js/jquery.tablesorter.min.js | 5 -
storm-core/src/ui/public/js/script.js | 86 +-
.../templates/component-page-template.html | 128 +-
.../public/templates/index-page-template.html | 52 +-
.../templates/topology-page-template.html | 90 +-
.../src/ui/public/templates/user-template.html | 2 +-
storm-core/src/ui/public/topology.html | 132 +-
34 files changed, 1079 insertions(+), 3259 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/43ed102f/storm-core/src/clj/backtype/storm/daemon/logviewer.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/43ed102f/storm-core/src/clj/backtype/storm/ui/helpers.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/43ed102f/storm-core/src/ui/public/index.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/index.html
index 2dda07a,f991555..0c5ea10
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@@ -28,24 -32,45 +32,46 @@@
<script src="/js/script.js" type="text/javascript"></script>
</head>
<body>
- <div id="ui-user">
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-md-11">
+ <h1><a href="/">Storm UI</a></h1>
+ </div>
+ <div id="ui-user" class="col-md-1"></div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Cluster Summary</h2>
+ <div id="cluster-summary"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Topology Summary</h2>
+ <div id="topology-summary"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Supervisor Summary</h2>
+ <div id="supervisor-summary"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Nimbus Configuration</h2>
+ <div id="nimbus-configuration"></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <div id="json-response-error"></div>
+ </div>
+ </div>
</div>
- <h1><a href="/">Storm UI</a></h1>
- <h2>Cluster Summary</h2>
- <div id="cluster-summary">
- </div>
- <h2>Topology summary</h2>
- <div id="topology-summary">
- </div>
- <h2>Supervisor summary</h2>
- <div id="supervisor-summary">
- </div>
- <h2>Nimbus Configuration</h2>
- <div id="nimbus-configuration"></div>
- <div id="json-response-error"></div>
</body>
<script>
+
$(document).ajaxStop($.unblockUI);
$(document).ajaxStart(function(){
$.blockUI({ message: '<img src="images/spinner.gif" /> <h3>Loading summary...</h3>'});
http://git-wip-us.apache.org/repos/asf/storm/blob/43ed102f/storm-core/src/ui/public/templates/component-page-template.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/43ed102f/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------