ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/2] ignite git commit: IGNITE-843 WIP on "More info...".
Date Wed, 23 Sep 2015 09:39:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 d5b4b4ed5 -> 882b4791e


IGNITE-843 WIP on "More info...".


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

Branch: refs/heads/ignite-843
Commit: f782cbcce15e4f0d0e3bcd9343a8fcd7e2edae19
Parents: d5b4b4e
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Sep 23 16:17:26 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Sep 23 16:17:26 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/models/caches.json  | 17 ++++++--------
 .../main/js/controllers/models/clusters.json    | 13 ++++-------
 .../main/js/controllers/models/metadata.json    | 15 +++++-------
 .../src/main/js/controllers/models/summary.json | 17 ++++++--------
 .../src/main/js/public/stylesheets/style.scss   | 21 +++++++----------
 .../src/main/js/views/configuration/caches.jade |  2 +-
 .../main/js/views/configuration/clusters.jade   |  2 +-
 .../main/js/views/configuration/metadata.jade   |  2 +-
 .../main/js/views/configuration/summary.jade    |  2 +-
 .../src/main/js/views/includes/controls.jade    | 24 ++++++++++++--------
 10 files changed, 51 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 5baf9fd..bb16f74 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
@@ -2,19 +2,16 @@
   "screenTip": {
     "workflowTitle": "On This Screen:",
     "workflowContent": [
-      "<ul>",
-      "  <li>Configure Caches</li>",
-      "  <li>Link Metadata to Caches</li>",
-      "  <li>Link Caches to Clusters</li>",
-      "</ul>"
+      "Configure Caches",
+      "Link Metadata to Caches",
+      "Link Caches to Clusters",
+      "More info..."
     ],
     "whatsNextTitle": "Next Steps:",
     "whatsNextContent": [
-      "<ul>",
-      "  <li>Continue to <a href='/configuration/metadata'>Metadata</a></li>",
-      "  <li>Continue to <a href='/configuration/summary'>Summary</a></li>",
-      "  <li>Back to <a href='/configuration/clusters'>Clusters</a></li>",
-      "</ul>"
+      "Continue to <a href='/configuration/metadata'>Metadata</a>",
+      "Continue to <a href='/configuration/summary'>Summary</a>",
+      "Back to <a href='/configuration/clusters'>Clusters</a>"
     ]
   },
   "general": [

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 e07d31f9..ca612bc 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
@@ -2,17 +2,14 @@
   "screenTip": {
     "workflowTitle": "On This Screen:",
     "workflowContent": [
-      "<ul>",
-      "  <li>Configure Clusters</li>",
-      "  <li>Link Clusters to Caches</li>",
-      "</ul>"
+      "Configure Clusters",
+      "Link Clusters to Caches",
+      "More info..."
     ],
     "whatsNextTitle": "Next Steps:",
     "whatsNextContent": [
-      "<ul>",
-      "  <li>Continue to <a href='/configuration/caches'>Caches</a></li>",
-      "  <li>Continue to <a href='/configuration/summary'>Summary</a></li>",
-      "</ul>"
+      "Continue to <a href='/configuration/caches'>Caches</a>",
+      "Continue to <a href='/configuration/summary'>Summary</a>"
     ]
   },
   "general": [

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 aecf9c8..ba46792 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
@@ -2,18 +2,15 @@
   "screenTip": {
     "workflowTitle": "On This Screen:",
     "workflowContent": [
-      "<ul>",
-      "  <li>Manually enter Metadata</li>",
-      "  <li>Load Metadata from Database</li>",
-      "</ul><br/>"
+      "Manually enter Metadata",
+      "Load Metadata from Database",
+      "More info..."
     ],
     "whatsNextTitle": "Next Steps:",
     "whatsNextContent": [
-      "<ul>",
-      "  <li>Continue to <a href='/configuration/summary'>Summary</a></li>",
-      "  <li>Back to <a href='/configuration/caches'>Caches</a></li>",
-      "  <li>Back to <a href='/configuration/clusters'>Clusters</a></li>",
-      "</ul>"
+      "Continue to <a href='/configuration/summary'>Summary</a>",
+      "Back to <a href='/configuration/caches'>Caches</a>",
+      "Back to <a href='/configuration/clusters'>Clusters</a>"
     ]
   },
   "metadata": [

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 dc74bb1..5a30ff8 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
@@ -2,19 +2,16 @@
   "screenTip": {
     "workflowTitle": "On This Screen:",
     "workflowContent": [
-      "<ul>",
-      "  <li>Download XML Config</li>",
-      "  <li>Download Java Code</li>",
-      "  <li>Download Docker File</li>",
-      "</ul>"
+      "Download XML Config",
+      "Download Java Code",
+      "Download Docker File",
+      "More info..."
     ],
     "whatsNextTitle": "Next Steps:",
     "whatsNextContent": [
-      "<ul>",
-      "  <li>Deploy Ignite Servers</li>",
-      "  <li>Connect Ignite Clients</li>",
-      "  <li>Analyze with SQL</li>",
-      "</ul>"
+      "Deploy Ignite Servers",
+      "Connect Ignite Clients",
+      "Analyze with SQL"
     ]
   },
   "clientFields": [

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 9da3904..6410f7b 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
@@ -1290,32 +1290,27 @@ a {
 }
 
 .block-callout-parent {
-    overflow: hidden;
+    table {
+        width: 100%
+    }
 }
 
 .block-callout {
     border-left: 5px solid;
-    display: inline-block;
     vertical-align: top;
-    width: 50%;
 
     i {
         padding: 10px 5px 0 10px;
     }
 
-    ul {
-        padding-left: 20px;
-        margin-bottom: 0;
-    }
-
-    p {
-        padding: 5px 0 10px 10px;
-        margin: 0;
-    }
-
     label {
         font-weight: bold;
     }
+
+    ul {
+        padding: 5px 0 10px 20px;
+        margin: 0 0 0 10px;
+    }
 }
 
 .block-callout-left {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 1f3687d..7631d5a 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
@@ -28,7 +28,7 @@ block content
     .docs-body(ng-controller='cachesController')
         div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen..."}')
             div(ng-if='ui.ready')
-                +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+                +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent',
'{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
                 +main-table('Caches:', 'caches', 'cacheName', 'selectItem(row)', '{{$index
+ 1}}) {{row.name}}, {{row.cacheMode | displayValue:cacheModes:"Cache mode not set"}}, {{row.atomicityMode
| displayValue:atomicities:"Cache atomicity not set"}}')
                 .padding-top-dflt(bs-affix)
                     .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create
new caches')

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 d10c20e..8cbb5a5 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
@@ -28,7 +28,7 @@ block content
     .docs-body(ng-controller='clustersController')
         div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters
screen..."}')
             div(ng-if='ui.ready')
-                +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+                +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent',
'{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
                 +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index
+ 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:"Discovery not set"}}')
                 .padding-top-dflt(bs-affix)
                     .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create
new cluster')

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 aac5cf0..3403e33 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
@@ -28,7 +28,7 @@ block content
     .docs-body(ng-controller='metadataController')
         div(dw-loading='loadingMetadataScreen' dw-loading-options='{text: "Loading metadata
screen..."}')
             div(ng-if='ui.ready')
-                +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+                +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent',
'{{screenTip.whatsNextTitle}}', 'screenTip.whatsNextContent')
                 +main-table('Types metadata:', 'metadatas', 'metadataName', 'selectItem(row)',
'{{$index + 1}}) {{row.valueType}}')
                 .padding-top-dflt(bs-affix)
                     .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create
new metadata')

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 108fcc3..7bb7198 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -41,7 +41,7 @@ block content
         h1 Configurations Summary
         hr
     .docs-body(ng-controller='summaryController')
-        +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
+        +block-callout('{{screenTip.workflowTitle}}', 'screenTip.workflowContent', '{{screenTip.whatsNextTitle}}',
'screenTip.whatsNextContent')
         .padding-dflt(ng-if='clusters.length == 0')
             | You have no clusters configured. Please configure them &nbsp;
             a(href='clusters') here.

http://git-wip-us.apache.org/repos/asf/ignite/blob/f782cbcc/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 ad694ff..96e7bda 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
@@ -14,16 +14,20 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-mixin block-callout(titleWorkflow, contentWorkflow, whatsNextWorkflow, whatsNextContent)
-    .block-callout-parent.margin-bottom-dflt
-        .block-callout-left
-            i.fa.fa-check-square.block-callout-header-left
-            label.block-callout-header-left #{titleWorkflow}
-            p(ng-bind-html=contentWorkflow)
-        .block-callout-right
-            i.fa.fa-check-square.block-callout-header-right
-            label.block-callout-header-right #{whatsNextWorkflow}
-            p(ng-bind-html=whatsNextContent)
+mixin block-callout(workflowTitle, workflowContent, whatsNextTitle, whatsNextContent)
+    table.block-callout-parent
+        tbody
+            tr(height='100%')
+                td.block-callout-left(width='50%')
+                    i.fa.fa-check-square.block-callout-header-left
+                    label.block-callout-header-left #{workflowTitle}
+                    ul
+                        li(ng-repeat='item in #{workflowContent}' ng-bind='item')
+                td.block-callout-right(width='50%')
+                    i.fa.fa-check-square.block-callout-header-right
+                    label.block-callout-header-right #{whatsNextTitle}
+                    ul
+                        li(ng-repeat='item in #{whatsNextContent}' ng-bind-html='item')
 
 mixin tipField(lines)
     i.tipField.fa.fa-question-circle(ng-if=lines bs-tooltip='joinTip(#{lines})' type='button')


Mime
View raw message