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 2015/08/14 05:19:46 UTC
incubator-ignite git commit: IGNITE-843 Refactored to use mixins.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 d46c8e026 -> 51045941f
IGNITE-843 Refactored to use mixins.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51045941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51045941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51045941
Branch: refs/heads/ignite-843
Commit: 51045941fc9a6fdd631223cf47fa8bdb1c688483
Parents: d46c8e0
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Aug 14 10:19:55 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Aug 14 10:19:55 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/models/metadata.json | 11 ++---
.../src/main/js/views/configuration/caches.jade | 35 +++-------------
.../main/js/views/configuration/clusters.jade | 36 +++--------------
.../main/js/views/configuration/metadata.jade | 28 ++++---------
.../main/js/views/configuration/sidebar.jade | 4 +-
.../src/main/js/views/includes/controls.jade | 42 ++++++++++++++++++++
6 files changed, 67 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51045941/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 13cc2ec..4e8bed2 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
@@ -3,15 +3,16 @@
"workflowTitle": "What's now:",
"workflowContent": [
"<ul>",
- " <li>Manually configure metadata for queries and persistence.</li>",
- " <li>Automatically configure metadata from database schema.</li>",
- "</ul>"
+ " <li>Manually enter Metadata</li>",
+ " <li>Load Metadata from Database</li>",
+ "</ul><br/>"
],
"whatsNextTitle": "What's next:",
"whatsNextContent": [
"<ul>",
- " <li>Associate caches with metadata.</li>",
- " <li>Generate XML and java code on Summary view.</li>",
+ " <li>Continue to <a href='/configuration/caches'>Caches</a></li>",
+ " <li>Continue to <a href='/configuration/summary'>Summary</a></li>",
+ " <li>Back to <a href='/configuration/clusters'>Clusters</a></li>",
"</ul>"
]
},
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51045941/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 cad9aab..c5cdcae 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
@@ -27,45 +27,20 @@ block content
hr
.docs-body(ng-controller='cachesController')
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
- div(ng-hide='caches.length == 0')
- .padding-dflt
- lable.labelHeader Caches:
- table.links(st-table='caches')
- tbody
- tr(ng-repeat='row in caches track by row._id')
- td(ng-class='{active: row._id == selectedItem._id}')
- a(on-click-focus='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.mode | displayValue:modes:'Cache mode not set'}}, {{row.atomicityMode | displayValue:atomicities:'Cache atomicity not set'}}
+ +main-table('Caches:', 'caches', 'defaultFocusId', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.mode | displayValue:modes:"Cache mode not set"}}, {{row.atomicityMode | displayValue:atomicities:"Cache atomicity not set"}}')
.padding-top-dflt
button.btn.btn-primary(on-click-focus='defaultFocusId' ng-click='createItem()') Add cache
hr
form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
- .panel.panel-default(ng-repeat='group in general')
- .panel-heading
- h3
- a(bs-collapse-toggle) {{::group.label}}
- .panel-collapse(bs-collapse-target)
- .panel-body
- .settings-row(ng-repeat='field in group.fields')
- +form-row('backupItem')
+ +groups('general', 'backupItem')
div(ng-show='ui.expanded')
- .advanced-options
+ +advanced-options-bottom
i.fa.fa-chevron-circle-up(ng-click='toggleExpanded()')
a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
- .panel.panel-default(ng-repeat='group in advanced')
- .panel-heading
- h3
- a(bs-collapse-toggle) {{::group.label}}
- .panel-collapse(bs-collapse-target)
- .panel-body
- .settings-row(ng-repeat='field in group.fields')
- +form-row('backupItem')
- .advanced-options
- i.fa.fa-chevron-circle-up(ng-show='ui.expanded' ng-click='toggleExpanded()')
- i.fa.fa-chevron-circle-down(ng-show='!ui.expanded' ng-click='toggleExpanded()')
- a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
+ +groups('advanced', 'backupItem')
+ +advanced-options-top
.section
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
button.btn.btn-primary(ng-show='backupItem._id' ng-click='removeItem()') Remove
-
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51045941/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 360ccc4..bd01786 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
@@ -27,14 +27,7 @@ block content
hr
.docs-body(ng-controller='clustersController')
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
- div(ng-hide='clusters.length == 0')
- .padding-dflt
- lable.labelHeader Clusters:
- table.links(st-table='clusters')
- tbody
- tr(ng-repeat='row in clusters track by row._id')
- td(ng-class='{active: row._id == selectedItem._id}')
- a(on-click-focus='clusterName' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}}
+ +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:"Discovery not set"}}')
.padding-top-dflt
button.btn.btn-primary(on-click-focus='clusterName' ng-click='createItem()') Add cluster
label(style='margin-left: 10px; margin-right: 10px') Use template:
@@ -43,30 +36,11 @@ block content
hr
form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
- .panel.panel-default
- .panel-heading
- h3
- a(bs-collapse-toggle) General
- .panel-collapse(bs-collapse-target)
- .panel-body
- .settings-row(ng-repeat='field in general')
- +form-row('backupItem')
+ +group('General', 'general', 'backupItem')
div(ng-show='ui.expanded')
- .advanced-options
- i.fa.fa-chevron-circle-up(ng-click='toggleExpanded()')
- a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
- .panel.panel-default(ng-repeat='group in advanced')
- .panel-heading
- h3
- a(bs-collapse-toggle) {{::group.label}}
- .panel-collapse(bs-collapse-target)
- .panel-body
- .settings-row(ng-repeat='field in group.fields')
- +form-row('backupItem')
- .advanced-options
- i.fa.fa-chevron-circle-up(ng-show='ui.expanded' ng-click='toggleExpanded()')
- i.fa.fa-chevron-circle-down(ng-show='!ui.expanded' ng-click='toggleExpanded()')
- a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
+ +advanced-options-bottom
+ +groups('advanced', 'backupItem')
+ +advanced-options-top
.section
button.btn.btn-primary(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/51045941/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 57d73d1..1cef373 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
@@ -27,29 +27,15 @@ block content
hr
.docs-body(ng-controller='metadataController')
+block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)', '{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
- div(ng-hide='metadatas.length == 0')
- .padding-dflt
- lable.labelHeader Types metadata:
- table.links(st-table='metadatas')
- tbody
- tr(ng-repeat='row in metadatas track by row._id')
- td(ng-class='{active: row._id == selectedItem._id}')
- a(on-click-focus='defaultFocusId' ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}
+ +main-table('Types metadata:', 'metadatas', 'defaultFocusId', 'selectItem(row)', '{{$index + 1}}) {{row.name}}')
.padding-top-dflt
button.btn.btn-primary(ng-click='createItem()' on-click-focus='defaultFocusId') Add metadata
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
hr
form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
- .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
- .panel.panel-default(ng-repeat='group in metadata')
- .panel-heading
- h3
- a(bs-collapse-toggle) {{::group.label}}
- .panel-collapse(role='tabpanel' bs-collapse-target)
- .panel-body
- .settings-row(ng-repeat='field in group.fields')
- +form-row('backupItem')
- .section
- 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
- button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
+ .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+ +groups('metadata', 'backupItem')
+ .section
+ 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
+ button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51045941/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/sidebar.jade b/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
index 70053ff..6957adf 100644
--- a/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/sidebar.jade
@@ -30,8 +30,8 @@ block container
.sidebar-nav(bs-affix)
ul.menu(ng-controller='activeLink')
+sidebar-item('/configuration/clusters', 1, 'Clusters')
- +sidebar-item('/configuration/metadata', 2, 'Metadata')
- +sidebar-item('/configuration/caches', 3, 'Caches')
+ +sidebar-item('/configuration/caches', 2, 'Caches')
+ +sidebar-item('/configuration/metadata', 3, 'Metadata')
+sidebar-item('/configuration/summary', 4, 'Summary')
.col-xs-9.col-sm-9.col-md-10.border-left.section-right
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51045941/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 0994aa2..e57e085 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
@@ -414,3 +414,45 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
+btn-save('tableGroupSaveVisible(field, -1)', 'tableGroupSave(field, -1)')
.input-tip
input#newGroupName.form-control(type='text' ng-model='field.newGroupName' placeholder='Group name' on-enter='tableGroupSaveVisible(field, -1) && tableGroupSave(field, -1)' on-escape='tableReset()')
+
+mixin main-table(title, rows, focusId, click, rowTemplate)
+ .padding-dflt(ng-show='#{rows} && #{rows}.length > 0')
+ lable.labelHeader #{title}
+ table.links(st-table=rows)
+ tbody
+ tr(ng-repeat='row in #{rows} track by row._id')
+ td(ng-class='{active: row._id == selectedItem._id}')
+ a(on-click-focus=focusId ng-click=click) #{rowTemplate}
+
+mixin group(title, fields, dataSource)
+ .panel.panel-default
+ .panel-heading
+ h3
+ a(bs-collapse-toggle) #{title}
+ .panel-collapse(bs-collapse-target)
+ .panel-body
+ .settings-row(ng-repeat='field in #{fields}')
+ +form-row(dataSource)
+
+mixin groups(groups, dataSource)
+ .panel.panel-default(ng-repeat='group in #{groups}')
+ .panel-heading
+ h3
+ a(bs-collapse-toggle) {{::group.label}}
+ i.tipLabel.fa.fa-question-circle(ng-if='group.tip' bs-tooltip='joinTip(group.tip)' type='button')
+ i.tipLabel.fa.fa-question-circle.blank(ng-if='!group.tip')
+ .panel-collapse(role='tabpanel' bs-collapse-target)
+ .panel-body
+ .settings-row(ng-repeat='field in group.fields')
+ +form-row(dataSource)
+
+mixin advanced-options-top
+ .advanced-options
+ i.fa.fa-chevron-circle-up(ng-show='ui.expanded' ng-click='toggleExpanded()')
+ i.fa.fa-chevron-circle-down(ng-show='!ui.expanded' ng-click='toggleExpanded()')
+ a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
+
+mixin advanced-options-bottom
+ .advanced-options
+ i.fa.fa-chevron-circle-up(ng-click='toggleExpanded()')
+ a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}