ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [4/4] ignite git commit: IGNITE-843 Added wizard step description for metadata load dialog.
Date Tue, 08 Sep 2015 13:54:43 GMT
IGNITE-843 Added wizard step description for metadata load dialog.


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

Branch: refs/heads/ignite-843
Commit: 9f96779f5ea75bfe41e6f5b97dce7f5883c567f8
Parents: 48c0f1a
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Sep 8 20:54:33 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Sep 8 20:54:33 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/metadata-controller.js      | 10 ++++++++--
 .../src/main/js/public/stylesheets/style.scss           |  7 ++++++-
 .../src/main/js/views/configuration/metadata-load.jade  | 12 ++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9f96779f/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index a336fa4..7622571 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -263,7 +263,8 @@ controlCenterModule.controller('metadataController', [
                     allSchemasSelected: false,
                     tables: [],
                     allTablesSelected: false,
-                    button: 'Next'
+                    button: 'Next',
+                    info: 'Configure connection to database'
                 };
 
                 // Get available JDBC drivers via agent.
@@ -303,6 +304,7 @@ controlCenterModule.controller('metadataController', [
                     .success(function (schemas) {
                         $scope.loadMeta.schemas = _.map(schemas, function (schema) { return
{use: false, name: schema}});
                         $scope.loadMeta.action = 'schemas';
+                        $scope.loadMeta.info = 'Select schemas to load tables';
                     })
                     .error(function (errMsg) {
                         $common.showError(errMsg);
@@ -311,6 +313,7 @@ controlCenterModule.controller('metadataController', [
 
             function _loadMetadata() {
                 $scope.loadMeta.allTablesSelected = false;
+                $scope.loadMeta.info = 'Select tables to import as cache type metadata';
 
                 $scope.preset.schemas = [];
 
@@ -546,9 +549,12 @@ controlCenterModule.controller('metadataController', [
                 if  ($scope.loadMeta.action == 'tables') {
                     $scope.loadMeta.action = 'schemas';
                     $scope.loadMeta.button = 'Next';
+                    $scope.loadMeta.info = 'Select schemas to load tables';
                 }
-                else if  ($scope.loadMeta.action == 'schemas')
+                else if  ($scope.loadMeta.action == 'schemas') {
                     $scope.loadMeta.action = 'connect';
+                    $scope.loadMeta.info = 'Configure connection to database';
+                }
             };
 
             function generatePreview(val) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/9f96779f/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 1b05453..730f2b3 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
@@ -39,6 +39,7 @@ hr {
 
 a.active {
     font-weight: bold;
+    font-size: 1.2em;
 }
 
 .navbar-default .navbar-brand, .navbar-default .navbar-brand:hover {
@@ -663,7 +664,7 @@ h3 {
 }
 
 .metadata-content {
-    margin: 15px;
+    margin: 15px 30px;
 }
 
 .metadata-scrollable {
@@ -830,6 +831,10 @@ div.affix.padding-top-dflt {
     text-align: center;
 }
 
+.tooltip.top .tooltip-arrow {
+    border-top-color: $brand-primary;
+}
+
 .tooltip.right .tooltip-arrow {
     border-right-color: $brand-primary;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/9f96779f/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index 93b2a38..eda9a2c 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -25,11 +25,10 @@ mixin chk(mdl, change, tip)
             #errors-container.modal-header.header
                 button.close(type='button' ng-click='$hide()' aria-hidden='true') &times;
                 h4.modal-title Load metadata from database
-            .metadata-content(ng-show='loadMeta.action == "connect"')
+            .metadata-content(ng-show='loadMeta.action == "connect"' style='margin-bottom:
60px')
                 form.form-horizontal(name='loadForm' novalidate)
-                    .modal-body
-                        .settings-row(ng-repeat='field in metadataDb')
-                            +form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9
col-md-9'], 'preset')
+                    .settings-row(ng-repeat='field in metadataDb')
+                        +form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9
col-md-9'], 'preset')
             .metadata-content(ng-show='loadMeta.action == "schemas"')
                 table.table.metadata(st-table='displayedSchemas' st-safe-src='loadMeta.schemas')
                     thead
@@ -54,10 +53,10 @@ mixin chk(mdl, change, tip)
                                                     td
                                                         label {{::schema.name}}
             .metadata-content(ng-show='loadMeta.action == "tables"')
-                div.metadata-package-name
+                .metadata-package-name
                     label.required Package:
                     span
-                        input.form-control(type="text" ng-model='ui.packageName')
+                        input.form-control(type="text" ng-model='ui.packageName' placeholder='Package
for POJOs generation' bs-tooltip='' data-title='Package that will be used for POJOs generation'
data-placement='top' data-trigger='hover')
                 table.table.metadata(st-table='displayedTables' st-safe-src='loadMeta.tables')
                     thead
                         tr
@@ -85,5 +84,6 @@ mixin chk(mdl, change, tip)
                                                 td
                                                     label {{::table.tbl}}
             .modal-footer
+                label.labelField {{loadMeta.info}}
                 button.btn.btn-primary(ng-show='loadMeta.action != "connect"' ng-click='loadMetadataPrev()')
Prev
                 a.btn.btn-primary(ng-click='loadMetadataNext()' ng-disabled='!nextAvailable()'
bs-tooltip data-title='{{nextTooltipText()}}' data-placement='bottom') {{loadMeta.button}}


Mime
View raw message