ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Fixed configuration sidebar
Date Fri, 04 Dec 2015 03:36:52 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 d9afa7bda -> fb2f6fc5e


IGNITE-843 Fixed configuration sidebar


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb2f6fc5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb2f6fc5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb2f6fc5

Branch: refs/heads/ignite-843-rc2
Commit: fb2f6fc5ed95b1920fe48544703344c8dd361c34
Parents: d9afa7b
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Dec 4 10:36:38 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Dec 4 10:36:38 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/app/modules/configuration/sidebar/main.js | 10 +++++-----
 .../src/main/js/views/configuration/sidebar.jade          |  5 +----
 .../src/main/js/views/includes/header.jade                |  6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb2f6fc5/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
b/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
index 8d34064..a8767e8 100644
--- a/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
@@ -23,10 +23,10 @@ angular
 ])
 .provider('igniteConfigurationSidebar', function() {
     var items = [
-        { label: 'Clusters', href: '/configuration/clusters' },
-        { label: 'Caches', href: '/configuration/caches' },
-        { label: 'Metadata', href: '/configuration/metadata' },
-        { label: 'IGFS', href: '/configuration/igfs' }
+        { text: 'Clusters', href: '/configuration/clusters' },
+        { text: 'Caches', href: '/configuration/caches' },
+        { text: 'Metadata', href: '/configuration/metadata' },
+        { text: 'IGFS', href: '/configuration/igfs' }
     ];
 
     this.push = function(data) {
@@ -36,7 +36,7 @@ angular
     this.$get = [function() {
         var r = angular.copy(items);
 
-        r.push({ label: 'Summary', href: '/configuration/summary' });
+        r.push({ text: 'Summary', href: '/configuration/summary' });
 
         return r;
     }]

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb2f6fc5/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/sidebar.jade b/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
index f20be95..baf348d 100644
--- a/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
@@ -23,10 +23,7 @@
                         span.fa-stack
                             i.fa.fa-circle-thin.fa-stack-2x
                             i.fa.fa-stack-1x {{::$index + 1}}
-                        | {{::item.label}}
-                    ul(ng-if='item.subItems' style='margin-left:30px')
-                        li(ng-repeat='subItem in item.subItems')
-                            a(ng-class='{active: isActive("{{::subItem.href}}")}' href='{{::subItem.href}}')
{{::subItem.label}}
+                        | {{::item.text}}
 
     .col-xs-9.col-sm-9.col-md-10.border-left.section-right
         .docs-content(ui-view='')

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb2f6fc5/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 7b2a1c8..497d963 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
@@ -23,9 +23,9 @@ header#header.header
         h1.navbar-brand
             a(href='/') Apache Ignite Web Console
         .navbar-collapse.collapse(ng-if='$root.user' ng-controller='activeLink' )
-            ul.nav.navbar-nav(ignite-navbar)
+            ul.nav.navbar-nav
                 li
-                    a.dropdown-toggle(ng-class='{active: isActive("/configuration.*")}' data-toggle='dropdown'
bs-dropdown='configurationDropdown' data-placement='bottom-right') Configuration
+                    a.dropdown-toggle(ignite-configuration-sidebar ng-class='{active: isActive("/configuration.*")}'
data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
                         span.caret
 
                 li(ng-controller='notebooks')
@@ -33,7 +33,7 @@ header#header.header
                         span.caret
                     a(ng-hide='$root.notebooks.length > 0' ng-click='inputNotebookName()')
SQL
 
-                li(ng-repeat='item in navbar.items')
+                li(ignite-navbar ng-repeat='item in navbar.items')
                     a(ng-class='{active: isActive(item.href)}' ng-href='{{::item.href}}')
{{::item.title}}
 
             ul.nav.navbar-nav.pull-right(ignite-userbar)


Mime
View raw message