ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [1/2] incubator-ignite git commit: # IGNITE-843 Fixed dropdown tabulation.
Date Tue, 18 Aug 2015 04:16:22 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 e86538d73 -> e828e466c


# IGNITE-843 Fixed dropdown tabulation.


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

Branch: refs/heads/ignite-843
Commit: 854adb4849b37f7c4f9a98947a54c13c5bcb659c
Parents: cd2048e
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Aug 18 11:16:04 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Aug 18 11:16:04 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/models/caches.json  |  4 ++--
 .../main/js/controllers/models/metadata.json    |  2 +-
 .../main/js/views/configuration/clusters.jade   |  2 +-
 .../src/main/js/views/includes/controls.jade    | 22 +++++++-------------
 4 files changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/854adb48/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index 1b2ab4b..c0bff96 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -46,7 +46,7 @@
         },
         {
           "label": "Mode",
-          "type": "select",
+          "type": "dropdown",
           "model": "mode",
           "placeholder": "PARTITIONED",
           "items": "modes",
@@ -61,7 +61,7 @@
         },
         {
           "label": "Atomicity",
-          "type": "select",
+          "type": "dropdown",
           "model": "atomicityMode",
           "placeholder": "ATOMIC",
           "items": "atomicities",

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/854adb48/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 74f8724..682181b 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
@@ -194,7 +194,7 @@
   "metadataDb": [
     {
       "label": "Driver JAR",
-      "type": "select",
+      "type": "dropdown",
       "model": "jdbcDriverJar",
       "items": "jdbcDriverJars",
       "tip": [

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/854adb48/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 3358c3a..03364a6 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
@@ -31,7 +31,7 @@ block content
         .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:
-            select.form-control.line-control(ng-model='template' ng-options='item.value as
item.label for item in templates')
+            button.form-control.line-control(ng-model='template' bs-options='item.value as
item.label for item in templates' bs-select)
             i.tipLabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}'
type='button')
         hr
         form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/854adb48/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 8209ad9..0a47b90 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
@@ -144,13 +144,13 @@ mixin details-row
             .col-sm-8
                 +tipField('detail.tip')
                 .input-tip
-                    button.form-control(bs-select data-placeholder='{{::detail.placeholder}}'
bs-options='item.value as item.label for item in {{detail.items}}')&attributes(detailCommon)
+                    button.form-control(bs-select data-placeholder='{{::detail.placeholder}}'
bs-options='item.value as item.label for item in {{detail.items}}' tabindex='0')&attributes(detailCommon)
         div(ng-switch-when='dropdown-multiple')
             label(class=lblDetailClasses ng-class='{required: detail.required}') {{::detail.label}}:
             .col-sm-8
                 +tipField('detail.tip')
                 .input-tip
-                    button.form-control(bs-select data-multiple='1' data-placeholder='{{::detail.placeholder}}'
bs-options='item.value as item.label for item in {{detail.items}}')&attributes(detailCommon)
+                    button.form-control(bs-select data-multiple='1' data-placeholder='{{::detail.placeholder}}'
bs-options='item.value as item.label for item in {{detail.items}}' tabindex='-1')&attributes(detailCommon)
         .group-section(ng-switch-when='table-simple')&attributes(detailCommon)
             .col-sm-12.group(id='{{::detail.model}}')
                 .group-legend
@@ -205,7 +205,7 @@ mixin table-db-field-edit(prefix, focusId, index)
     .col-xs-3.col-sm-3.col-md-3
         label.fieldSep /
         .input-tip
-            select.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel
ng-options='item.value as item.label for item in {{jdbcTypes}}' on-escape='tableReset()')
+            button.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel
bs-select bs-options='item.value as item.label for item in {{jdbcTypes}}' on-escape='tableReset()'
tabindex='0')
     .col-xs-3.col-sm-3.col-md-3
         label.fieldSep /
         .input-tip
@@ -217,7 +217,7 @@ mixin table-db-field-edit(prefix, focusId, index)
 
         +btn-save(btnVisible, btnSave)
         .input-tip
-            select.form-control(id=javaTypeId ng-model=javaTypeModel ng-options='item.value
as item.label for item in {{javaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()')
+            button.form-control(id=javaTypeId ng-model=javaTypeModel bs-select bs-options='item.value
as item.label for item in {{javaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()'
tabindex='0')
 
 mixin table-group-item-edit(prefix, index)
     -var fieldName = prefix + 'FieldName'
@@ -243,7 +243,7 @@ mixin table-group-item-edit(prefix, index)
     .col-xs-3.col-sm-3.col-md-3
         +btn-save(btnVisible, btnSave)
         .input-tip
-            select.form-control(id=direction ng-model=directionModel ng-options='item.value
as item.label for item in {{sortDirections}}' on-enter=btnVisibleAndSave on-escape='tableReset()')
+            button.form-control(id=direction ng-model=directionModel ng-options='item.value
as item.label for item in {{sortDirections}}' on-enter=btnVisibleAndSave on-escape='tableReset()'
tabindex='0')
 
 mixin form-row(dataSource)
     +form-row-custom(['col-xs-3 col-sm-2 col-md-2'], ['col-xs-6 col-sm-5 col-md-5'], dataSource)
@@ -289,24 +289,18 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
                     +ico-exclamation('{{field.model}}', 'min', 'Value is less than allowable
minimum.')
                     +ico-exclamation('{{field.model}}', 'max', 'Value is more than allowable
maximum.')
                     +ico-exclamation('{{field.model}}', 'number', 'Invalid value. Only numbers
allowed.')
-        div(ng-switch-when='select' ng-hide=fieldHide)
-            label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
-            div(class=fieldClasses)
-                +tipField('field.tip')
-                .input-tip
-                    select.form-control(id='{{::field.model}}' ng-options='item.value as
item.label for item in {{field.items}}')&attributes(fieldCommon)
         div(ng-switch-when='dropdown' ng-hide=fieldHide)
             label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
             div(class=fieldClasses)
                 +tipField('field.tip')
                 .input-tip
-                    button.form-control(bs-select data-placeholder='{{::field.placeholder}}'
bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon)
+                    button.form-control(bs-select data-placeholder='{{::field.placeholder}}'
bs-options='item.value as item.label for item in {{field.items}}' tabindex='0')&attributes(fieldCommon)
         div(ng-switch-when='dropdown-multiple' ng-hide=fieldHide)
             label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
             div(class=fieldClasses)
                 +tipField('field.tip')
                 .input-tip
-                    button.form-control(bs-select ng-disabled='{{field.items}}.length ==
0' data-multiple='1' data-placeholder='{{::field.placeholder}}' bs-options='item.value as
item.label for item in {{field.items}}')&attributes(fieldCommon)
+                    button.form-control(bs-select ng-disabled='{{field.items}}.length ==
0' data-multiple='1' data-placeholder='{{::field.placeholder}}' bs-options='item.value as
item.label for item in {{field.items}}' tabindex='-1')&attributes(fieldCommon)
             a.customize(ng-show='field.addLink' ng-href='{{field.addLink.ref}}') {{field.addLink.label}}
         div(ng-switch-when='dropdown-details' ng-hide=fieldHide)
             - var expanded = 'field.details[' + fieldMdl + '].expanded'
@@ -315,7 +309,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
             div(class=fieldClasses id='{{::field.id}}')
                 +tipField('field.tip')
                 .input-tip
-                    button.form-control(bs-select data-placeholder='{{::field.placeholder}}'
bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon)
+                    button.form-control(bs-select data-placeholder='{{::field.placeholder}}'
bs-options='item.value as item.label for item in {{field.items}}' tabindex='0')&attributes(fieldCommon)
             a.customize(ng-show='#{fieldMdl} && field.settings' ng-click='#{expanded}
= !#{expanded}') {{#{expanded} ? "Hide settings" : "Show settings"}}
             .col-sm-7.panel-details(ng-show='(#{expanded} || !field.settings) &&
#{fieldMdl}')
                 .details-row(ng-repeat='detail in field.details[#{fieldMdl}].fields')


Mime
View raw message