ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject incubator-ignite git commit: # ignite-843 WIP.
Date Wed, 03 Jun 2015 07:43:15 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 01c079c9d -> d06a9157d


# ignite-843 WIP.


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

Branch: refs/heads/ignite-843
Commit: d06a9157d87f727ebd48398008b9c22579cf4c6f
Parents: 01c079c
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Jun 3 14:43:20 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Jun 3 14:43:20 2015 +0700

----------------------------------------------------------------------
 .../public/javascripts/controllers/clusters.js  |  1 +
 .../public/javascripts/controllers/common.js    |  5 +-
 .../nodejs/public/stylesheets/style.css         |  2 +-
 .../nodejs/public/stylesheets/style.less        | 21 +++++++-
 modules/webconfig/nodejs/views/clusters.jade    | 54 +++++++++++---------
 .../webconfig/nodejs/views/layout-sidebar.jade  |  4 +-
 .../nodejs/views/templates/select.jade          |  2 +-
 7 files changed, 59 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
index 84a0864..9ab90a1 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
@@ -17,6 +17,7 @@
 
 configuratorModule.controller('clustersController', ['$scope', '$modal', '$http', function($scope,
$modal, $http) {
         $scope.templates = [
+            {value: {}, label: 'None'},
             {value: {discovery: {kind: 'Vm', addresses: ['127.0.0.1:47500..47510']}}, label:
'Local'},
             {value: {discovery: {kind: 'Multicast'}}, label: 'Basic'}
         ];

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/public/javascripts/controllers/common.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/common.js b/modules/webconfig/nodejs/public/javascripts/controllers/common.js
index ef997ec..bb07f4b 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/common.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/common.js
@@ -19,12 +19,15 @@ var configuratorModule =  angular.module('ignite-web-configurator', ['smart-tabl
 
 // Decode name using map(value, label).
 configuratorModule.filter('displayValue', function () {
-    return function (v, m) {
+    return function (v, m, dflt) {
         for (var i = 0; i < m.length; i++) {
             if (m[i].value == v)
                 return m[i].label;
         }
 
+        if (dflt)
+            return dflt;
+
         return 'Unknown value';
     }
 });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/public/stylesheets/style.css
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/stylesheets/style.css b/modules/webconfig/nodejs/public/stylesheets/style.css
index b7299ec..396ab99 100644
--- a/modules/webconfig/nodejs/public/stylesheets/style.css
+++ b/modules/webconfig/nodejs/public/stylesheets/style.css
@@ -1 +1 @@
-.main-header .logo{height:auto}.main-sidebar{padding-top:60px}.navbar-default .navbar-brand,.navbar-default
.navbar-brand:hover{position:absolute;width:100%;left:0;text-align:center}.modal-backdrop.am-fade{opacity:.5;transition:opacity
.15s linear}.modal-backdrop.am-fade.ng-enter{opacity:0}.modal-backdrop.am-fade.ng-enter.ng-enter-active{opacity:.5}.modal-backdrop.am-fade.ng-leave{opacity:.5}.modal-backdrop.am-fade.ng-leave.ng-leave-active{opacity:0}.modal.center
.modal-dialog{position:fixed;top:40%;left:50%;min-width:320px;max-width:630px;width:50%;-webkit-transform:translateX(-50%)
translateY(-50%);transform:translateX(-50%) translateY(-50%)}.ng-table th.text-right{text-align:right}.ng-table
th.text-left{text-align:left}.ng-table th.text-center{text-align:center}.fa.fa-remove{color:red}.border-left{-webkit-box-shadow:1px
0 0 0 #eee inset;box-shadow:1px 0 0 0 #eee inset}.border-right{-webkit-box-shadow:1px 0 0
0 #eee;box-shadow:1px 0 0 0 #eee}.theme-line{background-color:#f9f9f9}.t
 heme-line header{background-color:#fff}.theme-line header .search-bar{width:90%;margin:30px
auto 0;-webkit-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 0 0 5px rgba(0,0,0,0.1),0
0 0 1px rgba(0,0,0,0.1);box-shadow:0 0 0 5px rgba(0,0,0,0.1),0 0 0 1px rgba(0,0,0,0.1);position:relative}.theme-line
header .search-bar.focus{-webkit-box-shadow:0 0 0 5px rgba(0,0,0,0.2),0 0 0 1px rgba(0,0,0,0.1);box-shadow:0
0 0 5px rgba(0,0,0,0.2),0 0 0 1px rgba(0,0,0,0.1)}.theme-line header .search-bar .fa{position:absolute;top:10px;left:14px;font-size:21px;color:#ccc;z-index:10}.theme-line
header .search-bar .twitter-typeahead{width:100%}.theme-line header .search-bar input{-webkit-border-radius:5px;border-radius:5px;height:100%;border:0
none;-webkit-box-shadow:0 2px 2px rgba(0,0,0,0.1) inset;box-shadow:0 2px 2px rgba(0,0,0,0.1)
inset;color:#444;width:100%;padding:13px 13px 13px 50px;font-size:14px}.theme-line header
.search-bar input.tt-hint{color:#bbb}.theme-line header .search-bar input:ac
 tive .theme-line header .search-bar input:focus{outline:0 none;-webkit-box-shadow:0 2px 2px
rgba(0,0,0,0.2) inset;box-shadow:0 2px 2px rgba(0,0,0,0.2) inset}.theme-line header .search-bar
.tt-dropdown-menu,.theme-solid header .search-bar .tt-dropdown-menu{width:100%;text-align:left}.theme-line
header .search-bar .tt-dropdown-menu h3{padding:0 45px;color:#ccc;font-weight:bold;font-size:12px;margin:10px
0 4px;text-transform:uppercase}.theme-line header .search-bar .tt-dropdown-menu .tt-suggestions{display:block}.theme-line
header .search-bar .tt-dropdown-menu .tt-suggestions .tt-suggestion{cursor:pointer;font-size:14px;padding:4px
45px}.theme-line header .search-bar .tt-dropdown-menu .tt-suggestions .tt-suggestion p{color:#333;white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}.theme-line
header .search-bar .tt-cursor{background-color:#eee}.theme-line header .search-bar .tt-cursor
p{color:#fff}.theme-line header a.btn{border:0 none;padding:10px 25px;ba
 ckground-color:rgba(0,0,0,0.15)}.theme-line header a.btn:hover{background-color:rgba(0,0,0,0.25)}.theme-line
header a.btn.btn-link{background:transparent;color:rgba(255,255,255,0.8)}.theme-line header
a.btn.btn-link:hover{color:#fff;text-decoration:none}.theme-line .navbar-nav a{background-color:transparent}.theme-line
.navbar-nav a:hover,.theme-line .navbar-nav a:active,.theme-line .navbar-nav a:focus{background-color:transparent}.theme-line
.navbar-nav .active a{font-weight:bold}.theme-line .main-links{padding-top:50px}.theme-line
.main-links h3{margin-top:0;font-size:17px}.theme-line .main-links .links a{color:#888}.theme-line
.main-links .links a:hover{text-decoration:none}.theme-line #category-columns,.theme-solid
#category-columns{margin:50px 30px 0}.theme-line #category-columns h4{text-transform:uppercase;font-weight:300;color:#999;font-size:14px}.theme-line
#category-columns ul{list-style:none;padding:0;margin-bottom:15px}.theme-line #category-columns
ul li a{padding:4px 0;d
 isplay:block;font-size:16px}.theme-line #category-columns ul .view-all{font-size:0.85em}.theme-line
.docs-header{color:#999;overflow:hidden}.theme-line .docs-header h1{color:#444;margin-top:0;font-size:25px}.theme-line
.btn-primary{border:0 none}.theme-line .main-content .nav-horizontal a{-webkit-box-shadow:0
0;box-shadow:0 0;border:0 none;background-color:#fff;-webkit-border-radius:0;border-radius:0;color:#aaa;padding:6px;margin:0
14px}.theme-line .main-content .nav-horizontal a:hover{color:#999;border-bottom:4px solid
#ddd}.theme-line .main-content .nav-horizontal a.active{border-bottom:4px solid #888}.theme-line
.sidebar-nav{color:#474a54;padding-bottom:30px}.theme-line .sidebar-nav ul{padding:0;list-style:none;font-size:13px;margin:3px
0 0}.theme-line .sidebar-nav ul li a{padding:3px 0;display:block;color:#666;position:relative;white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}.theme-line
.sidebar-nav ul li a:before{top:0;content:" ";display:blo
 ck;width:6px;height:100%;position:absolute;left:-30px}.theme-line .sidebar-nav ul li a:hover{text-decoration:none}.theme-line
.sidebar-nav ul li a.active{font-weight:bold}.theme-line .sidebar-nav ul li .subcategory{padding-left:15px}.theme-line
.sidebar-nav h4{margin-top:2em;font-weight:normal;text-transform:uppercase;font-size:11px;margin-bottom:10px;color:#bbb}.theme-line
.sidebar-nav h4:first-child{margin-top:0}.theme-line .sidebar-nav .ask{width:100%;text-align:center;padding:10px}.theme-line
.border-left .sidebar-nav{padding-left:15px}.theme-line .suggest{padding:4px;display:inline-block;font-size:12px}.header{padding:15px}.header
.has-github{padding-right:136px}.header h1.navbar-brand{height:40px;width:200px;padding:0;margin:0;margin-top:5px;margin-right:15px}.header
h1.navbar-brand a{text-indent:-99999px;background-position:center center;display:block;width:100%;height:100%;-webkit-background-size:contain;-moz-background-size:contain;background-size:contain;background-repeat:
 no-repeat}.header .nav.navbar-nav.pull-right{position:relative;right:-30px}.header .nav.navbar-nav
.not-link{padding:15px;display:inline-block}.header .nav.navbar-nav .stable,.header .nav.navbar-nav
.beta,.header .nav.navbar-nav .private{font-size:9px;padding:3px 5px;display:inline-block;line-height:8px;-webkit-border-radius:3px;border-radius:3px;margin-left:6px;color:#fff;top:-2px;position:relative;opacity:0.6;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";filter:alpha(opacity=60)}.header
.nav.navbar-nav a:hover>.stable,.header .nav.navbar-nav a:hover>.beta,.header .nav.navbar-nav
a:hover>.private{opacity:1;-ms-filter:none;filter:none}.header .nav.navbar-nav .beta{background-color:#59c3d1}.header
.nav.navbar-nav .stable{background-color:#41b841}.header .nav.navbar-nav .private{background-color:#333}.header
#jumbotron{margin:55px 70px 50px;text-align:center}.header #jumbotron h2{margin-top:0;margin-bottom:20px}.header
#jumbotron p{margin-bottom:0;line-height:1.6em;
 font-size:16px}.header #jumbotron .btn{margin-top:20px}.header .searchbox{position:relative;margin-right:15px;top:9px}.header
.searchbox .fa-search{position:absolute;top:8px;right:10px;color:#777;pointer-events:none}.header
.searchbox .typeahead{line-height:1.25em;-webkit-transition:.3s ease-out;-moz-transition:.3s
ease-out;-o-transition:.3s ease-out;-ms-transition:.3s ease-out;transition:.3s ease-out;background-color:rgba(0,0,0,0.05);-webkit-border-radius:5px;border-radius:5px;width:95px}.header
.searchbox .typeahead:focus,.header .searchbox .typeahead:active{outline:0 none}.header .searchbox
.tt-dropdown-menu{max-width:350px;margin-left:-100px}.header .searchbox .tt-dropdown-menu
h3{width:100px;float:left;margin:0;padding:8px 0 6px 15px;font-size:13px;color:#bbb}.header
.searchbox .tt-dropdown-menu .tt-suggestions{display:block;float:left;width:250px}.header
.searchbox .tt-dropdown-menu .tt-suggestions .tt-suggestion{font-size:14px}.header .searchbox
.tt-dropdown-menu .tt-suggesti
 ons .tt-suggestion p{white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}.header
.searchbox .tt-cursor{background-color:#eee}.header .searchbox .tt-cursor p{color:#fff}.header
.searchbox input{border:0 none;display:inline-block;font-size:14px;padding:6px 32px 6px 12px;margin:0}.header
.searchbox input.tt-hint{height:auto}.header .searchbox.focus input{width:250px}.theme-line
header{border-bottom:8px solid}.theme-line header h2{color:#aaa}.theme-line header p{color:#666}.theme-line
header{border-bottom-color:#ec1c24}.theme-line .navbar-nav{color:#888}.theme-line .navbar-nav
a{color:#bbb}.theme-line header a.btn{background-color:#ec1c24}.theme-line header a.btn:hover{background-color:#950d12}.theme-line
header .navbar-nav .tt-cursor{background-color:#ec1c24}.theme-line header .navbar-nav a:hover,.theme-line
header .navbar-nav .open>a{color:#ec1c24}.theme-line .navbar-nav .active a{font-weight:bold;color:#ec1c24}.theme-line
.navbar-nav .active a:hover{co
 lor:#950d12}.theme-line .main-links .links a:hover{color:#ec1c24}.theme-line .main-content
a{color:#ec1c24}.theme-line .main-content a:hover{color:#950d12}.theme-line .sidebar-nav ul
li a.active:before{background-color:#ec1c24}.theme-line .sidebar-nav ul li a.active{color:#ec1c24}.theme-line
.sidebar-nav ul li a:hover,.theme-line .sidebar-nav ul li a.active:hover{color:#950d12}.theme-line
.btn-primary{background-color:#ec1c24}.theme-line .btn-primary:hover{background-color:#950d12}.theme-line
.main-content .nav-horizontal a.active{border-color:#ec1c24;color:#ec1c24}.theme-line .main-content
.nav-horizontal a:hover{color:#950d12}.theme-line .main-content .nav-horizontal a.active:hover{border-color:#950d12}.theme-line
header .navbar-nav a.active,.theme-line #versions-list li a:hover strong,.theme-line #versions-list
li a.active .current,.theme-line #versions-list li a:active .current{color:#ec1c24}.theme-line.body-threes
.section-right .threes-nav .btn-default:hover,.theme-line.page-d
 ocs.body-threes .section-right .threes-nav .pull-right a:hover{color:#ec1c24;border-color:#ec1c24}.body-overlap
.main-content{margin-top:30px}.body-box .main-content,.body-overlap .main-content{padding:30px;-webkit-box-shadow:0
0 0 1px rgba(0,0,0,0.1);box-shadow:0 0 0 1px rgba(0,0,0,0.1);background-color:#fff}body{font-weight:400;font-family:Roboto
Slab, serif}h1,h2,h3,h4,h5,h6{font-weight:700;font-family:Roboto Slab, serif}.submit-vote.submit-vote-parent.voted
a.submit-vote-button,.submit-vote.submit-vote-parent a.submit-vote-button:hover{background-color:#ec1c24}div.submit-vote.submit-vote-parent.voted
a.submit-vote-button:hover{background-color:#950d12}a,.link .title{color:#ec1c24}a:hover,.link:hover
.title{color:#950d12}.header h1.navbar-brand a{background-image:url("https://www.filepicker.io/api/file/QagunjDGRFul2JgNCAli")}.header
h1.navbar-brand{width:96px}.block-edit-parameters{text-align:right;padding-bottom:5px}.ng-table-pager{display:none}.container-footer{margin-top:20px}
 .vcenter{display:inline-block;vertical-align:middle;float:none}.modal{display:block;overflow:hidden}.modal
.close{position:absolute;top:24px;right:24px;float:none}.modal .modal-dialog{width:610px}.modal
.modal-content{-webkit-border-radius:0;border-radius:0;background-color:#f7f7f7}.modal .modal-content
.modal-header{background-color:#fff;text-align:center;color:#555;padding:24px;font-family:"myriad-pro",sans-serif}.modal
.modal-content .modal-header h4{font-family:"myriad-pro",sans-serif;font-size:22px}.modal
.modal-content .modal-header h4 .fa{display:block;font-size:41px;color:#ddd;margin-bottom:5px}.modal
.modal-content .modal-header p{margin:0;color:#aaa;font-size:1em;margin-top:3px}.modal .modal-content
.modal-spacer{padding:10px 10px 0 10px}.modal .modal-content .modal-footer{margin-top:0}.modal-body{padding-top:30px}h1.ignite-logo{background-image:url("https://www.filepicker.io/api/file/QagunjDGRFul2JgNCAli")}.st-sort-ascent:after{font-family:FontAwesome,
serif;content:'\f07
 7'}.st-sort-descent:after{font-family:FontAwesome, serif;content:'\f078'}.block-display-image
img{max-width:100%;max-height:450px;margin:auto;display:block}.greedy{min-height:200px;height:calc(100vh
- 230px)}@media (min-width:768px){.navbar-nav>li>a{padding-top:20px;padding-bottom:10px}}.settings-row{display:block;margin:0.65em
0;padding-left:18px}.settings-row [class*="col-"]{display:inline-block;vertical-align:middle;float:none;padding-left:0
!important;padding-right:0 !important}.settings-row input[type="checkbox"]{margin-right:4px}button{margin-right:4px}h1,h2,h3{-webkit-user-select:none;font-weight:normal;line-height:1}h3{color:black;font-size:1.2em;margin-bottom:0.8em}table
tr:hover{cursor:pointer}.input-group{display:inline-block}.input-group .form-control{width:auto;margin-left:0;margin-right:0}.form-control{display:inline-block}.panel-heading
.panel-title{margin-left:-18px}.theme-line .links table{table-layout:fixed;margin:0.65em 0}.theme-line
.links table td{padding-left:1
 8px}.theme-line .links table a{color:#666}.theme-line .links table a:hover{color:#ec1c24}.theme-line
.links table .active a{font-weight:bold;color:#ec1c24}
\ No newline at end of file
+.main-header .logo{height:auto}.main-sidebar{padding-top:60px}.navbar-default .navbar-brand,.navbar-default
.navbar-brand:hover{position:absolute;width:100%;left:0;text-align:center}.modal-backdrop.am-fade{opacity:.5;transition:opacity
.15s linear}.modal-backdrop.am-fade.ng-enter{opacity:0}.modal-backdrop.am-fade.ng-enter.ng-enter-active{opacity:.5}.modal-backdrop.am-fade.ng-leave{opacity:.5}.modal-backdrop.am-fade.ng-leave.ng-leave-active{opacity:0}.modal.center
.modal-dialog{position:fixed;top:40%;left:50%;min-width:320px;max-width:630px;width:50%;-webkit-transform:translateX(-50%)
translateY(-50%);transform:translateX(-50%) translateY(-50%)}.ng-table th.text-right{text-align:right}.ng-table
th.text-left{text-align:left}.ng-table th.text-center{text-align:center}.fa.fa-remove{color:red}.border-left{-webkit-box-shadow:1px
0 0 0 #eee inset;box-shadow:1px 0 0 0 #eee inset}.border-right{-webkit-box-shadow:1px 0 0
0 #eee;box-shadow:1px 0 0 0 #eee}.theme-line{background-color:#f9f9f9}.t
 heme-line header{background-color:#fff}.theme-line header .search-bar{width:90%;margin:30px
auto 0;-webkit-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 0 0 5px rgba(0,0,0,0.1),0
0 0 1px rgba(0,0,0,0.1);box-shadow:0 0 0 5px rgba(0,0,0,0.1),0 0 0 1px rgba(0,0,0,0.1);position:relative}.theme-line
header .search-bar.focus{-webkit-box-shadow:0 0 0 5px rgba(0,0,0,0.2),0 0 0 1px rgba(0,0,0,0.1);box-shadow:0
0 0 5px rgba(0,0,0,0.2),0 0 0 1px rgba(0,0,0,0.1)}.theme-line header .search-bar .fa{position:absolute;top:10px;left:14px;font-size:21px;color:#ccc;z-index:10}.theme-line
header .search-bar .twitter-typeahead{width:100%}.theme-line header .search-bar input{-webkit-border-radius:5px;border-radius:5px;height:100%;border:0
none;-webkit-box-shadow:0 2px 2px rgba(0,0,0,0.1) inset;box-shadow:0 2px 2px rgba(0,0,0,0.1)
inset;color:#444;width:100%;padding:13px 13px 13px 50px;font-size:14px}.theme-line header
.search-bar input.tt-hint{color:#bbb}.theme-line header .search-bar input:ac
 tive .theme-line header .search-bar input:focus{outline:0 none;-webkit-box-shadow:0 2px 2px
rgba(0,0,0,0.2) inset;box-shadow:0 2px 2px rgba(0,0,0,0.2) inset}.theme-line header .search-bar
.tt-dropdown-menu,.theme-solid header .search-bar .tt-dropdown-menu{width:100%;text-align:left}.theme-line
header .search-bar .tt-dropdown-menu h3{padding:0 45px;color:#ccc;font-weight:bold;font-size:12px;margin:10px
0 4px;text-transform:uppercase}.theme-line header .search-bar .tt-dropdown-menu .tt-suggestions{display:block}.theme-line
header .search-bar .tt-dropdown-menu .tt-suggestions .tt-suggestion{cursor:pointer;font-size:14px;padding:4px
45px}.theme-line header .search-bar .tt-dropdown-menu .tt-suggestions .tt-suggestion p{color:#333;white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}.theme-line
header .search-bar .tt-cursor{background-color:#eee}.theme-line header .search-bar .tt-cursor
p{color:#fff}.theme-line header a.btn{border:0 none;padding:10px 25px;ba
 ckground-color:rgba(0,0,0,0.15)}.theme-line header a.btn:hover{background-color:rgba(0,0,0,0.25)}.theme-line
header a.btn.btn-link{background:transparent;color:rgba(255,255,255,0.8)}.theme-line header
a.btn.btn-link:hover{color:#fff;text-decoration:none}.theme-line .navbar-nav a{background-color:transparent}.theme-line
.navbar-nav a:hover,.theme-line .navbar-nav a:active,.theme-line .navbar-nav a:focus{background-color:transparent}.theme-line
.navbar-nav .active a{font-weight:bold}.theme-line .main-links{padding-top:50px}.theme-line
.main-links h3{margin-top:0;font-size:17px}.theme-line .main-links .links a{color:#888}.theme-line
.main-links .links a:hover{text-decoration:none}.theme-line #category-columns,.theme-solid
#category-columns{margin:50px 30px 0}.theme-line #category-columns h4{text-transform:uppercase;font-weight:300;color:#999;font-size:14px}.theme-line
#category-columns ul{list-style:none;padding:0;margin-bottom:15px}.theme-line #category-columns
ul li a{padding:4px 0;d
 isplay:block;font-size:16px}.theme-line #category-columns ul .view-all{font-size:0.85em}.theme-line
.docs-header{color:#999;overflow:hidden}.theme-line .docs-header h1{color:#444;margin-top:0;font-size:25px}.theme-line
.btn-primary{border:0 none}.theme-line .main-content .nav-horizontal a{-webkit-box-shadow:0
0;box-shadow:0 0;border:0 none;background-color:#fff;-webkit-border-radius:0;border-radius:0;color:#aaa;padding:6px;margin:0
14px}.theme-line .main-content .nav-horizontal a:hover{color:#999;border-bottom:4px solid
#ddd}.theme-line .main-content .nav-horizontal a.active{border-bottom:4px solid #888}.theme-line
.sidebar-nav{color:#474a54;padding-bottom:30px}.theme-line .sidebar-nav ul{padding:0;list-style:none;font-size:13px;margin:3px
0 0}.theme-line .sidebar-nav ul li a{padding:3px 0;display:block;color:#666;position:relative;white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}.theme-line
.sidebar-nav ul li a:before{top:0;content:" ";display:blo
 ck;width:6px;height:100%;position:absolute;left:-30px}.theme-line .sidebar-nav ul li a:hover{text-decoration:none}.theme-line
.sidebar-nav ul li a.active{font-weight:bold}.theme-line .sidebar-nav ul li .subcategory{padding-left:15px}.theme-line
.sidebar-nav h4{margin-top:2em;font-weight:normal;text-transform:uppercase;font-size:11px;margin-bottom:10px;color:#bbb}.theme-line
.sidebar-nav h4:first-child{margin-top:0}.theme-line .sidebar-nav .ask{width:100%;text-align:center;padding:10px}.theme-line
.border-left .sidebar-nav{padding-left:15px}.theme-line .suggest{padding:4px;display:inline-block;font-size:12px}.header{padding:15px}.header
.has-github{padding-right:136px}.header h1.navbar-brand{height:40px;width:200px;padding:0;margin:0;margin-top:5px;margin-right:15px}.header
h1.navbar-brand a{text-indent:-99999px;background-position:center center;display:block;width:100%;height:100%;-webkit-background-size:contain;-moz-background-size:contain;background-size:contain;background-repeat:
 no-repeat}.header .nav.navbar-nav.pull-right{position:relative;right:-30px}.header .nav.navbar-nav
.not-link{padding:15px;display:inline-block}.header .nav.navbar-nav .stable,.header .nav.navbar-nav
.beta,.header .nav.navbar-nav .private{font-size:9px;padding:3px 5px;display:inline-block;line-height:8px;-webkit-border-radius:3px;border-radius:3px;margin-left:6px;color:#fff;top:-2px;position:relative;opacity:0.6;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";filter:alpha(opacity=60)}.header
.nav.navbar-nav a:hover>.stable,.header .nav.navbar-nav a:hover>.beta,.header .nav.navbar-nav
a:hover>.private{opacity:1;-ms-filter:none;filter:none}.header .nav.navbar-nav .beta{background-color:#59c3d1}.header
.nav.navbar-nav .stable{background-color:#41b841}.header .nav.navbar-nav .private{background-color:#333}.header
#jumbotron{margin:55px 70px 50px;text-align:center}.header #jumbotron h2{margin-top:0;margin-bottom:20px}.header
#jumbotron p{margin-bottom:0;line-height:1.6em;
 font-size:16px}.header #jumbotron .btn{margin-top:20px}.header .searchbox{position:relative;margin-right:15px;top:9px}.header
.searchbox .fa-search{position:absolute;top:8px;right:10px;color:#777;pointer-events:none}.header
.searchbox .typeahead{line-height:1.25em;-webkit-transition:.3s ease-out;-moz-transition:.3s
ease-out;-o-transition:.3s ease-out;-ms-transition:.3s ease-out;transition:.3s ease-out;background-color:rgba(0,0,0,0.05);-webkit-border-radius:5px;border-radius:5px;width:95px}.header
.searchbox .typeahead:focus,.header .searchbox .typeahead:active{outline:0 none}.header .searchbox
.tt-dropdown-menu{max-width:350px;margin-left:-100px}.header .searchbox .tt-dropdown-menu
h3{width:100px;float:left;margin:0;padding:8px 0 6px 15px;font-size:13px;color:#bbb}.header
.searchbox .tt-dropdown-menu .tt-suggestions{display:block;float:left;width:250px}.header
.searchbox .tt-dropdown-menu .tt-suggestions .tt-suggestion{font-size:14px}.header .searchbox
.tt-dropdown-menu .tt-suggesti
 ons .tt-suggestion p{white-space:nowrap;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis}.header
.searchbox .tt-cursor{background-color:#eee}.header .searchbox .tt-cursor p{color:#fff}.header
.searchbox input{border:0 none;display:inline-block;font-size:14px;padding:6px 32px 6px 12px;margin:0}.header
.searchbox input.tt-hint{height:auto}.header .searchbox.focus input{width:250px}.theme-line
header{border-bottom:8px solid}.theme-line header h2{color:#aaa}.theme-line header p{color:#666}.theme-line
header{border-bottom-color:#ec1c24}.theme-line .navbar-nav{color:#888}.theme-line .navbar-nav
a{color:#bbb}.theme-line header a.btn{background-color:#ec1c24}.theme-line header a.btn:hover{background-color:#950d12}.theme-line
header .navbar-nav .tt-cursor{background-color:#ec1c24}.theme-line header .navbar-nav a:hover,.theme-line
header .navbar-nav .open>a{color:#ec1c24}.theme-line .navbar-nav .active a{font-weight:bold;color:#ec1c24}.theme-line
.navbar-nav .active a:hover{co
 lor:#950d12}.theme-line .main-links .links a:hover{color:#ec1c24}.theme-line .main-content
a{color:#ec1c24}.theme-line .main-content a:hover{color:#950d12}.theme-line .sidebar-nav ul
li a.active:before{background-color:#ec1c24}.theme-line .sidebar-nav ul li a.active{color:#ec1c24}.theme-line
.sidebar-nav ul li a:hover,.theme-line .sidebar-nav ul li a.active:hover{color:#950d12}.theme-line
.btn-primary{background-color:#ec1c24}.theme-line .btn-primary:hover{background-color:#950d12}.theme-line
.main-content .nav-horizontal a.active{border-color:#ec1c24;color:#ec1c24}.theme-line .main-content
.nav-horizontal a:hover{color:#950d12}.theme-line .main-content .nav-horizontal a.active:hover{border-color:#950d12}.theme-line
header .navbar-nav a.active,.theme-line #versions-list li a:hover strong,.theme-line #versions-list
li a.active .current,.theme-line #versions-list li a:active .current{color:#ec1c24}.theme-line.body-threes
.section-right .threes-nav .btn-default:hover,.theme-line.page-d
 ocs.body-threes .section-right .threes-nav .pull-right a:hover{color:#ec1c24;border-color:#ec1c24}.body-overlap
.main-content{margin-top:30px}.body-box .main-content,.body-overlap .main-content{padding:30px;-webkit-box-shadow:0
0 0 1px rgba(0,0,0,0.1);box-shadow:0 0 0 1px rgba(0,0,0,0.1);background-color:#fff}body{font-weight:400;font-family:Roboto
Slab, serif}h1,h2,h3,h4,h5,h6{font-weight:700;font-family:Roboto Slab, serif}.submit-vote.submit-vote-parent.voted
a.submit-vote-button,.submit-vote.submit-vote-parent a.submit-vote-button:hover{background-color:#ec1c24}div.submit-vote.submit-vote-parent.voted
a.submit-vote-button:hover{background-color:#950d12}a,.link .title{color:#ec1c24}a:hover,.link:hover
.title{color:#950d12}.header h1.navbar-brand a{background-image:url("https://www.filepicker.io/api/file/QagunjDGRFul2JgNCAli")}.header
h1.navbar-brand{width:96px}.block-edit-parameters{text-align:right;padding-bottom:5px}.ng-table-pager{display:none}.container-footer{margin-top:20px}
 .vcenter{display:inline-block;vertical-align:middle;float:none}.modal{display:block;overflow:hidden}.modal
.close{position:absolute;top:24px;right:24px;float:none}.modal .modal-dialog{width:610px}.modal
.modal-content{-webkit-border-radius:0;border-radius:0;background-color:#f7f7f7}.modal .modal-content
.modal-header{background-color:#fff;text-align:center;color:#555;padding:24px;font-family:"myriad-pro",sans-serif}.modal
.modal-content .modal-header h4{font-family:"myriad-pro",sans-serif;font-size:22px}.modal
.modal-content .modal-header h4 .fa{display:block;font-size:41px;color:#ddd;margin-bottom:5px}.modal
.modal-content .modal-header p{margin:0;color:#aaa;font-size:1em;margin-top:3px}.modal .modal-content
.modal-spacer{padding:10px 10px 0 10px}.modal .modal-content .modal-footer{margin-top:0}.modal-body{padding-top:30px}h1.ignite-logo{background-image:url("https://www.filepicker.io/api/file/QagunjDGRFul2JgNCAli")}.st-sort-ascent:after{font-family:FontAwesome,
serif;content:'\f07
 7'}.st-sort-descent:after{font-family:FontAwesome, serif;content:'\f078'}.block-display-image
img{max-width:100%;max-height:450px;margin:auto;display:block}.greedy{min-height:200px;height:calc(100vh
- 230px)}@media (min-width:768px){.navbar-nav>li>a{padding-top:20px;padding-bottom:10px}}.settings-row{display:block;margin:0.65em
0;padding-left:18px}.settings-row [class*="col-"]{display:inline-block;vertical-align:middle;float:none;padding-left:0
!important;padding-right:0 !important}.settings-row input[type="checkbox"]{margin-right:4px}button{margin-right:4px}h1,h2,h3{-webkit-user-select:none;font-weight:normal;line-height:1}h3{color:black;font-size:1.2em;margin-top:0.8em;margin-bottom:0.8em}table
tr:hover{cursor:pointer}.input-group{display:inline-block}.input-group .form-control{width:auto;margin-left:0;margin-right:0}.form-control{display:inline-block;padding:3px
6px;height:28px}.panel-heading .panel-title{margin-left:-18px}.theme-line .links table{table-layout:fixed;margin:0.65em
  0}.theme-line .links table td{padding-left:18px}.theme-line .links table a{color:#666}.theme-line
.links table a:hover{color:#ec1c24}.theme-line .links table .active a{font-weight:bold;color:#ec1c24}.btn{padding:3px
6px}.panel-title a{font-size:14px}.panel-heading{margin:-0.65em 0}.panel{margin-top:0.8em}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/public/stylesheets/style.less
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/stylesheets/style.less b/modules/webconfig/nodejs/public/stylesheets/style.less
index 892aa08..b95960b 100644
--- a/modules/webconfig/nodejs/public/stylesheets/style.less
+++ b/modules/webconfig/nodejs/public/stylesheets/style.less
@@ -873,7 +873,6 @@ h1.ignite-logo {
   }
 }
 
-
 .settings-row {
   display: block;
   margin: 0.65em 0;
@@ -909,6 +908,7 @@ h3 {
 h3 {
   color: black;
   font-size: 1.2em;
+  margin-top: 0.8em;
   margin-bottom: 0.8em;
 }
 
@@ -924,9 +924,10 @@ table tr:hover{ cursor:pointer; }
   margin-right: 0;
 }
 
-
 .form-control {
   display: inline-block;
+  padding: 3px 6px;
+  height: 28px;
 }
 
 .panel-heading .panel-title {
@@ -952,4 +953,20 @@ table tr:hover{ cursor:pointer; }
 .theme-line .links table .active a {
   font-weight: bold;
   color: #ec1c24;
+}
+
+.btn {
+  padding: 3px 6px;
+}
+
+.panel-title a {
+  font-size: 14px;
+}
+
+.panel-heading {
+  margin: -0.65em 0;
+}
+
+.panel {
+  margin-top: 0.8em;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/views/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade
index 5bbec6c..13cc663 100644
--- a/modules/webconfig/nodejs/views/clusters.jade
+++ b/modules/webconfig/nodejs/views/clusters.jade
@@ -25,20 +25,21 @@ block content
         p Create and configure Ignite clusters.
         hr
     .docs-body(ng-controller='clustersController')
-        h3 Clusters
+        button(ng-click='createItem()' class=['btn', 'btn-primary'] ng-disabled='!create.template')
&nbspAdd cluster
+        span from template:&nbsp
+        button(class=['btn', 'btn-default'] ng-init="create.template = templates[0].value"
ng-model='create.template' data-template='/select' data-placeholder='Choose cluster template'
bs-options='item.value as item.label for item in templates' bs-select)
+        h3(ng-hide='clusters.length == 0') Clusters
         .links
             table.col-sm-12(st-table='rowCollection' st-safe-src='clusters')
                 tbody
                     tr(ng-repeat='row in rowCollection')
                         td.col-sm-6(ng-class="{active: row == selectedItem}")
-                            a(ng-click='selectItem(row)') Name: {{row.name}}, Discovery:
{{row.discovery.kind | displayValue:discoveries}}
-                        td
-                            span(type='button' ng-click='removeItem(row)')
-                                i(class=['fa', 'fa-remove'])
-        .settings-row
-            button(ng-click='createItem()' class=['btn', 'btn-default'] ng-disabled='!create.template')
&nbspAdd cluster...
-                span.input-group-btn
-                    button(class=['btn', 'btn-default'] ng-model='create.template' data-placement='bottom-center'
data-template='/select' data-placeholder='Choose cluster template' bs-options='item.value
as item.label for item in templates' bs-select)
+                            a(ng-click='selectItem(row)') {{row.name}}, {{row.discovery.kind
| displayValue:discoveries:'Discovery not set'}}
+                        //td
+                        //    span(type='button' ng-click='removeItem(row)')
+                        //        i(class=['fa', 'fa-remove'])
+        .row.col-sm-12
+            hr
         form.form-horizontal(name='editForm' ng-if='backupItem')
             h3 General
             .settings-row
@@ -47,12 +48,12 @@ block content
                     input.form-control(type='text' ng-model='backupItem.name')
             .settings-row
                 span.col-sm-2 Discovery:
-                .col-sm-8
-                    .input-group
-                        button.form-control(ng-model='backupItem.discovery.kind' data-placement='bottom-center'
data-template='/select' data-placeholder='Choose discovery' bs-options='item.value as item.label
for item in discoveries' bs-select)
-                        span.input-group-btn
-                            button(class=['btn', 'btn-default'] ng-click='editDiscovery(cluster)')
-                                i(class=['fa', 'fa-bars'])
+                .col-sm-4
+                    //.input-group
+                    button.form-control(ng-model='backupItem.discovery.kind' data-template='/select'
data-placeholder='Choose discovery' bs-options='item.value as item.label for item in discoveries'
bs-select)
+                        //span.input-group-btn
+                        //    button(class=['btn', 'btn-default'] ng-click='editDiscovery(cluster)')
+                        //        i(class=['fa', 'fa-bars'])
             .panel(bs-collapse data-start-collapsed='true')
                 .panel-collapse(bs-collapse-target)
                     h3 Thread pool size
@@ -69,13 +70,9 @@ block content
                         .col-sm-4
                             input.form-control(type='text' ng-model='backupItem.mgmtPoolSize'
placeholder='4')
                     .settings-row
-                        span.col-sm-2 Peer class loading:
-                        .col-sm-4
-                            input.form-control(type='text' ng-model='backupItem.igfsPoolSize'
placeholder='2')
-                    .settings-row
                         span.col-sm-2 Igfs:
                         .col-sm-4
-                            input.form-control(type='text' ng-model='backupItem.p2pPoolSize'
placeholder='availableProcessors')
+                            input.form-control(type='text' ng-model='backupItem.igfsPoolSize'
placeholder='availableProcessors')
                     .settings-row
                         span.col-sm-2 Utility:
                         .col-sm-4
@@ -97,11 +94,22 @@ block content
                     .settings-row
                         input(type='checkbox' ng-model='backupItem.p2pEnabled')
                         span Enable peer class loading.
+                    .settings-row
+                        span.col-sm-2 Local class path exclude:
+                        .col-sm-4
+                            input.form-control(type='text' ng-model='backupItem.p2pLocClsPathExcl'
placeholder='[]')
+                    .settings-row
+                        span.col-sm-2 Missed resources cache size:
+                        .col-sm-4
+                            input.form-control(type='text' ng-model='backupItem.p2pMissedCacheSize'
placeholder='100')
+                    .settings-row
+                        span.col-sm-2 Thread pool size:
+                        .col-sm-4
+                            input.form-control(type='text' ng-model='backupItem.p2pPoolSize'
placeholder='availableProcessors')
                 .panel-heading
                     .panel-title
                         span(bs-collapse-toggle)
                             a(ng-click='expanded = true' ng-hide='expanded') Show advanced
settings...
                             a(ng-click='expanded = false' ng-show='expanded') Hide advanced
settings...
-            .settings-row
-                button.btn.btn-primary(ng-click='selectItem(selectedItem)' ng-disabled='editForm.$invalid')
Revert
-                button.btn.btn-primary(ng-click='saveItem(backupItem)' ng-disabled='editForm.$invalid')
Apply
\ No newline at end of file
+            button.btn.btn-primary(ng-click='saveItem(backupItem)' ng-disabled='editForm.$invalid')
Save
+            button.btn.btn-primary(ng-click='removeItem(selectedItem)' ng-disabled='editForm.$invalid')
Remove
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/views/layout-sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/layout-sidebar.jade b/modules/webconfig/nodejs/views/layout-sidebar.jade
index c11d77f..36d7bd3 100644
--- a/modules/webconfig/nodejs/views/layout-sidebar.jade
+++ b/modules/webconfig/nodejs/views/layout-sidebar.jade
@@ -34,8 +34,8 @@ block container
                     li
                         a(ng-class="{active: isActive('/clients')}" href='/clients') Clients
                     li
-                        hr
-                        a(ng-class="{active: isActive('/overview')}" href='/overview') Overview
+                        p
+                        a(ng-class="{active: isActive('/overview')}" href='/overview') Summary
         div(class=['col-sm-10', 'border-left', 'section-right'])
             div.docs-content
                 block content
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d06a9157/modules/webconfig/nodejs/views/templates/select.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/templates/select.jade b/modules/webconfig/nodejs/views/templates/select.jade
index fea1d5c..14ed654 100644
--- a/modules/webconfig/nodejs/views/templates/select.jade
+++ b/modules/webconfig/nodejs/views/templates/select.jade
@@ -16,7 +16,7 @@
 
 ul.select.dropdown-menu(tabindex='-1', ng-show='$isVisible()', role='select')
     li(ng-if='$showAllNoneButtons')
-        .btn-group(style='margin-bottom: 5px; margin-left: 5px')
+        .btn-group(style='margin-left: 5px')
             button.btn.btn-default.btn-xs(type='button', ng-click='$selectAll()') {{$allText}}
             button.btn.btn-default.btn-xs(type='button', ng-click='$selectNone()') {{$noneText}}
     li(role='presentation', ng-repeat='match in $matches', ng-class='{active: $isActive($index)}')



Mime
View raw message