You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/09/01 14:33:53 UTC
[1/2] activemq-artemis git commit: This closes #1501
Repository: activemq-artemis
Updated Branches:
refs/heads/master 022d5ba85 -> bfd464277
This closes #1501
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bfd46427
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bfd46427
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bfd46427
Branch: refs/heads/master
Commit: bfd4642777bddae2220a54f7b694cf74b47a2d67
Parents: 022d5ba e8783e3
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 1 10:33:44 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 1 10:33:44 2017 -0400
----------------------------------------------------------------------
.../activemq-branding/src/main/webapp/plugin/js/plugin.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1270 Enforce Theming
Posted by cl...@apache.org.
ARTEMIS-1270 Enforce Theming
On some browsers during initial, storage may have set to another theme, enforce the theme on branding load.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e8783e31
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e8783e31
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e8783e31
Branch: refs/heads/master
Commit: e8783e31d04bf850a0e20925f810cbfcb8ac1bb7
Parents: 022d5ba
Author: Michael Andre Pearce <Mi...@me.com>
Authored: Fri Sep 1 06:04:41 2017 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 1 10:33:44 2017 -0400
----------------------------------------------------------------------
.../activemq-branding/src/main/webapp/plugin/js/plugin.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e8783e31/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
index 0388053..9785105 100644
--- a/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
+++ b/artemis-hawtio/activemq-branding/src/main/webapp/plugin/js/plugin.js
@@ -59,10 +59,14 @@ var activemqBranding = (function (self) {
self.module = angular.module(self.pluginName, ['hawtioCore']);
self.module.run(function (branding) {
- self.log.debug("ActivMQ theme loaded");
+ self.log.info("ActiveMQ theme loaded");
+ if (localStorage['theme'] != 'activemq' || localStorage['branding'] != 'activemq') {
+ localStorage['theme'] = 'activemq';
+ localStorage['branding'] = 'activemq';
+ location.reload();
+ }
});
-
- hawtioPluginLoader.addModule(self.pluginName);
return self;
})(activemqBranding || {});
+hawtioPluginLoader.addModule(activemqBranding.pluginName);