ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: IGNITE-843 Proportions for different screen sizes.
Date Mon, 10 Aug 2015 11:24:21 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 af5337069 -> 64e7d10c8


IGNITE-843 Proportions for different screen sizes.


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

Branch: refs/heads/ignite-843
Commit: 64e7d10c8e5007c5e69c6c4f0d6079538981c84f
Parents: af53370
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Aug 10 18:24:29 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Aug 10 18:24:29 2015 +0700

----------------------------------------------------------------------
 .../main/js/views/configuration/sidebar.jade    |  6 +++---
 .../main/js/views/configuration/summary.jade    | 14 +++++++-------
 .../src/main/js/views/includes/controls.jade    | 20 ++++++++++----------
 .../src/main/js/views/settings/profile.jade     | 10 +++++-----
 .../src/main/js/views/sql/sql.jade              |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64e7d10c/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 7289f3e..70053ff 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
@@ -26,7 +26,7 @@ mixin sidebar-item(ref, num, txt)
 
 block container
     .row
-        .col-sm-2.border-right.section-left.greedy
+        .col-xs-3.col-sm-3.col-md-2.border-right.section-left.greedy
             .sidebar-nav(bs-affix)
                 ul.menu(ng-controller='activeLink')
                     +sidebar-item('/configuration/clusters', 1, 'Clusters')
@@ -34,6 +34,6 @@ block container
                     +sidebar-item('/configuration/caches', 3, 'Caches')
                     +sidebar-item('/configuration/summary', 4, 'Summary')
 
-        .col-sm-10.border-left.section-right
+        .col-xs-9.col-sm-9.col-md-10.border-left.section-right
             .docs-content
