ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject incubator-ignite git commit: # ignite-843 Fixed layout for metadata.
Date Tue, 21 Jul 2015 03:27:11 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 b34fb931b -> a4ca8b710


# ignite-843 Fixed layout for metadata.


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

Branch: refs/heads/ignite-843
Commit: a4ca8b710f4c0e53d7014710b424c8354d2fd581
Parents: b34fb93
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Jul 21 10:28:09 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Jul 21 10:28:09 2015 +0700

----------------------------------------------------------------------
 .../nodejs/public/stylesheets/style.less        | 42 +++-------------
 .../nodejs/views/includes/controls.jade         | 50 ++++++++------------
 2 files changed, 26 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4ca8b71/modules/web-control-center/nodejs/public/stylesheets/style.less
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/stylesheets/style.less b/modules/web-control-center/nodejs/public/stylesheets/style.less
index ca4d72f..e4369e4 100644
--- a/modules/web-control-center/nodejs/public/stylesheets/style.less
+++ b/modules/web-control-center/nodejs/public/stylesheets/style.less
@@ -860,6 +860,12 @@ label {
   margin-left: 5px;
 }
 
+.fieldSep {
+  float: right;
+  line-height: @input-height;
+  margin: 0 5px;
+}
+
 .fieldButton {
   float: right;
   margin-left: 5px;
@@ -1068,40 +1074,4 @@ a {
   height: 400px;
 }
 
-.grid {
-  display: flex;
-  flex-wrap: nowrap;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-
-  label {
-    line-height: @input-height;
-  }
-}
-
-.grid-cell-1 {
-  flex-basis: 100%;
-}
-
-.grid-cell-2 {
-  flex-basis: 50%;
-}
-
-.grid-cell-3 {
-  flex-basis: 33%;
-}
-
-.grid-cell-4 {
-  flex-basis: 25%;
-}
-
-.grid-cell-fa {
-  flex-basis: 16px;
-}
-
-.grid-fixed-cell {
-  flex-basis: 10px;
-}
-
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4ca8b71/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index aaed1a1..6c81489 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -38,13 +38,11 @@ mixin btn-down(show, click)
     i.tipField.fa.fa-arrow-down(ng-show=show ng-click=click)
 
 mixin table-pair-edit(keyModel, valModel, keyPlaceholder, valPlaceholder)
-    .grid
-        .grid-cell-2
-            input.form-control(type='text' ng-model=keyModel placeholder=keyPlaceholder)
-        div
-            label &nbsp;/&nbsp;
-        .grid-cell-2
-            input.form-control(type='text' ng-model=valModel placeholder=valPlaceholder)
+    .col-sm-6(style='float: right')
+        input.form-control(type='text' ng-model=valModel placeholder=valPlaceholder)
+    label.fieldSep /
+    .input-tip
+        input.form-control(type='text' ng-model=keyModel placeholder=keyPlaceholder)
 
 mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder)
     .col-sm-6
@@ -61,13 +59,11 @@ mixin table-pair(header, tblMdl, keyFld, valFld, keyPlaceholder, valPlaceholder)
                     div(ng-show='tableEditing(field, $index)')
                         label.labelField {{$index + 1}})
                         +btn-save('tablePairSaveVisible(curKey, curValue)', 'tablePairSave(tablePairValid,
backupItem, field, curKey, curValue, $index)')
-                        .input-tip
-                            +table-pair-edit('curKey', 'curValue', keyPlaceholder, valPlaceholder)
+                        +table-pair-edit('curKey', 'curValue', keyPlaceholder, valPlaceholder)
     .settings-row(ng-show='tableNewItemActive(field)')
         .col-sm-6
             +btn-save('tablePairSaveVisible(newKey, newValue)', 'tablePairSave(tablePairValid,
backupItem, field, newKey, newValue, -1)')
-            .input-tip
-                +table-pair-edit('newKey', 'newValue', keyPlaceholder, valPlaceholder)
+            +table-pair-edit('newKey', 'newValue', keyPlaceholder, valPlaceholder)
 
 mixin details-row
     - var lblDetailClasses = ['col-sm-4', 'details-label']
@@ -137,21 +133,17 @@ mixin details-row
                 +ico-exclamation('{{detail.model}}', 'ipaddress', 'Invalid address, see help
for format description.')
 
 mixin table-db-field-edit(dbName, dbType, javaName, javaType)
-    .grid
-        .grid-cell-4
-            input.form-control(type='text' ng-model=dbName placeholder='DB name')
-        div
-            label &nbsp;/&nbsp;
-        .grid-cell-4
-            button.form-control(ng-model=dbType bs-select data-placeholder='JDBC type' bs-options='item.value
as item.label for item in {{jdbcTypes}}')
-        div
-            label &nbsp;/&nbsp;
-        .grid-cell-4
-            input.form-control(type='text' ng-model=javaName placeholder='Java name')
-        div
-            label &nbsp;/&nbsp;
-        .grid-cell-4
-            button.form-control(ng-model=javaType bs-select data-placeholder='Java type'
bs-options='item.value as item.label for item in {{javaTypes}}')
+    div(style='width: 20%; float: right')
+        button.form-control(ng-model=javaType bs-select data-placeholder='Java type' bs-options='item.value
as item.label for item in {{javaTypes}}')
+    label.fieldSep /
+    div(style='width: 22%; float: right')
+        input.form-control(type='text' ng-model=javaName placeholder='Java name')
+    label.fieldSep /
+    div(style='width: 20%; float: right')
+        button.form-control(ng-model=dbType bs-select data-placeholder='JDBC type' bs-options='item.value
as item.label for item in {{jdbcTypes}}')
+    label.fieldSep /
+    .input-tip
+        input.form-control(type='text' ng-model=dbName placeholder='DB name')
 
 mixin form-row
     +form-row-custom(['col-sm-2'], ['col-sm-4'])
@@ -259,13 +251,11 @@ mixin form-row-custom(lblClasses, fieldClasses)
                             div(ng-if='tableEditing(field, $index)')
                                 label.labelField {{$index + 1}})
                                 +btn-save('tableDbFieldSaveVisible(curDbName, curDbType,
curJavaName, curJavaType)', 'tableDbFieldSave(field, curDbName, curDbType, curJavaName, curJavaType,
$index)')
-                                .input-tip
-                                    +table-db-field-edit('curDbName', 'curDbType', 'curJavaName',
'curJavaType')
+                                +table-db-field-edit('curDbName', 'curDbType', 'curJavaName',
'curJavaType')
             .settings-row(ng-show='tableNewItemActive(field)')
                 .col-sm-6
                     +btn-save('tableDbFieldSaveVisible(newDbName, newDbType, newJavaName,
newJavaType)', 'tableDbFieldSave(field, newDbName, newDbType, newJavaName, newJavaType, -1)')
-                    .input-tip
-                        +table-db-field-edit('newDbName', 'newDbType', 'newJavaName', 'newJavaType')
+                    +table-db-field-edit('newDbName', 'newDbType', 'newJavaName', 'newJavaType')
         div(ng-switch-when='queryGroups' ng-hide=fieldHide)
             .col-sm-6
                 label.table-header {{field.label}}:


Mime
View raw message