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 dropdown order.
Date Tue, 22 Sep 2015 06:33:52 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 3fac67a1e -> b4fe39a05


# IGNITE-843 Fixed dropdown order.


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

Branch: refs/heads/ignite-843
Commit: b4fe39a050b8171e4498c6bf856265d679a20891
Parents: 3fac67a
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Sep 22 13:33:55 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Sep 22 13:33:55 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/caches-controller.js    |  4 +--
 .../src/main/js/public/stylesheets/style.scss   | 38 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b4fe39a0/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 0b0516b..d616900 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -234,9 +234,9 @@ controlCenterModule.controller('cachesController', [
                     $scope.spaces = data.spaces;
                     $scope.caches = data.caches;
                     $scope.clusters = data.clusters;
-                    $scope.metadatas = _.map(data.metadatas, function (meta) {
+                    $scope.metadatas = _.sortBy(_.map(data.metadatas, function (meta) {
                         return {value: meta._id, label: meta.valueType, kind: meta.kind,
meta: meta}
-                    });
+                    }), 'label');
 
                     // Load page descriptor.
                     $http.get('/models/caches.json')

http://git-wip-us.apache.org/repos/asf/ignite/blob/b4fe39a0/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 c31e507..a15811f 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
@@ -152,25 +152,25 @@ ul.navbar-nav, .sidebar-nav {
     overflow: auto;
     overflow-x: hidden;
 
-     li > a {
-         display: block;
-
-         cursor: default;
-         padding: 3px 5px;
-
-         overflow: hidden;
-         white-space: nowrap;
-         text-overflow: ellipsis;
-
-         i {
-             float: right;
-             color: $brand-primary;
-             background-color: transparent;
-             line-height: $line-height-base;
-             margin-left: 5px;
-             margin-right: 0px;
-         }
-     }
+    li > a {
+        display: block;
+
+        //cursor: default;
+        padding: 3px 10px;
+
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+
+        i {
+            float: right;
+            color: $brand-primary;
+            background-color: transparent;
+            line-height: $line-height-base;
+            margin-left: 5px;
+            margin-right: 0;
+        }
+    }
 }
 
 .theme-line .border-left .sidebar-nav {


Mime
View raw message