-                block content
\ No newline at end of file
+                block content

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64e7d10c/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 d9c5ebc..5ffc498 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
@@ -64,9 +64,9 @@ block content
                                 div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlServer')
                             div(title='<img src="/images/java.png" width="16px" height="16px"/>
Java' bs-pane)
                                 .details-row
-                                    .col-sm-1
+                                    .col-xs-2.col-sm-1
                                         label Generate:
-                                    .col-sm-3
+                                    .col-xs-4.col-sm-3
                                         button.form-control(type='button' ng-model='configServer.javaClassServer'
 bs-select data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label
for item in javaClassItems' data-sort='false')
                                 div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaServer')
                             div(title='<img src="/images/docker.png" width="16px" height="16px"/>
Dockerfile' bs-pane)
@@ -80,9 +80,9 @@ block content
                                         | . For more information about using Ignite with
Docker please read&nbsp;
                                         +hard-link('http://apacheignite.readme.io/docs/docker-deployment',
'documentation')
                                         |.
-                                    .col-sm-2
+                                    .col-xs-3.col-sm-2
                                         label(for='os') Operation System:
-                                    .col-sm-4
+                                    .col-xs-5.col-sm-4
                                         input#os.form-control(type='text' ng-model='configServer.os'
placeholder='debian:8' data-min-length='0' data-html='1' data-auto-select='true' bs-typeahead
retain-selection bs-options='os for os in oss')
                                 div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer')
             .padding-dflt(bs-collapse data-start-collapsed='false')
@@ -97,14 +97,14 @@ block content
                     .panel-collapse(role='tabpanel' bs-collapse-target)
                         div(ng-show='selectedItem')
                             .details-row(ng-repeat='field in clientFields')
-                                +form-row-custom(['col-sm-3'], ['col-sm-3'], 'backupItem')
+                                +form-row-custom(['col-xs-4 col-sm-3'], ['col-xs-4 col-sm-3'],
'backupItem')
                             div(bs-tabs style='margin-top: 0.65em')
                                 div(title='<img src="/images/xml.png" width="16px" height="16px"/>
XML' bs-pane)
                                     div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlClient')
                                 div(title='<img src="/images/java.png" width="16px" height="16px"/>
Java' bs-pane)
                                     .details-row
-                                        .col-sm-1
+                                        .col-xs-2.col-sm-1
                                             label Generate:
-                                        .col-sm-4
+                                        .col-xs-5.col-sm-4
                                             button.form-control(type='button' ng-model='backupItem.javaClassClient'
bs-select data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for
item in javaClassItems' data-sort='false')
                                     div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaClient')

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64e7d10c/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 2ef3127..8a82b8a 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
@@ -59,14 +59,14 @@ mixin table-pair-edit(keyModel, valModel, keyPlaceholder, valPlaceholder,
keyJav
     -var focusIdKey = keyModel + focusId
     -var focusIdVal = valModel + focusId
 
-    .col-sm-6
+    .col-xs-6.col-sm-6.col-md-6
         label.fieldSep /
         .input-tip
             if keyJavaBuildInTypes
                 input.form-control(id=focusIdKey enter-focus-next=focusIdVal type='text'
ng-model=keyModel placeholder=keyPlaceholder bs-typeahead retain-selection data-min-length='1'
bs-options='javaClass for javaClass in javaBuildInClasses' on-escape='tableReset()')
             else
                 input.form-control(id=focusIdKey enter-focus-next=focusIdVal type='text'
ng-model=keyModel placeholder=keyPlaceholder on-escape='tableReset()')
-    .col-sm-6
+    .col-xs-6.col-sm-6.col-md-6
         -var arg = keyModel + ', ' + valModel
         -var btnVisible = 'tablePairSaveVisible(' + arg + ')'
         -var btnSave = 'tablePairSave(tablePairValid, backupItem, field, '+ arg +', ' + index
+ ')'
@@ -174,19 +174,19 @@ mixin table-db-field-edit(databaseName, databaseType, javaName, javaType,
focusI
     -var javaNameId = javaName + focusId
     -var javaTypeId = javaType + focusId
 
-    .col-sm-3
+    .col-xs-3.col-sm-3.col-md-3
         label.fieldSep /
         .input-tip
             input.form-control(id=databaseNameId enter-focus-next=databaseTypeId type='text'
ng-model=databaseName placeholder='DB name' on-escape='tableReset()')
-    .col-sm-3
+    .col-xs-3.col-sm-3.col-md-3
         label.fieldSep /
         .input-tip
             select.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseType
ng-options='item.value as item.label for item in {{jdbcTypes}}' on-escape='tableReset()')
-    .col-sm-3
+    .col-xs-3.col-sm-3.col-md-3
         label.fieldSep /
         .input-tip
             input.form-control(id=javaNameId enter-focus-next=javaTypeId type='text' ng-model=javaName
placeholder='Java name' on-escape='tableReset()')
-    .col-sm-3
+    .col-xs-3.col-sm-3.col-md-3
         -var args = databaseName + ', ' + databaseType + ', ' + javaName + ', ' + javaType
         -var btnVisible = 'tableDbFieldSaveVisible(' + args + ')'
         -var btnSave = 'tableDbFieldSave(field, ' + args + ', ' + index +')'
@@ -202,21 +202,21 @@ mixin table-group-item-edit(fieldName, className, direction, index)
     -var btnSave = 'tableGroupItemSave(' + args + ', ' + direction + ', groupIndex, ' + index
+')'
     -var btnVisibleAndSave = btnVisible + ' && ' + btnSave
 
-    .col-sm-4
+    .col-xs-4.col-sm-4.col-md-4
         label.fieldSep /
         .input-tip
             input.form-control(id=fieldName enter-focus-next=className type='text' ng-model=fieldName
placeholder='Field name' on-escape='tableReset()')
-    .col-sm-5
+    .col-xs-5.col-sm-5.col-md-5
         label.fieldSep /
         .input-tip
             input.form-control(id=className enter-focus-next=direction type='text' ng-model=className
placeholder='Class name' bs-typeahead retain-selection data-min-length='1' bs-options='javaClass
for javaClass in javaBuildInClasses' on-escape='tableReset()')
-    .col-sm-3
+    .col-xs-3.col-sm-3.col-md-3
         +btn-save(btnVisible, btnSave)
         .input-tip
             select.form-control(id=direction ng-model=direction ng-options='item.value as
item.label for item in {{sortDirections}}' on-enter=btnVisibleAndSave on-escape='tableReset()')
 
 mixin form-row(dataSource)
-    +form-row-custom(['col-sm-2'], ['col-sm-5'], dataSource)
+    +form-row-custom(['col-xs-3 col-sm-2 col-md-2'], ['col-xs-6 col-sm-5 col-md-5'], dataSource)
 
 mixin form-row-custom(lblClasses, fieldClasses, dataSource)
     - var fieldMdl = 'getModel('+ dataSource + ', field)[field.model]';

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64e7d10c/modules/control-center-web/src/main/js/views/settings/profile.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/profile.jade b/modules/control-center-web/src/main/js/views/settings/profile.jade
index b2ca05b..7451d2a 100644
--- a/modules/control-center-web/src/main/js/views/settings/profile.jade
+++ b/modules/control-center-web/src/main/js/views/settings/profile.jade
@@ -33,11 +33,11 @@ block container
                     .col-sm-10(style='padding: 0')
                         .details-row
                             +lbl('User name:')
-                            .col-sm-4
+                            .col-xs-5.col-sm-4
                                 input.form-control(type='text' ng-model='profileUser.username'
placeholder='Input name' required)
                         .details-row
                             +lbl('Email:')
-                            .col-sm-4
+                            .col-xs-5.col-sm-4
                                 input.form-control(type='email' ng-model='profileUser.email'
placeholder='you@domain.com' required)
                         .details-row
                             .checkbox
@@ -47,12 +47,12 @@ block container
                         div(ng-if='profileUser.changePassword')
                             .details-row
                                 +lbl('New password:')
-                                .col-sm-4
+                                .col-xs-5.col-sm-4
                                     input.form-control(type='password' ng-model='profileUser.newPassword'
placeholder='New password' ng-required='profileUser.changePassword')
                             .details-row
                                 +lbl('Confirm:')
-                                .col-sm-4
+                                .col-xs-5.col-sm-4
                                     input.form-control(type='password' ng-model='profileUser.confirmPassword'
match='profileUser.newPassword' placeholder='Confirm new password' ng-required='profileUser.changePassword')
-                    .col-sm-12.details-row
+                    .col-xs-12.col-sm-12.details-row
                         button.btn.btn-primary(ng-disabled='profileForm.$invalid' ng-click='saveUser()')
Save
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64e7d10c/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 5818fb4..c214ef5 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -42,12 +42,12 @@ block container
                         .tabs-below(bs-tabs bs-active-pane='tabs.activeIdx' data-template='/tab')
                             div(ng-repeat='tab in tabs' title='Query' bs-pane)
                         .row
-                            .col-sm-9(style='border-right: 1px solid #eee')
+                            .col-xs-8.col-sm-9(style='border-right: 1px solid #eee')
                                 div(style='height: 200px' ui-ace='{ theme: "chrome", mode:
"sql",' +
                                     'require: ["ace/ext/language_tools"],' +
                                     'rendererOptions: {showPrintMargin: false, highlightGutterLine:
false, fontSize: 14},' +
                                     'advanced: {enableSnippets: false, enableBasicAutocompletion:
true, enableLiveAutocompletion: true}}' ng-model='#{tab}.query')
-                            .col-sm-3
+                            .col-xs-4.col-sm-3
                                 div(ng-hide='caches.length == 0' style='margin-top: 0.65em')
                                     lable.labelHeader Caches:
                                     table.links(st-table='caches')


Mime
View raw message