You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/01 17:49:07 UTC

ignite git commit: IGNITE-843 info content.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 49a7565a8 -> 6c7a104ce


IGNITE-843 info content.


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

Branch: refs/heads/ignite-843-rc2
Commit: 6c7a104cee4902d2fce4bbcbb60a85b4c9563b03
Parents: 49a7565
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Feb 1 23:48:46 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Feb 1 23:48:46 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/data/getting-started.json   | 38 +++++++++++++-
 .../src/main/js/views/configuration/caches.jade |  7 +--
 .../main/js/views/configuration/clusters.jade   |  7 +--
 .../main/js/views/configuration/domains.jade    |  8 +--
 .../src/main/js/views/configuration/igfs.jade   |  7 +--
 .../main/js/views/configuration/summary.jade    |  9 +---
 .../src/main/js/views/includes/infos.jade       | 53 ++++++++++++++++++++
 7 files changed, 100 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/modules/control-center-web/src/main/js/app/data/getting-started.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/data/getting-started.json b/modules/control-center-web/src/main/js/app/data/getting-started.json
index 268473a..1c0a37b 100644
--- a/modules/control-center-web/src/main/js/app/data/getting-started.json
+++ b/modules/control-center-web/src/main/js/app/data/getting-started.json
@@ -1,5 +1,11 @@
 [
     {
+        "title": "What is Apache Ignite",
+        "message": [
+            "Apache Ignite is a ..."
+        ]
+    },
+    {
         "title": "What is Apache Ignite Web Console",
         "message": [
             "Apache Ignite Web Console is a powerful tool for configuration of your cluster."
@@ -16,5 +22,35 @@
             "<li>See and download generated project for configured cluster on Summary screen</li>",
             "</ul>"
         ]
-    }
+    },
+    {
+        "title": "Cluster screen",
+        "message": [
+            "TODO"
+        ]
+    },
+    {
+        "title": "Domain model screen",
+        "message": [
+            "TODO"
+        ]
+    },
+    {
+        "title": "Caches screen",
+        "message": [
+            "TODO"
+        ]
+    },
+    {
+        "title": "IGFS screen",
+        "message": [
+          "TODO"
+        ]
+    },
+    {
+      "title": "Summary screen",
+      "message": [
+        "TODO"
+      ]
+  }
 ]

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/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 290a625..bbbf4df 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
@@ -15,15 +15,12 @@
     limitations under the License.
 
 include ../includes/controls
+include ../includes/infos
 
 .docs-header
     h1 Create and Configure Ignite Caches
 .docs-body(ng-controller='cachesController')
-    ignite-information(data-title='On this screen you can')
-        ul
-            li Configure caches
-            li Associate domain model with caches
-            li Preview XML and Java code for cache configuration
+    +ignite-caches-information
     div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen...", className: "page-loading-overlay"}')
         div(ng-show='ui.ready')
             hr

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/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 1d3525b..c6e00b0 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
@@ -15,15 +15,12 @@
     limitations under the License.
 
 include ../includes/controls
+include ../includes/infos
 
 .docs-header
     h1 Create and Configure Ignite Clusters
 .docs-body(ng-controller='clustersController')
-    ignite-information(data-title='On this screen you can')
-        ul
-            li Configure clusters
-            li Associate caches with clusters
-            li Preview XML and Java code for cluster configuration
+    +ignite-clusters-information
     div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen...", className: "page-loading-overlay"}')
         div(ng-show='ui.ready')
             hr

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/modules/control-center-web/src/main/js/views/configuration/domains.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains.jade b/modules/control-center-web/src/main/js/views/configuration/domains.jade
index c817ca5..ed70528 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains.jade
@@ -15,16 +15,12 @@
     limitations under the License.
 
 include ../includes/controls
+include ../includes/infos
 
 .docs-header
     h1 Create and Configure Domain Models
 .docs-body(ng-controller='domainsController')
