ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: IGNITE-843 Minor UI changes after review.
Date Tue, 04 Aug 2015 10:35:20 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 69f3c170e -> 186591039


IGNITE-843 Minor UI changes after review.


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

Branch: refs/heads/ignite-843
Commit: 186591039894f8abdc664d996b90a38c362ec352
Parents: 69f3c17
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Aug 4 17:35:23 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Aug 4 17:35:23 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/metadata-controller.js  | 30 +++++++
 .../src/main/js/controllers/models/caches.json  |  2 +-
 .../main/js/controllers/models/clusters.json    |  2 +-
 .../main/js/controllers/models/metadata.json    |  3 +-
 .../src/main/js/controllers/models/summary.json |  2 +-
 .../src/main/js/public/stylesheets/style.scss   | 88 ++++++++++++--------
 .../src/main/js/views/configuration/caches.jade |  7 +-
 .../main/js/views/configuration/clusters.jade   |  8 +-
 .../main/js/views/configuration/metadata.jade   | 70 ++++++++--------
 .../src/main/js/views/includes/controls.jade    |  8 +-
 10 files changed, 135 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/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 96718fd..70db126 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
@@ -109,6 +109,36 @@ controlCenterModule.controller('metadataController', ['$scope', '$http',
'$commo
             {value: true, label: 'DESC'}
         ];
 
+        $scope.fieldz = [
+            {
+                use: true,
+                key: true,
+                ak: true,
+                databaseName: 'name1',
+                databaseType: 'dbType1',
+                javaName: 'javaName1',
+                javaType: 'javaType1'
+            },
+            {
+                use: true,
+                key: false,
+                ak: false,
+                databaseName: 'name2',
+                databaseType: 'dbType2',
+                javaName: 'javaName2',
+                javaType: 'javaType2'
+            },
+            {
+                use: false,
+                key: false,
+                ak: false,
+                databaseName: 'name3',
+                databaseType: 'dbType3',
+                javaName: 'javaName3',
+                javaType: 'javaType3'
+            }
+        ];
+
         $scope.data = {
             curTableIdx: 0,
             curFieldIdx: 0,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index df793f5..83b3166 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -1,6 +1,6 @@
 {
   "screenTip": {
-    "workflowTitle": "Use caches view to:",
+    "workflowTitle": "What's now:",
     "workflowContent": [
       "<ul>",
       "  <li>Configure caches.</li>",

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 36d0dd8..7cffeb5 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1,6 +1,6 @@
 {
   "screenTip": {
-    "workflowTitle": "Use clusters view to:",
+    "workflowTitle": "What's now:",
     "workflowContent": [
       "<ul>",
       "  <li>Configure clusters.</li>",

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index 9c60217..1d5246f 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -1,10 +1,9 @@
 {
   "screenTip": {
-    "workflowTitle": "Use metadata view to:",
+    "workflowTitle": "What's now:",
     "workflowContent": [
       "<ul>",
       "  <li>Manually configure metadata for queries and persistence.</li>",
-      "Or",
       "  <li>Automatically configure metadata from database schema.</li>",
       "</ul>"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/controllers/models/summary.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/summary.json b/modules/control-center-web/src/main/js/controllers/models/summary.json
index 29edb3d..2b5d470 100644
--- a/modules/control-center-web/src/main/js/controllers/models/summary.json
+++ b/modules/control-center-web/src/main/js/controllers/models/summary.json
@@ -1,6 +1,6 @@
 {
   "screenTip": {
-    "workflowTitle": "Use summary view to:",
+    "workflowTitle": "What's now:",
     "workflowContent": [
       "<ul>",
       "  <li>See XML and java code for server nodes configurations.</li>",

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/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 e2542ce..a1ec7c4 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
@@ -20,6 +20,7 @@ $input-height: 28px;
 $ignite-red: #ec1c24;
 $ignite-block-callout-background: #f3f8f3;
 $ignite-block-callout: #50af51;
+$ignite-block-callout-header-left: #248fb2;
 
 hr {
     margin: 20px 0;
@@ -775,6 +776,35 @@ button .caret, .btn .caret {
     }
 }
 
+.zzz {
+    color: $ignite-red;
+    font-weight: bold;
+}
+
+.theme-line table.metadata {
+    th {
+        text-align: center;
+        padding: 3px 5px 3px 5px;
+    }
+
+    td {
+        label {
+            cursor: pointer;
+        }
+
+        input[type=checkbox] {
+            margin: 0 3px 3px 0;
+            vertical-align: middle;
+            cursor: pointer;
+        }
+
+        padding: 3px 10px 3px 5px;
+    }
+
+    margin-top: 10px;
+    margin-bottom: 20px;
+}
+
 .theme-line table.admin {
     tr:hover {
         cursor: default;
@@ -949,6 +979,20 @@ label {
     cursor: pointer;
 }
 
+.fa-chevron-circle-down {
+    color: $ignite-red;
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 16px;
+}
+
+.fa-chevron-circle-up {
+    color: $ignite-red;
+    cursor: pointer;
+    margin-right: 5px;
+    font-size: 16px;
+}
+
 label.required:after {
     color: $ignite-red;
     content: ' *';
@@ -1057,39 +1101,6 @@ input.ng-dirty.ng-invalid, button.ng-dirty.ng-invalid {
     border-radius: 6px;
 }
 
-.theme-line table.links-edit-small-padding {
-    @extend table.links;
-
-    label {
-        line-height: $input-height;
-        color: #666;
-    }
-
-    a {
-        line-height: $input-height;
-    }
-
-    input[type="checkbox"] {
-        line-height: 20px;
-        margin-right: 5px;
-    }
-
-    .checkbox label {
-        line-height: 20px;
-        vertical-align: middle;
-    }
-
-    th {
-        text-align: center;
-    }
-
-    td {
-        padding-left: 10px;
-    }
-
-    margin-top: 10px;
-}
-
 .nav-tabs > li > a {
     padding: 5px 5px;
 }
@@ -1174,7 +1185,6 @@ a {
 
     i {
         padding: 10px 5px 0 10px;
-        color: $ignite-block-callout;
     }
 
     ul {
@@ -1189,12 +1199,20 @@ a {
 
     label {
         font-weight: bold;
-        color: $ignite-block-callout;
     }
 }
 
+.block-callout-header-left {
+    color: $ignite-block-callout-header-left;
+}
+
+.block-callout-header-right {
+    color: $ignite-block-callout;
+}
+
 .block-callout-border {
     border-left: 5px solid;
+    border-right: 5px solid;
     border-color: $ignite-block-callout;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 2cddbce..4aeb740 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -52,7 +52,8 @@ block content
                 div(bs-collapse data-start-collapsed='true')
                     .panel-title(ng-show='expanded')
                         h3
-                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
+                            i.fa.fa-chevron-circle-up(ng-click='expanded = !expanded')
+                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
                     .panel-collapse(bs-collapse-target)
                         .span(bs-collapse data-start-collapsed='true' data-allow-multiple='true')
                             .panel.panel-default(ng-repeat='group in advanced' ng-hide='{{group.hide}}')
@@ -67,7 +68,9 @@ block content
                                             +form-row
                     .panel-title
                         h3
-                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
+                            i.fa.fa-chevron-circle-up(ng-show='expanded' ng-click='expanded
= !expanded')
+                            i.fa.fa-chevron-circle-down(ng-show='!expanded' ng-click='expanded
= !expanded')
+                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
             div
                 button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()')
Save
                 button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid'
ng-click='saveItemAs()') Copy

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index 239a31f..e295df1 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -55,7 +55,8 @@ block content
                 div(bs-collapse data-start-collapsed='true')
                     .panel-title(ng-show='expanded')
                         h3
-                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
+                            i.fa.fa-chevron-circle-up(ng-click='expanded = !expanded')
+                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
                     .panel-collapse(bs-collapse-target)
                         .span(bs-collapse data-start-collapsed='true' data-allow-multiple='true')
                             .panel.panel-default(ng-repeat='group in advanced')
@@ -70,7 +71,10 @@ block content
                                             +form-row
                     .panel-title
                         h3
-                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
+                            i.fa.fa-chevron-circle-up(ng-show='expanded' ng-click='expanded
= !expanded')
+                            i.fa.fa-chevron-circle-down(ng-show='!expanded' ng-click='expanded
= !expanded')
+                            a(bs-collapse-toggle='0' ng-click='expanded = !expanded') {{expanded
? 'Hide advanced settings...' : 'Show advanced settings...'}}
+
             div
                 button.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()')
Save
                 button.btn.btn-primary(ng-show='backupItem._id' ng-disabled='inputForm.$invalid'
ng-click='saveItemAs()') Copy

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index e0cc76f..ec5fbb7 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -64,7 +64,7 @@ block content
                             .settings-row(ng-repeat='field in metadataDb')
                                 +form-row
                         div(ng-hide='data.tables.length == 0')
-                            table.table-bordered.table-condensed.links-edit-small-padding.col-sm-12(st-table='data.tables')
+                            table.table-bordered.table-striped.metadata.col-sm-12(st-table='data.tables')
                                 thead
                                     tr
                                         th.col-sm-3 Schema/Table
@@ -73,49 +73,45 @@ block content
                                 tbody
                                     tr(ng-repeat='row in data.tables')
                                         td(colspan='{{row.tableName ? 1 : 3}}')
-                                            div.checkbox(ng-if='!row.tableName')
+                                            div(ng-if='!row.tableName')
                                                 label(ng-click='selectSchema($index)')
                                                     input(type='checkbox' ng-checked='row.use')
                                                     | {{row.schemaName}}
-                                            div.checkbox(ng-if='row.tableName')
-                                                label(style='padding-left: 30px' ng-click='selectTable($index)')
+                                            div(ng-if='row.tableName')
+                                                label(ng-class='{zzz: $index == 1}' style='padding-left:
10px' ng-click='selectTable($index)')
                                                     input(type='checkbox' ng-checked = 'row.use')
                                                     | {{row.tableName}}
                                         td(ng-if='row.tableName')
-                                            a(ng-show='data.curTableIdx != $index' ng-click='selectTable($index)')
{{row.keyClass}}
-                                            input.form-control(type='text' ng-show='data.curTableIdx
== $index' ng-model='data.curKeyClass' placeholder='Key class full name')
+                                            a(ng-click='selectTable($index)') {{row.keyClass}}
                                         td(ng-if='row.tableName')
-                                            a(ng-show='data.curTableIdx != $index' ng-click='selectTable($index)')
{{row.valueClass}}
-                                            input.form-control(type='text' ng-show='data.curTableIdx
== $index' ng-model='data.curValueClass' placeholder='Value class full name')
-                        //div(ng-hide='data.curTableIdx < 0')
-                        //    table.table-bordered.table-condensed.links-edit-small-padding.col-sm-12(st-table='data.tables[data.curTableIdx].fields')
-                        //        thead
-                        //            tr
-                        //                th(style='width:45px') Use
-                        //                th(style='width:45px') Key
-                        //                th(style='width:45px') Ak
-                        //                th DB Name
-                        //                th DB Type
-                        //                th Java Name
-                        //                th Java Type
-                        //        tbody
-                        //            tr(ng-repeat='row in data.tables[data.curTableIdx].fields')
-                        //                td
-                        //                    +dbcheck('row.use')
-                        //                td
-                        //                    +dbcheck('row.key')
-                        //                td
-                        //                    +dbcheck('row.ak')
-                        //                td
-                        //                    label {{row.databaseName}}
-                        //                td
-                        //                    label {{row.databaseType}}
-                        //                td
-                        //                    a(ng-show='data.curFieldIdx != $index' ng-click='selectField($index)')
{{row.javaName}}
-                        //                    input.form-control(type='text' ng-show='data.curFieldIdx
== $index' ng-model='data.curJavaName' placeholder='Field Java name')
-                        //                td
-                        //                    a(ng-show='data.curFieldIdx != $index' ng-click='selectField($index)')
{{row.javaType}}
-                        //                    input.form-control(type='text' ng-show='data.curFieldIdx
== $index' ng-model='data.curJavaType' placeholder='Field Java type')
+                                            a(ng-click='selectTable($index)') {{row.valueClass}}
+                        div
+                            table.table-bordered.table-striped.metadata.col-sm-12(st-table='fieldz')
+                                thead
+                                    tr
+                                        th(style='width:45px') Use
+                                        th(style='width:45px') Key
+                                        th(style='width:45px') Affinity Key
+                                        th DB Name
+                                        th DB Type
+                                        th Java Name
+                                        th Java Type
+                                tbody
+                                    tr(ng-repeat='row in fieldz')
+                                        td
+                                            input(type='checkbox')
+                                        td
+                                            input(type='checkbox')
+                                        td
+                                            input(type='checkbox')
+                                        td
+                                            label {{row.databaseName}}
+                                        td
+                                            label {{row.databaseType}}
+                                        td
+                                            label {{row.javaName}}
+                                        td
+                                            label {{row.javaType}}
                         button.btn.btn-primary(ng-disabled='dbForm.$invalid' ng-click='saveItem()')
Save
                         button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()')
Remove
                         button.btn.btn-primary.btn-second(ng-click='reloadMetadata()') Reload
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18659103/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index acee1d4..0ea2dcd 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -17,12 +17,12 @@
 mixin block-callout(titleWorkflow, contentWorkflow, whatsNextWorkflow, whatsNextContent)
     .block-callout-parent.block-callout-border.margin-bottom-dflt
         .block-callout
-            i.fa.fa-check-square
-            label #{titleWorkflow}
+            i.fa.fa-check-square.block-callout-header-left
+            label.block-callout-header-left #{titleWorkflow}
             p(ng-bind-html=contentWorkflow)
         .block-callout
-            i.fa.fa-check-square
-            label #{whatsNextWorkflow}
+            i.fa.fa-check-square.block-callout-header-right
+            label.block-callout-header-right #{whatsNextWorkflow}
             p(ng-bind-html=whatsNextContent)
 
 


Mime
View raw message