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 Fixed dropdown on modal.
Date Wed, 03 Feb 2016 10:35:09 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 0d14a01c4 -> 0deca4c23


IGNITE-843 Fixed dropdown on modal.


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

Branch: refs/heads/ignite-843-rc2
Commit: f2a0bc36577e74c7087152b0acfb88c811784620
Parents: 77430e5
Author: vsisko <vsisko@gridgain.com>
Authored: Wed Feb 3 17:34:50 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Feb 3 17:34:50 2016 +0700

----------------------------------------------------------------------
 .../main/js/views/configuration/domains-import.jade   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f2a0bc36/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 55f563e..87c439d 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
@@ -58,7 +58,7 @@ mixin td-ellipses-lbl(w, lbl)
                         .col-xs-8.col-sm-10.col-md-10
                             i.tipField.fa.fa-question-circle(bs-tooltip='' data-title='Select
appropriate JAR with JDBC driver<br> To add another driver you need to place it into
"/jdbc-drivers" folder of Ignite Web Agent<br> Refer to Ignite Web Agent README.txt
for for more information')
                             .input-tip
-                                button.select-toggle.form-control(id='jdbcDriverJar' bs-select
ng-model='ui.selectedJdbcDriverJar' ng-class='{placeholder: !(jdbcDriverJars && jdbcDriverJars.length
> 0)}' data-container='false' placeholder='Choose JDBC driver' bs-options='item.value as
item.label for item in jdbcDriverJars')
+                                button.select-toggle.form-control(id='jdbcDriverJar' bs-select
data-container='.modal' ng-model='ui.selectedJdbcDriverJar' ng-class='{placeholder: !(jdbcDriverJars
&& jdbcDriverJars.length > 0)}' placeholder='Choose JDBC driver' bs-options='item.value
as item.label for item in jdbcDriverJars')
                     .settings-row
                         label.col-xs-4.col-sm-2.col-md-2 JDBC Driver:
                         .col-xs-8.col-sm-10.col-md-10
@@ -144,9 +144,9 @@ mixin td-ellipses-lbl(w, lbl)
                                                     div.td-ellipsis
                                                         a(ng-if='!table.edit' ng-click='startEditDbTableCache(table)')
{{tableActionView(table)}}
                                                         div(style='display: flex' ng-if='table.edit')
-                                                            button.select-toggle.form-control(style='width:
35%; margin-right: 5px' bs-select ng-model='table.action' data-container='false' bs-options='item.value
as item.shortLabel for item in importActions')
-                                                            button.select-toggle.form-control(style='width:
65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='false' bs-options='item.value
as item.label for item in table.cachesOrTemplates')
-                                                            //- button.select-toggle.form-control(ng-if='table.action==2'
style='width: 65%; margin-right: 0' bs-select ng-model='table.cache' data-container='false'
bs-options='item.value as item.label for item in importCurrentCaches')
+                                                            button.select-toggle.form-control(style='width:
35%; margin-right: 5px' bs-select ng-model='table.action' data-container='.modal' bs-options='item.value
as item.shortLabel for item in importActions')
+                                                            button.select-toggle.form-control(style='width:
65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='.modal' bs-options='item.value
as item.label for item in table.cachesOrTemplates')
+                                                            //- button.select-toggle.form-control(ng-if='table.action==2'
style='width: 65%; margin-right: 0' bs-select ng-model='table.cache' data-container='.modal'
bs-options='item.value as item.label for item in importCurrentCaches')
                                                 td
                 .settings-row
                     label Defaults to be applied for filtered tables
@@ -154,9 +154,9 @@ mixin td-ellipses-lbl(w, lbl)
                 .settings-row
                     .col-sm-11
                         .col-sm-6(style='padding-right: 5px')
-                            button.select-toggle.form-control(bs-select ng-model='importCommon.action'
data-container='false' bs-options='item.value as item.label for item in importActions')
+                            button.select-toggle.form-control(bs-select ng-model='importCommon.action'
data-container='.modal' bs-options='item.value as item.label for item in importActions')
                         .col-sm-6(style='padding-left: 5px; padding-right: 5px')
-                            button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate'
data-container='false' bs-options='item.value as item.label for item in importCommon.cachesOrTemplates')
+                            button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate'
data-container='.modal' bs-options='item.value as item.label for item in importCommon.cachesOrTemplates')
                     .col-sm-1(style='padding-left: 5px')
                         button.btn.btn-primary(ng-click='applyDefaults()') Apply
             .import-domain-model-wizard-page(ng-show='importDomain.action == "options"' style='margin-bottom:
176px')
@@ -186,7 +186,7 @@ mixin td-ellipses-lbl(w, lbl)
                         .col-xs-9.col-sm-10.col-md-10
                             i.tipField.fa.fa-question-circle(bs-tooltip='' data-title='Choose
clusters that will be associated with generated caches')
                             .input-tip
-                                button.select-toggle.form-control(id='generatedCachesClusters'
bs-select ng-model='ui.generatedCachesClusters' ng-class='{placeholder: !(ui.generatedCachesClusters
&& ui.generatedCachesClusters.length > 0)}' data-container='false' data-multiple='1'
placeholder='Choose clusters for generated caches' bs-options='item.value as item.label for
item in clusters')
+                                button.select-toggle.form-control(id='generatedCachesClusters'
bs-select ng-model='ui.generatedCachesClusters' ng-class='{placeholder: !(ui.generatedCachesClusters
&& ui.generatedCachesClusters.length > 0)}' data-container='.modal' data-multiple='1'
placeholder='Choose clusters for generated caches' bs-options='item.value as item.label for
item in clusters')
             .modal-footer
                 label(ng-hide='importDomain.action == "drivers" || (importDomain.action ==
"connect" && importDomain.demo)').labelField {{importDomain.info}}
                 a.btn.btn-primary(ng-hide='importDomain.action == "drivers" || importDomain.action
== "connect"' ng-click='importDomainPrev()' bs-tooltip='' data-title='{{prevTooltipText()}}'
data-placement='bottom') Prev


Mime
View raw message