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 Minor getting started fixes.
Date Mon, 08 Feb 2016 08:56:59 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 3eec50a27 -> 61fe0f7b4


IGNITE-843 Minor getting started fixes.


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

Branch: refs/heads/ignite-843-rc2
Commit: d7b22cd3f408e791f63621ac03a3d066043907cf
Parents: 3eec50a
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Feb 8 15:56:01 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Feb 8 15:56:01 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/data/getting-started.json   |  2 +-
 .../app/directives/information/information.jade |  4 +--
 .../src/main/js/public/stylesheets/style.scss   | 22 +++++--------
 .../js/views/configuration/domains-import.jade  |  2 +-
 .../src/main/js/views/includes/infos.jade       | 34 +++++++++-----------
 .../js/views/templates/getting-started.jade     |  2 +-
 6 files changed, 29 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b22cd3/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 5a2fb69..fd3b54c 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
@@ -8,7 +8,7 @@
             "<li>Import domain model from database</li>",
             "<li>Configure all needed caches</li>",
             "<li>Preview generated XML and Java code in browser</li>",
-            "<li>Download fully functional Maven project with generated XML and Java
code</li>",
+            "<li>Download ready-to-use Maven project</li>",
             "<li>Execute SQL queries on real clusters</li>",
             "</ul>"
         ]

http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b22cd3/modules/control-center-web/src/main/js/app/directives/information/information.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/information/information.jade
b/modules/control-center-web/src/main/js/app/directives/information/information.jade
index 8bb9cbc..b805d4a 100644
--- a/modules/control-center-web/src/main/js/app/directives/information/information.jade
+++ b/modules/control-center-web/src/main/js/app/directives/information/information.jade
@@ -15,6 +15,6 @@
     limitations under the License.
 
 .block-information
-    span.icon.fa.fa-info-circle
-    h3 {{::title}}
+    span.icon.fa.fa-info-circle(ng-if='title')
+    h3(ng-if='title') {{::title}}
     div(ng-transclude='')

http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b22cd3/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 19589b6..cea59a9 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
@@ -345,6 +345,14 @@ h1, h2, h3, h4, h5, h6 {
         float: left;
         margin: 0;
     }
+
+    .btn:last-child {
+        margin-right: 0;
+    }
+
+    .checkbox {
+        margin: 0;
+    }
 }
 
 .login-header {
@@ -1815,20 +1823,6 @@ treecontrol.tree-classic {
     margin: 15px 15px 300px;
 }
 
-.getting-started-footer {
-    @extend .modal-footer;
-
-    padding: 10px 15px;
-
-    .btn:last-child {
-        margin-right: 0;
-    }
-
-    .checkbox {
-        margin: 0;
-    }
-}
-
 .getting-started-demo {
     color: $brand-info;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b22cd3/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
index 87c439d..3bd9688 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
@@ -117,7 +117,7 @@ mixin td-ellipses-lbl(w, lbl)
                     thead
                         tr
                             th.header(colspan='6')
-                                .col-sm-4.pull-right(style='margin-bottom: 5px')
+                                .col-sm-4.pull-right(style='margin-bottom: 8px')
                                     input.form-control(type='text' st-search='label' placeholder='Filter
tables...' ng-model='importDomain.displayedTablesFilter' ng-change='selectTable()')
                         tr
                             th(width='30px')

http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b22cd3/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
index 23313a3..d7f692d 100644
--- a/modules/control-center-web/src/main/js/views/includes/infos.jade
+++ b/modules/control-center-web/src/main/js/views/includes/infos.jade
@@ -15,26 +15,24 @@
     limitations under the License.
 
 mixin ignite-clusters-information
-    ignite-information(data-title='On this screen you can')
+    ignite-information
         ul
             li Configure #[a(href='https://apacheignite.readme.io/docs/clustering' target='_blank')
clusters] properties
             li Associate clusters with caches and in-memory file systems
-            li Preview XML and Java code
 
-mixin ignite-caches-information
-    ignite-information(data-title='On this screen you can')
+mixin ignite-domains-information
+    ignite-information
         ul
-            li Configure #[a(href='https://apacheignite.readme.io/docs/data-grid' target='_blank')
caches] properties
-            li Associate caches with clusters and domain model
-            li Preview XML and Java code
+            li Import database schemas
+            li Try in
+                span.getting-started-demo(ng-click='showImportDomainModal(true)' style='cursor:
pointer') &nbsp;Demo&nbsp;
+                | mode
 
-mixin ignite-domains-information
-    ignite-information(data-title='On this screen you can')
+mixin ignite-caches-information
+    ignite-information
         ul
-            li Import Domain model from database
-            li Associate domain model with caches
-            li Configure #[a(href='https://apacheignite.readme.io/docs/sql-queries' target='_blank')
SQL queries]
-            li Preview XML and Java code
+            li Configure memory settings
+            li Configure persistence
 
 mixin ignite-igfs-information
     ignite-information(data-title='Configure IGFS only if you are going to use In-memory
File System')
@@ -44,10 +42,10 @@ mixin ignite-igfs-information
             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')
+    ignite-information
         ul
             li Preview XML configurations for #[a(href='https://apacheignite.readme.io/docs/clients-vs-servers'
target='_blank') server and client] nodes
-            li Preview Java classes with server and client nodes configuration from code
-            li Preview Maven pom.xml
-            li Preview #[a(href='https://apacheignite.readme.io/docs/docker-deployment' target='_blank')
Dockerfile] for server node
-            li Download fully functional Maven project
+            li Preview code configuration
+            li Preview #[a(href='https://apacheignite.readme.io/docs/docker-deployment' target='_blank')
Docker file]
+            li Preview POM dependencies
+            li Download ready-to-use Maven project

http://git-wip-us.apache.org/repos/asf/ignite/blob/d7b22cd3/modules/control-center-web/src/main/js/views/templates/getting-started.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/getting-started.jade b/modules/control-center-web/src/main/js/views/templates/getting-started.jade
index 0c8d316..b6a4392 100644
--- a/modules/control-center-web/src/main/js/views/templates/getting-started.jade
+++ b/modules/control-center-web/src/main/js/views/templates/getting-started.jade
@@ -20,7 +20,7 @@
         h4.modal-title {{title}}
     .getting-started
         .col-xs-12(ng-bind-html='message')
-    .getting-started-footer
+    .modal-footer
         .checkbox
             label
                 input(type='checkbox' ng-model='ui.showGettingStarted')


Mime
View raw message