You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/09/17 21:00:50 UTC
[1/4] storm git commit: fix flux icon formatting
Repository: storm
Updated Branches:
refs/heads/master 83fea15d7 -> b9e841d11
fix flux icon formatting
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/66ce42a5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/66ce42a5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/66ce42a5
Branch: refs/heads/master
Commit: 66ce42a5620bda5a26b510cf8bde131ecb4c811e
Parents: 8f9061a
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Thu Sep 13 15:19:54 2018 -0400
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Thu Sep 13 15:19:54 2018 -0400
----------------------------------------------------------------------
.../main/java/org/apache/storm/daemon/ui/WEB-INF/index.html | 7 +------
.../storm/daemon/ui/WEB-INF/templates/user-template.html | 7 +++++++
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/66ce42a5/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
index 817eff6..ff73146 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
@@ -37,15 +37,10 @@
<body>
<div class="container-fluid">
<div class="row">
+ <div id="ui-user" class="col-md-2"></div>
<div class="col-md-9">
<h1><a href="/">Storm UI</a></h1>
</div>
- <div id="ui-user" class="col-md-2"></div>
- <div id="ui-flux" class="col-md-1">
- <a href="/flux.html">
- <img src="/images/flux.png" alt="Storm Flux YAML Viewer">
- </a>
- </div>
</div>
<div class="row">
<div class="col-md-12">
http://git-wip-us.apache.org/repos/asf/storm/blob/66ce42a5/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
index 853f0c9..1cd8d9e 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
@@ -16,6 +16,13 @@
-->
<script id="user-template" type="text/html">
<div class="ui-user">
+ <span data-toggle="tooltip" data-placement="bottom" data-original-title="Storm Flux YAML Viewer">
+ <a href="/flux.html" target="_blank"><img src="/images/flux.png" class="image_pre_format"></a>
+ </span>
+ <span data-toggle="tooltip" data-placement="bottom" data-original-title="Storm Flux YAML Viewer.">
+ <a href="/flux.html" target="_blank"><image src="/images/flux.png" class="image_pre_format"/></a>
+ </span>
+
{{#central-log-url}}
<span data-toggle="tooltip" data-placement="bottom" data-original-title="Link to Central Logging">
<a href="{{central-log-url}}" target="_blank"><image src="/images/statistic.png" class="image_pre_format"/></a>
[4/4] storm git commit: Merge branch 'fix-flux-icon-formatting' of
https://github.com/kishorvpatil/incubator-storm into STORM-3224
Posted by bo...@apache.org.
Merge branch 'fix-flux-icon-formatting' of https://github.com/kishorvpatil/incubator-storm into STORM-3224
STORM-3224: Fix FLUX YAML Viewer icon location/position on UI page
This closes #2831
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b9e841d1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b9e841d1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b9e841d1
Branch: refs/heads/master
Commit: b9e841d11bcaa7d2cc9673396a95948a508e0853
Parents: 83fea15 8b0b7fe
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 17 15:53:33 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 17 15:53:33 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html | 5 -----
.../apache/storm/daemon/ui/WEB-INF/templates/user-template.html | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: Merge branch 'master' of
github.com:apache/storm into fix-flux-icon-formatting
Posted by bo...@apache.org.
Merge branch 'master' of github.com:apache/storm into fix-flux-icon-formatting
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/13e4f84e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/13e4f84e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/13e4f84e
Branch: refs/heads/master
Commit: 13e4f84e0c6ff1c8c3058db646666e6e615942ee
Parents: 66ce42a 37d22b8
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Sep 17 14:45:16 2018 -0400
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Sep 17 14:45:16 2018 -0400
----------------------------------------------------------------------
conf/defaults.yaml | 3 +
docs/Powered-By.md | 1038 ------------------
.../apache/storm/kafka/spout/KafkaSpout.java | 5 +-
.../jvm/org/apache/storm/StormSubmitter.java | 6 +-
.../apache/storm/security/auth/ReqContext.java | 70 +-
.../jvm/org/apache/storm/tuple/TupleImpl.java | 2 +-
.../storm/validation/ConfigValidation.java | 8 +
.../java/org/apache/storm/DaemonConfig.java | 18 +
.../org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
.../storm/daemon/supervisor/Supervisor.java | 2 +-
.../scheduling/BaseResourceAwareStrategy.java | 2 +-
storm-webapp/pom.xml | 2 +-
.../apache/storm/daemon/drpc/DRPCServer.java | 3 +-
.../storm/daemon/logviewer/LogviewerServer.java | 3 +-
.../logviewer/utils/LogFileDownloader.java | 2 +-
.../org/apache/storm/daemon/ui/UIHelpers.java | 454 +++++++-
.../org/apache/storm/daemon/ui/UIServer.java | 4 +-
.../storm/daemon/ui/WEB-INF/component.html | 189 ++--
.../daemon/ui/WEB-INF/deep_search_result.html | 194 ++--
.../apache/storm/daemon/ui/WEB-INF/index.html | 133 ++-
.../apache/storm/daemon/ui/WEB-INF/js/script.js | 10 +-
.../daemon/ui/WEB-INF/logviewer_search.html | 36 +-
.../storm/daemon/ui/WEB-INF/search_result.html | 98 +-
.../storm/daemon/ui/WEB-INF/supervisor.html | 22 +-
.../storm/daemon/ui/WEB-INF/topology.html | 27 +-
.../DefaultExceptionMapper.java | 2 +-
.../daemon/ui/filters/AuthorizedUserFilter.java | 23 +-
27 files changed, 951 insertions(+), 1407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/13e4f84e/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
----------------------------------------------------------------------
[3/4] storm git commit: Fix ui-user position on the index page
Posted by bo...@apache.org.
Fix ui-user position on the index page
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8b0b7fe3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8b0b7fe3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8b0b7fe3
Branch: refs/heads/master
Commit: 8b0b7fe3ab75bef87cb1723205c54df58c8279d4
Parents: 13e4f84
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Mon Sep 17 15:44:31 2018 -0400
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Mon Sep 17 15:44:31 2018 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html | 2 +-
.../apache/storm/daemon/ui/WEB-INF/templates/user-template.html | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8b0b7fe3/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
index ee71fdd..545c157 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/index.html
@@ -37,10 +37,10 @@
<body>
<div class="container-fluid">
<div class="row">
- <div id="ui-user" class="col-md-2"></div>
<div class="col-md-9">
<h1><a href="/">Storm UI</a></h1>
</div>
+ <div id="ui-user" class="col-md-2"></div>
</div>
<div class="row">
<div class="col-md-12">
http://git-wip-us.apache.org/repos/asf/storm/blob/8b0b7fe3/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
index 1cd8d9e..742d2da 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/templates/user-template.html
@@ -19,10 +19,6 @@
<span data-toggle="tooltip" data-placement="bottom" data-original-title="Storm Flux YAML Viewer">
<a href="/flux.html" target="_blank"><img src="/images/flux.png" class="image_pre_format"></a>
</span>
- <span data-toggle="tooltip" data-placement="bottom" data-original-title="Storm Flux YAML Viewer.">
- <a href="/flux.html" target="_blank"><image src="/images/flux.png" class="image_pre_format"/></a>
- </span>
-
{{#central-log-url}}
<span data-toggle="tooltip" data-placement="bottom" data-original-title="Link to Central Logging">
<a href="{{central-log-url}}" target="_blank"><image src="/images/statistic.png" class="image_pre_format"/></a>