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/01/22 03:35:22 UTC
ignite git commit: IGNITE-2348 Fixed ui.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 c45e4dc50 -> bfd9b54d4
IGNITE-2348 Fixed ui.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bfd9b54d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bfd9b54d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bfd9b54d
Branch: refs/heads/ignite-843-rc2
Commit: bfd9b54d4a49342ad350a2e39056809caa8950b5
Parents: c45e4dc
Author: Andrey <an...@gridgain.com>
Authored: Fri Jan 22 09:35:52 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jan 22 09:35:52 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 8 ++++++--
.../src/main/js/public/stylesheets/style.scss | 10 ++++++++++
.../src/main/js/views/includes/header.jade | 2 +-
.../src/main/js/views/templates/dropdown.jade | 2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index e74223b..ef460a1 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -2229,8 +2229,7 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$
$scope.$root.rebuildDropdown = function() {
$scope.notebookDropdown = [
{text: 'Create new notebook', click: 'inputNotebookName()'},
- {divider: true},
- {text: 'SQL demo', sref: 'base.sql.demo'}
+ {divider: true}
];
_.forEach($scope.$root.notebooks, function (notebook) {
@@ -2239,6 +2238,11 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$
sref: 'base.sql.notebook({noteId:"' + notebook._id + '"})'
});
});
+
+ if ($scope.$root.notebooks.length > 0)
+ $scope.notebookDropdown.push({divider: true});
+
+ $scope.notebookDropdown.push({text: 'SQL demo', sref: 'base.sql.demo', custom: true});
};
$scope.$root.reloadNotebooks = function() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/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 b37b1ad..02c3410 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
@@ -552,6 +552,16 @@ button.form-control {
}
}
+.theme-line .sql-notebooks {
+ li.custom > a {
+ color: $brand-info;
+ }
+
+ li.custom > a:hover {
+ color: darken($brand-info, 15%);
+ }
+}
+
.theme-line .paragraphs {
.panel-group .panel + .panel {
margin-top: 30px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/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 857f7a4..9566611 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
@@ -28,7 +28,7 @@ header#header.header
a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
span.caret
- li(ng-class='{active: $state.includes("base.sql")}' ng-controller='notebooks')
+ 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/modules/control-center-web/src/main/js/views/templates/dropdown.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/dropdown.jade b/modules/control-center-web/src/main/js/views/templates/dropdown.jade
index 708695f..862dbcd 100644
--- a/modules/control-center-web/src/main/js/views/templates/dropdown.jade
+++ b/modules/control-center-web/src/main/js/views/templates/dropdown.jade
@@ -1,5 +1,5 @@
ul.dropdown-menu(tabindex='-1' role='menu' ng-show='content && content.length')
- li(role='presentation' ui-sref-active='active' ng-class='{divider: item.divider, active: item.active}' ng-repeat='item in content')
+ li(role='presentation' ui-sref-active='active' ng-class='{divider: item.divider, active: item.active, custom: item.custom}' ng-repeat='item in content')
a(role='menuitem' tabindex='-1' ui-sref='{{item.sref}}' ng-if='!item.divider && item.sref' ng-bind='item.text')
a(role='menuitem' tabindex='-1' ng-href='{{item.href}}' ng-if='!item.divider && item.href' target="{{item.target || ''}}" ng-bind='item.text')
a(role='menuitem' tabindex='-1' href='javascript:void(0)' ng-if='!item.divider && item.click' ng-click='$eval(item.click);$hide()' ng-bind='item.text')