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/02 11:50:21 UTC
ignite git commit: IGNITE-843 Fixed title.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 cec0a7eb4 -> 47522d24f
IGNITE-843 Fixed title.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47522d24
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47522d24
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47522d24
Branch: refs/heads/ignite-843-rc2
Commit: 47522d24f09d5c6be3eabd19220a9f46442f7f6c
Parents: cec0a7e
Author: Andrey <an...@gridgain.com>
Authored: Tue Feb 2 17:50:17 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Feb 2 17:50:17 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/logo/main.js | 38 ++++++++++++++----
.../src/main/js/public/stylesheets/style.scss | 42 ++++++++------------
.../src/main/js/views/includes/header.jade | 37 +++++++++--------
.../src/main/js/views/login.jade | 9 +++--
4 files changed, 75 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/47522d24/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 0851ec2..aa41a72 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
@@ -16,6 +16,7 @@
*/
import templateLogo from './logo.jade!';
+const templateTitle = `<label class= 'title'>{{::title.text}}</label>`;
import templatePoweredByApache from './powered-by-apache.jade!';
import angular from 'angular';
@@ -25,20 +26,27 @@ angular
])
.provider('igniteLogo', function() {
- let _poweredBy = false;
+ let poweredBy = false;
- let _url = '/images/ignite_logo.png';
+ let url = '/images/ignite_logo.png';
- this.url = function(url) {
- _url = url;
+ let title = 'Management console for Apache Ignite';
- _poweredBy = true;
+ this.url = function(_url) {
+ url = _url;
+
+ poweredBy = true;
+ };
+
+ this.title = function(_title) {
+ title = _title;
};
this.$get = [function() {
return {
- url: _url,
- poweredBy: _poweredBy
+ url,
+ poweredBy,
+ title
};
}];
})
@@ -71,4 +79,20 @@ angular
controllerAs: 'logo',
replace: true
};
+ }])
+ .directive('igniteTitle', ['igniteLogo', function(igniteLogo) {
+ function controller() {
+ const ctrl = this;
+
+ ctrl.text = igniteLogo.title;
+ }
+
+ return {
+ restrict: 'E',
+ template: templateTitle,
+ controller,
+ controllerAs: 'title',
+ replace: true
+ };
}]);
+
http://git-wip-us.apache.org/repos/asf/ignite/blob/47522d24/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index f29c956..676c155 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -66,7 +66,7 @@ hr {
.navbar-brand {
padding: 5px 0;
- margin-right: 15px;
+ margin: 10px 0;
}
.modal.center .modal-dialog {
@@ -220,30 +220,28 @@ ul.navbar-nav, .sidebar-nav {
font-size: 12px;
}
-.header {
- padding: 15px;
-}
+.theme-line header {
+ border-bottom: 8px solid $ignite-border-bottom-color;
-.header .nav.navbar-nav.pull-right {
- position: relative;
- right: -15px;
+ p {
+ color: $ignite-header-color;
+ }
}
-.header .nav.navbar-nav .not-link {
- padding: 15px;
- display: inline-block;
+.header .nav.navbar-nav.pull-right > li > a {
+ padding-right: 0;
}
-.theme-line header {
- border-bottom: 8px solid;
-}
+.header .title {
+ margin: 5px 0;
+ padding: 0 15px;
-.theme-line header p {
- color: $ignite-header-color;
+ font-size: 1.4em;
}
-.theme-line header {
- border-bottom-color: $ignite-border-bottom-color;
+.header .nav.navbar-nav .not-link {
+ padding: 15px;
+ display: inline-block;
}
.nav > li {
@@ -378,8 +376,7 @@ h1, h2, h3, h4, h5, h6 {
@media (min-width: 768px) {
.navbar-nav > li > a {
- padding-top: 18px;
- padding-bottom: 10px;
+ padding: 0 15px;
}
}
@@ -1368,13 +1365,8 @@ input.ng-dirty.ng-invalid, button.ng-dirty.ng-invalid {
}
.viewedUser {
- position: absolute;
- width: 100%;
- left: 0;
-
text-align: center;
-
- margin-top: -15px;
+ background-color: $brand-warning;
}
a {
http://git-wip-us.apache.org/repos/asf/ignite/blob/47522d24/modules/control-center-web/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade
index 2a8b229..e1ed222 100644
--- a/modules/control-center-web/src/main/js/views/includes/header.jade
+++ b/modules/control-center-web/src/main/js/views/includes/header.jade
@@ -17,22 +17,27 @@
header#header.header
.viewedUser(ng-show='$root.user.becomeUsed')
| Currently assuming #[strong {{$root.user.username}}], #[a(ng-click='$root.revertIdentity()') revert to your identity].
- .container
- ignite-logo
- .navbar-collapse.collapse(ng-if='$root.user')
- ul.nav.navbar-nav(ignite-configuration-sidebar ignite-navbar)
- li(ng-class='{active: $state.includes("base.configuration")}')
- a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
- span.caret
+ table.container
+ tr
+ td.col-xs-3.col-sm-3.col-md-2(rowspan='2')
+ ignite-logo
+ td
+ ignite-title
+ tr
+ td.navbar-collapse.collapse(ng-if='$root.user')
+ ul.nav.navbar-nav(ignite-configuration-sidebar ignite-navbar)
+ li(ng-class='{active: $state.includes("base.configuration")}')
+ a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
+ span.caret
- li.sql-notebooks(ng-class='{active: $state.includes("base.sql")}' ng-controller='notebooks')
- a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-left') SQL
- span.caret
+ li.sql-notebooks(ng-class='{active: $state.includes("base.sql")}' ng-controller='notebooks')
+ a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-left') SQL
+ span.caret
- li(ui-sref-active='active' ng-repeat='item in navbar.items')
- a(ui-sref='{{::item.sref}}') {{::item.text}}
+ li(ui-sref-active='active' ng-repeat='item in navbar.items')
+ a(ui-sref='{{::item.sref}}') {{::item.text}}
- ul.nav.navbar-nav.pull-right(ignite-settings)
- li(ng-class='{active: $state.includes("settings")}')
- a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='settings.items' data-placement='bottom-right') {{user.username}}
- span.caret
+ ul.nav.navbar-nav.pull-right(ignite-settings)
+ li(ng-class='{active: $state.includes("settings")}')
+ a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='settings.items' data-placement='bottom-right') {{user.username}}
+ span.caret
http://git-wip-us.apache.org/repos/asf/ignite/blob/47522d24/modules/control-center-web/src/main/js/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade
index dfba894..5ef5b55 100644
--- a/modules/control-center-web/src/main/js/views/login.jade
+++ b/modules/control-center-web/src/main/js/views/login.jade
@@ -21,9 +21,12 @@ mixin lblRequired(txt)
label.col-xs-3.col-md-3.required #{txt}
header#header.header
- .container
- ignite-logo
- p.navbar-text(style='font-size: 18px;') Apache Ignite Web Console
+ table.container
+ tr
+ td.col-xs-3.col-sm-3.col-md-2(rowspan='2')
+ ignite-logo
+ td(style='padding-top: 20px')
+ ignite-title
.container.body-container
.main-content(ng-controller='auth')