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/07/08 06:27:54 UTC
[08/17] ignite git commit: UI improvements in header.
UI improvements in header.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b75b1205
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b75b1205
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b75b1205
Branch: refs/heads/ignite-3262
Commit: b75b1205ca46a1b6b6014185ccaac133f5672867
Parents: 1f46ff1
Author: Andrey Novikov <an...@apache.org>
Authored: Thu Jul 7 10:15:59 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Thu Jul 7 10:15:59 2016 +0700
----------------------------------------------------------------------
.../src/main/js/views/includes/header.jade | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b75b1205/modules/web-console/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/includes/header.jade b/modules/web-console/src/main/js/views/includes/header.jade
index 2b66d82..28632fb 100644
--- a/modules/web-console/src/main/js/views/includes/header.jade
+++ b/modules/web-console/src/main/js/views/includes/header.jade
@@ -23,16 +23,17 @@ header#header.header
ignite-header-logo
td(ng-if='$root.user' style='padding-top: 20px')
ul.nav.navbar-nav(ignite-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
+ li(ng-class='{active: $state.includes("base.configuration")}' bs-dropdown='sidebar.items' data-placement='bottom-right' data-trigger='hover click' data-container='self' data-animation='')
+ a.dropdown-toggle Configuration
span.caret
- li.sql-notebooks(ng-class='{active: $state.includes("base.sql")}' ng-controller='notebooks')
+ ul.nav.navbar-nav(ng-controller='notebooks')
+ li.sql-notebooks(ng-if='!notebooks.length' ng-class='{active: $state.includes("base.sql")}' )
a(ng-if='IgniteDemoMode' ui-sref='base.sql.demo') SQL
+ a(ng-if='!IgniteDemoMode' ng-click='inputNotebookName()') SQL
- a(ng-if='!IgniteDemoMode && !notebooks.length' ng-click='inputNotebookName()') SQL
-
- a.dropdown-toggle(ng-if='!IgniteDemoMode && notebooks.length' data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-left') SQL
+ li.sql-notebooks(ng-if='notebooks.length' ng-class='{active: $state.includes("base.sql")}' bs-dropdown='notebookDropdown' data-placement='bottom-left' data-trigger='hover click' data-container='self' data-animation='')
+ a.dropdown-toggle() SQL
span.caret
li(ui-sref-active='active' ng-repeat='item in navbar.items')
@@ -43,6 +44,6 @@ header#header.header
button.btn.btn-info(ng-if='!IgniteDemoMode' ng-click='startDemo()') Start demo
ul.nav.navbar-nav.pull-right(ignite-userbar)
- li(ng-class='{active: $state.includes("settings")}')
- a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='userbar.items' data-placement='bottom-right') {{user.firstName}} {{user.lastName}}
+ li(bs-dropdown='userbar.items' data-placement='bottom-right' data-trigger='hover click' data-container='self' data-animation='' ng-class='{active: $state.includes("settings")}')
+ a.dropdown-toggle {{user.firstName}} {{user.lastName}}
span.caret