-    ignite-information(data-title='On this screen you can')
-        ul
-            li Manually enter domain model descriptions
-            li Import Domain model from database
-            li Associate domain model with caches
-            li Preview XML and Java code for cluster configuration
+    +ignite-domains-information
     div(dw-loading='loadingDomainModelsScreen' dw-loading-options='{text: "Loading domain models screen...", className: "page-loading-overlay"}')
         div(ng-show='ui.ready')
             hr

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/modules/control-center-web/src/main/js/views/configuration/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
index c6eaa89..92d45e4 100644
--- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
@@ -15,15 +15,12 @@
     limitations under the License.
 
 include ../includes/controls
+include ../includes/infos
 
 .docs-header
     h1 Create and Configure IGFS
 .docs-body(ng-controller='igfsController')
-    ignite-information(data-title='Configure IGFS only if you are going to use In-memory File System')
-        ul
-            li Ignite File System (IGFS) is an in-memory file system allowing work with files and directories over existing cache infrastructure
-            li IGFS can either work as purely in-memory file system, or delegate to another file system (e.g. various Hadoop file system implementations) acting as a caching layer (see #[a(href='https://apacheignite.readme.io/docs/secondary-file-system' target='_blank') secondary file system]  for more detail)
-            li In addition IGFS provides API to execute map-reduce tasks over file system data
+    +ignite-igfs-information
     div(dw-loading='loadingIgfsScreen' dw-loading-options='{text: "Loading IGFS screen...", className: "page-loading-overlay"}')
         div(ng-show='ui.ready')
             +main-table('IGFS', 'igfss', 'igfsName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}', 'name')

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/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 6258900..f67aeea 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
@@ -15,6 +15,7 @@
     limitations under the License.
 
 include ../includes/controls
+include ../includes/infos
 
 mixin hard-link(ref, txt)
     a(style='color:#ec1c24' href=ref target='_blank') #{txt}
@@ -25,13 +26,7 @@ mixin ignite-form-field-tooltip(message)
 .docs-header
     h1 Configurations Summary
 .docs-body
-    ignite-information(data-title='On this screen you can preview')
-        ul
-            li XML configurations for server and client nodes
-            li Java classes with server and client nodes configuration from code
-            li POJO classes generated for configured domain model
-            li Maven pom.xml for generated project
-            li Dockerfile for server node
+    +ignite-summary-information
     ignite-loading
         hr
         .padding-dflt(ng-if='!clusters || clusters.length == 0')

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c7a104c/modules/control-center-web/src/main/js/views/includes/infos.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/infos.jade b/modules/control-center-web/src/main/js/views/includes/infos.jade
new file mode 100644
index 0000000..d3ce42f
--- /dev/null
+++ b/modules/control-center-web/src/main/js/views/includes/infos.jade
@@ -0,0 +1,53 @@
+//-
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+mixin ignite-clusters-information
+    ignite-information(data-title='On this screen you can')
+        ul
+            li Configure clusters
+            li Associate caches with clusters
+            li Preview XML and Java code for cluster configuration
+
+mixin ignite-caches-information
+    ignite-information(data-title='On this screen you can')
+        ul
+            li Configure caches
+            li Associate domain model with caches
+            li Preview XML and Java code for cache configuration
+
+mixin ignite-domains-information
+    ignite-information(data-title='On this screen you can')
+        ul
+            li Manually enter domain model descriptions
+            li Import Domain model from database
+            li Associate domain model with caches
+            li Preview XML and Java code for cluster configuration
+
+mixin ignite-igfs-information
+    ignite-information(data-title='Configure IGFS only if you are going to use In-memory File System')
+        ul
+            li Ignite File System (IGFS) is an in-memory file system allowing work with files and directories over existing cache infrastructure
+            li IGFS can either work as purely in-memory file system, or delegate to another file system (e.g. various Hadoop file system implementations) acting as a caching layer (see #[a(href='https://apacheignite.readme.io/docs/secondary-file-system' target='_blank') secondary file system]  for more detail)
+            li In addition IGFS provides API to execute map-reduce tasks over file system data
+
+mixin ignite-summary-information
+    ignite-information(data-title='On this screen you can preview')
+        ul
+            li XML configurations for server and client nodes
+            li Java classes with server and client nodes configuration from code
+            li POJO classes generated for configured domain model
+            li Maven pom.xml for generated project
+            li Dockerfile for server node