You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/09 10:00:19 UTC
[1/2] ignite git commit: IGNITE-843 Fixed download affix.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 31abbeb15 -> a66b79199
IGNITE-843 Fixed download affix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a71041f8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a71041f8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a71041f8
Branch: refs/heads/ignite-843-rc2
Commit: a71041f848afc759f4291596d7327f936652136d
Parents: 539f819
Author: Andrey <an...@gridgain.com>
Authored: Wed Dec 9 15:59:59 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Dec 9 15:59:59 2015 +0700
----------------------------------------------------------------------
.../main/js/views/configuration/summary.jade | 79 +++++++++++---------
1 file changed, 42 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a71041f8/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 3b238b8..024666f 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
@@ -38,45 +38,50 @@ mixin hard-link(ref, txt)
ignite-loading
hr
- .padding-dflt(ng-if='clusters.length == 0')
+ .padding-dflt(ng-if='!clusters || clusters.length == 0')
| You have no clusters configured. Please configure them
a(href='/configuration/clusters') here.
- +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}', 'name')
+ div(ng-show='clusters || clusters.length > 0')
+ +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}', 'name')
- div(ng-show='selectedItem && tableVisibleRow(displayedRows, selectedItem)' role='tab')
- .padding-top-dflt(ng-if='clusters.length > 0' bs-affix)
- button.btn.btn-primary(id='download' ng-click='downloadConfiguration()' bs-tooltip data-title='Download configuration' data-placement='bottom') Download
- hr
- .panel-group(bs-collapse ng-init='panels.activePanels=[0,1]' ng-model='panels.activePanels' data-allow-multiple='true')
- .panel.panel-default
- .panel-heading(role='tab' bs-collapse-toggle)
- i.fa(ng-class='panelExpanded(panels, "server") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
- label Server
- .panel-collapse(id='server' role='tabpanel' bs-collapse-target)
- .summary-tabs(bs-tabs data-bs-active-pane="tabsServer.activeTab" template='configuration/summary-tabs.html')
- div(bs-pane title='XML')
- ignite-ui-ace-xml(data-cluster='cluster')
- div(bs-pane title='Java')
- ignite-ui-ace-java(data-cluster='cluster')
- div(bs-pane title='POM')
- ignite-ui-ace-pom(data-cluster='cluster')
- div(bs-pane title='Dockerfile')
- ignite-ui-ace-docker(data-cluster='cluster' ng-model='ctrl.data.docker')
+ div(ng-show='selectedItem && tableVisibleRow(displayedRows, selectedItem)')
+ .padding-top-dflt(bs-affix)
+ button.btn.btn-primary(id='download' ng-click='downloadConfiguration()' bs-tooltip data-title='Download configuration' data-placement='bottom') Download
- .panel.panel-default
- .panel-heading(role='tab' bs-collapse-toggle)
- i.fa(ng-class='panelExpanded(panels, "client") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
- label Client
- .panel-collapse(id='client' role='tabpanel' bs-collapse-target)
- .details-row(ng-repeat='field in clientFields')
- +form-row-custom(['col-xs-4 col-sm-4 col-md-3'], ['col-xs-4 col-sm-4 col-md-3'], 'backupItem')
- .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab" template='configuration/summary-tabs.html')
- div(bs-pane title='XML')
- ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='backupItem.nearConfiguration')
- div(bs-pane title='Java')
- ignite-ui-ace-java(data-cluster='cluster' data-cluster-cfg='backupItem.nearConfiguration')
- div(bs-pane title='POM')
- ignite-ui-ace-pom(data-cluster='cluster')
- div(bs-pane title='POJO' ng-show='cluster | hasPojo')
- ignite-ui-ace-pojos(data-cluster='cluster' ng-model='ctrl.data.metadatas')
+ hr
+
+ .panel-group(bs-collapse ng-init='panels.activePanels=[0,1]' ng-model='panels.activePanels' data-allow-multiple='true')
+ .panel.panel-default
+ .panel-heading(role='tab' bs-collapse-toggle)
+ i.fa(ng-class='panelExpanded(panels, "server") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
+ label Server
+
+ .panel-collapse(id='server' role='tabpanel' bs-collapse-target)
+ .summary-tabs(bs-tabs data-bs-active-pane="tabsServer.activeTab" template='configuration/summary-tabs.html')
+ div(bs-pane title='XML')
+ ignite-ui-ace-xml(data-cluster='cluster')
+ div(bs-pane title='Java')
+ ignite-ui-ace-java(data-cluster='cluster')
+ div(bs-pane title='POM')
+ ignite-ui-ace-pom(data-cluster='cluster')
+ div(bs-pane title='Dockerfile')
+ ignite-ui-ace-docker(data-cluster='cluster' ng-model='ctrl.data.docker')
+
+ .panel.panel-default
+ .panel-heading(role='tab' bs-collapse-toggle)
+ i.fa(ng-class='panelExpanded(panels, "client") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
+ label Client
+
+ .panel-collapse(id='client' role='tabpanel' bs-collapse-target)
+ .details-row(ng-repeat='field in clientFields')
+ +form-row-custom(['col-xs-4 col-sm-4 col-md-3'], ['col-xs-4 col-sm-4 col-md-3'], 'backupItem')
+ .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab" template='configuration/summary-tabs.html')
+ div(bs-pane title='XML')
+ ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='backupItem.nearConfiguration')
+ div(bs-pane title='Java')
+ ignite-ui-ace-java(data-cluster='cluster' data-cluster-cfg='backupItem.nearConfiguration')
+ div(bs-pane title='POM')
+ ignite-ui-ace-pom(data-cluster='cluster')
+ div(bs-pane title='POJO' ng-show='cluster | hasPojo')
+ ignite-ui-ace-pojos(data-cluster='cluster' ng-model='ctrl.data.metadatas')
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a66b7919
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a66b7919
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a66b7919
Branch: refs/heads/ignite-843-rc2
Commit: a66b7919987bd7022911acbd40011bf9046e042d
Parents: a71041f 31abbeb
Author: Andrey <an...@gridgain.com>
Authored: Wed Dec 9 16:00:13 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Dec 9 16:00:13 2015 +0700
----------------------------------------------------------------------
.../main/js/helpers/generator/generator-java.js | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------