Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A12517782 for ; Fri, 22 Jan 2016 07:14:25 +0000 (UTC) Received: (qmail 9715 invoked by uid 500); 22 Jan 2016 07:14:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 9639 invoked by uid 500); 22 Jan 2016 07:14:24 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 9441 invoked by uid 99); 22 Jan 2016 07:14:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jan 2016 07:14:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89AC2E0A12; Fri, 22 Jan 2016 07:14:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Fri, 22 Jan 2016 07:14:31 -0000 Message-Id: <39e62ace692242e1a5ae3e08dd21fb15@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/10] ignite git commit: IGNITE-2348 Fixed ui. 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-rc3 Commit: bfd9b54d4a49342ad350a2e39056809caa8950b5 Parents: c45e4dc Author: Andrey Authored: Fri Jan 22 09:35:52 2016 +0700 Committer: Andrey 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')