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/09/14 05:37:46 UTC
[1/2] ignite git commit: # GG-843 Minor UI fixes.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 0ec6d14a2 -> 88054456e
# GG-843 Minor UI fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d761844
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d761844
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d761844
Branch: refs/heads/ignite-843
Commit: 3d7618444bc138993accfe01bcc3020692cdc6d3
Parents: be874ae
Author: Andrey <an...@gridgain.com>
Authored: Mon Sep 14 10:36:51 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Sep 14 10:36:51 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 4 ++--
.../src/main/js/public/stylesheets/style.scss | 24 ++++++++++++--------
.../src/main/js/views/includes/controls.jade | 4 ++--
.../src/main/js/views/templates/select.jade | 4 ++--
4 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d761844/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index f5db503..6d58fb7 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -1045,9 +1045,9 @@ controlCenterModule.service('$table', ['$common', '$focus', function ($common, $
}
else if (ui == 'table-db-fields') {
field.newDatabaseName = null;
- field.newDatabaseType = 'INTEGER';
+ field.newDatabaseType = null;
field.newJavaName = null;
- field.newJavaType = 'Integer';
+ field.newJavaType = null;
_tableFocus('DatabaseName' + field.focusId, -1);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d761844/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 957e0e0..7491fda2 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -362,6 +362,11 @@ button, a.btn {
.btn {
padding: 3px 6px;
+
+ :focus {
+ outline: none;
+ border: 1px solid #ccc;
+ }
}
.btn-group {
@@ -409,6 +414,12 @@ h3 {
}
}
+button.form-control {
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.theme-line .notebook-header {
border-color: $ignite-background-dark-color;
@@ -1367,7 +1378,7 @@ a {
.preview-legend {
top: 0;
- right: 0;
+ right: 15px;
margin-right: 10px;
position: absolute;
z-index: 900;
@@ -1471,11 +1482,11 @@ button.dropdown-toggle {
}
::-webkit-scrollbar:vertical {
- width: 11px;
+ width: 10px;
}
::-webkit-scrollbar:horizontal {
- height: 11px;
+ height: 10px;
}
::-webkit-scrollbar-thumb {
@@ -1485,11 +1496,6 @@ button.dropdown-toggle {
}
::-webkit-scrollbar-track {
- background-color: #fff;
+ background-color: white;
border-radius: 8px;
}
-
-.btn:focus {
- outline: none;
- border: 1px solid #ccc;
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d761844/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 69723a1..8ae9d2f 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
@@ -204,7 +204,7 @@ mixin table-db-field-edit(prefix, focusId, index)
.col-xs-3.col-sm-3.col-md-3
label.fieldSep /
.input-tip
- button.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}' on-escape='tableReset()' tabindex='0')
+ button.form-control(id=databaseTypeId enter-focus-next=javaNameId ng-model=databaseTypeModel placeholder='DB type' bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}' on-escape='tableReset()' tabindex='0')
.col-xs-3.col-sm-3.col-md-3
label.fieldSep /
.input-tip
@@ -216,7 +216,7 @@ mixin table-db-field-edit(prefix, focusId, index)
+btn-save(btnVisible, btnSave)
.input-tip
- button.form-control(id=javaTypeId ng-model=javaTypeModel bs-select bs-options='item.value as item.label for item in {{supportedJavaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0')
+ button.form-control(id=javaTypeId ng-model=javaTypeModel placeholder='Java type' bs-select bs-options='item.value as item.label for item in {{supportedJavaTypes}}' on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0')
mixin table-group-item-edit(prefix, index)
-var fieldName = prefix + 'FieldName'
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d761844/modules/control-center-web/src/main/js/views/templates/select.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/select.jade b/modules/control-center-web/src/main/js/views/templates/select.jade
index 32420ab..f2537e9 100644
--- a/modules/control-center-web/src/main/js/views/templates/select.jade
+++ b/modules/control-center-web/src/main/js/views/templates/select.jade
@@ -21,6 +21,6 @@ ul.select.dropdown-menu(tabindex='-1' ng-show='$isVisible()' role='select')
hr(style='margin: 5px 0')
li(role='presentation' ng-repeat='match in $matches')
hr(ng-if='match.value == undefined' style='margin: 5px 0')
- a(id='li-dropdown-item-{{$index}}' style='cursor: default; padding: 3px 6px;' role='menuitem' tabindex='-1' ng-class='{active: $isActive($index)}' ng-click='$select($index, $event)')
- i(class='{{$iconCheckmark}}' ng-if='$isActive($index)' ng-class='{active: $isActive($index)}' style='color: #ec1c24; margin-left: 15px; line-height: 20px; float: right;background-color: transparent;')
+ a(id='li-dropdown-item-{{$index}}' style='cursor: default; padding: 3px 16px 3px 10px;' role='menuitem' tabindex='-1' ng-class='{active: $isActive($index)}' ng-click='$select($index, $event)')
+ i(class='{{$iconCheckmark}}' ng-if='$isActive($index)' ng-class='{active: $isActive($index)}' style='color: #ec1c24; margin-left: 15px; margin-right: -10px; line-height: 20px; float: right;background-color: transparent;')
span(ng-bind='match.label')
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88054456
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88054456
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88054456
Branch: refs/heads/ignite-843
Commit: 88054456ebba3e4d0a2ff56529ada1c5e0e27bb7
Parents: 3d76184 0ec6d14
Author: Andrey <an...@gridgain.com>
Authored: Mon Sep 14 10:39:05 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Sep 14 10:39:05 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/88054456/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------