You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/03 11:56:45 UTC
[20/50] ignite git commit: IGNITE-843 Added powered by icon.
IGNITE-843 Added powered by icon.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e875a1ec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e875a1ec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e875a1ec
Branch: refs/heads/ignite-843-rc3
Commit: e875a1eca3c8bc2c004dd5a82486f451799c9ddf
Parents: 5f0e80d
Author: Andrey <an...@gridgain.com>
Authored: Mon Feb 1 18:07:50 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Feb 1 18:07:50 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/logo/main.js | 21 ++++++++++++++++---
.../js/app/modules/logo/powered-by-apache.jade | 18 ++++++++++++++++
.../src/main/js/public/images/pb-ignite.png | Bin 0 -> 7255 bytes
.../src/main/js/public/images/pb-ignite@2x.png | Bin 0 -> 21736 bytes
.../src/main/js/views/includes/footer.jade | 8 +++++--
5 files changed, 42 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e875a1ec/modules/control-center-web/src/main/js/app/modules/logo/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/logo/main.js b/modules/control-center-web/src/main/js/app/modules/logo/main.js
index e8b986e..0851ec2 100644
--- a/modules/control-center-web/src/main/js/app/modules/logo/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/logo/main.js
@@ -15,7 +15,8 @@
* limitations under the License.
*/
-import template from './logo.jade!';
+import templateLogo from './logo.jade!';
+import templatePoweredByApache from './powered-by-apache.jade!';
import angular from 'angular';
@@ -41,17 +42,31 @@ angular
};
}];
})
+ .directive('ignitePoweredByApache', ['igniteLogo', function(igniteLogo) {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.show = igniteLogo.poweredBy;
+ }
+
+ return {
+ restrict: 'E',
+ template: templatePoweredByApache,
+ controller,
+ controllerAs: 'poweredBy',
+ replace: true
+ };
+ }])
.directive('igniteLogo', ['igniteLogo', function(igniteLogo) {
function controller() {
const ctrl = this;
ctrl.url = igniteLogo.url;
- ctrl.poweredBy = igniteLogo.poweredBy;
}
return {
restrict: 'E',
- template,
+ template: templateLogo,
controller,
controllerAs: 'logo',
replace: true
http://git-wip-us.apache.org/repos/asf/ignite/blob/e875a1ec/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade b/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade
new file mode 100644
index 0000000..af9aadf
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/logo/powered-by-apache.jade
@@ -0,0 +1,18 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+a(ng-if='poweredBy.show' href='//ignite.apache.org' target='_blank')
+ img(ng-src='/images/pb-ignite.png' height='65')
http://git-wip-us.apache.org/repos/asf/ignite/blob/e875a1ec/modules/control-center-web/src/main/js/public/images/pb-ignite.png
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/images/pb-ignite.png b/modules/control-center-web/src/main/js/public/images/pb-ignite.png
new file mode 100644
index 0000000..7785c53
Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/pb-ignite.png differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/e875a1ec/modules/control-center-web/src/main/js/public/images/pb-ignite@2x.png
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/images/pb-ignite@2x.png b/modules/control-center-web/src/main/js/public/images/pb-ignite@2x.png
new file mode 100644
index 0000000..9723a40
Binary files /dev/null and b/modules/control-center-web/src/main/js/public/images/pb-ignite@2x.png differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/e875a1ec/modules/control-center-web/src/main/js/views/includes/footer.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/footer.jade b/modules/control-center-web/src/main/js/views/includes/footer.jade
index e8a3623..d057835 100644
--- a/modules/control-center-web/src/main/js/views/includes/footer.jade
+++ b/modules/control-center-web/src/main/js/views/includes/footer.jade
@@ -16,5 +16,9 @@
.container.container-footer
footer
- center(ignite-terms)
- p(ng-repeat='item in terms.footerRows' ng-bind-html='item')
+ .col-md-offset-1.col-md-10
+ center(ignite-terms)
+ p(ng-repeat='item in terms.footerRows' ng-bind-html='item')
+ .col-md-1
+ .pull-right
+ ignite-powered-by-apache