You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/29 08:31:18 UTC
[1/2] ignite git commit: IGNITE-843 Minor.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 d04453744 -> b1bbb239f
IGNITE-843 Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd321962
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd321962
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd321962
Branch: refs/heads/ignite-843-rc2
Commit: dd321962dca2fbba4ee8d900d0834ea6a27411a2
Parents: b03b5ea
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 29 14:29:09 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 29 14:29:09 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/models/metadata.json | 2 +-
.../main/js/views/configuration/metadata-load.jade | 2 +-
.../src/main/js/views/configuration/metadata.jade | 2 +-
.../src/main/js/views/includes/controls.jade | 16 ++++++++--------
.../src/main/js/views/settings/admin.jade | 4 ++--
.../src/main/js/views/settings/profile.jade | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dd321962/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 6901e97..39bcb7b 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
@@ -88,8 +88,8 @@
{
"label": "Indexes",
"id": "indexes",
+ "type": "table-indexes",
"ui": "table-indexes",
- "type": "indexes",
"model": "indexes",
"addTip": "Add new index",
"removeTip": "Remove index",
http://git-wip-us.apache.org/repos/asf/ignite/blob/dd321962/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index 23da9f9..d80368e4 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -99,4 +99,4 @@ mixin chk(mdl, change, tip)
.modal-footer
label.labelField {{loadMeta.info}}
button.btn.btn-primary(ng-show='loadMeta.action != "connect"' ng-click='loadMetadataPrev()') Prev
- a.btn.btn-primary(ng-click='loadMetadataNext()' ng-disabled='!nextAvailable()' bs-tooltip data-title='{{nextTooltipText()}}' data-placement='bottom') {{loadMeta.button}}
+ a.btn.btn-primary(ng-click='loadMetadataNext()' ng-disabled='!nextAvailable()' bs-tooltip='' data-title='{{nextTooltipText()}}' data-placement='bottom') {{loadMeta.button}}
http://git-wip-us.apache.org/repos/asf/ignite/blob/dd321962/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index 092460e..dc9e019 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -65,7 +65,7 @@ include ../includes/controls
.padding-top-dflt(bs-affix)
.panel-tip-container(data-placement='bottom' bs-tooltip='' data-title='Create new metadata')
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add metadata
- .panel-tip-container(bs-tooltip data-title='Load new metadata from database' data-placement='bottom')
+ .panel-tip-container(bs-tooltip='' data-title='Load new metadata from database' data-placement='bottom')
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
+save-remove-buttons('metadata')
hr
http://git-wip-us.apache.org/repos/asf/ignite/blob/dd321962/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 7fe47bb..e7e94f7 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
@@ -26,10 +26,10 @@ mixin tipLabel(lines)
i.tipLabel.fa.fa-question-circle.blank(ng-if='!#{lines}')
mixin ico-exclamation(mdl, err, msg)
- i.fa.fa-exclamation-triangle.form-control-feedback(ng-show='ui.inputForm["#{mdl}"].$error.#{err}' bs-tooltip data-title='#{msg}')
+ i.fa.fa-exclamation-triangle.form-control-feedback(ng-show='ui.inputForm["#{mdl}"].$error.#{err}' bs-tooltip='' data-title='#{msg}')
mixin btn-save(show, click)
- i.tipField.fa.fa-floppy-o(ng-show=show ng-click=click bs-tooltip data-title='Click icon or press [Enter] to save item' data-trigger='hover')
+ i.tipField.fa.fa-floppy-o(ng-show=show ng-click=click bs-tooltip='' data-title='Click icon or press [Enter] to save item' data-trigger='hover')
mixin group-tip(lines)
i.group-legend-btn.fa.fa-question-circle(ng-if=lines bs-tooltip='joinTip(#{lines})')
@@ -44,10 +44,10 @@ mixin btn-remove(click, tip)
i.tipField.fa.fa-remove(ng-click=click bs-tooltip=tip data-trigger='hover')
mixin btn-up(show, click)
- i.tipField.fa.fa-arrow-up(ng-if=show ng-click=click bs-tooltip data-title='Move item up')
+ i.tipField.fa.fa-arrow-up(ng-if=show ng-click=click bs-tooltip='' data-title='Move item up')
mixin btn-down(show, click)
- i.tipField.fa.fa-arrow-down(ng-if=show ng-click=click bs-tooltip data-title='Move item down')
+ i.tipField.fa.fa-arrow-down(ng-if=show ng-click=click bs-tooltip='' data-title='Move item down')
mixin table-pair-edit(prefix, keyPlaceholder, valPlaceholder, keyJavaBuildInTypes, valueJavaBuildInTypes, focusId, index, divider)
-var keyModel = 'field.' + prefix + 'Key'
@@ -462,7 +462,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
tr
td
+table-db-field-edit('new', '{{::field.focusId}}', '-1')
- .group-section(ng-switch-when='indexes' ng-hide=fieldHide)
+ .group-section(ng-switch-when='table-indexes' ng-hide=fieldHide)
.col-sm-12.group
.group-legend
label {{::field.label}}
@@ -547,7 +547,7 @@ mixin groups(groups, dataSource)
label(id='{{::group.group + "-title"}}') {{::group.label}}
i.tipLabel.fa.fa-question-circle(ng-if='group.tip' bs-tooltip='joinTip(group.tip)')
i.tipLabel.fa.fa-question-circle.blank(ng-if='!group.tip')
- i.pull-right.fa.fa-undo(ng-show='group.dirty' ng-click='resetItem(group.group); $event.stopPropagation()' bs-tooltip data-title='Undo unsaved changes')
+ i.pull-right.fa.fa-undo(ng-show='group.dirty' ng-click='resetItem(group.group); $event.stopPropagation()' bs-tooltip='' data-title='Undo unsaved changes')
.panel-collapse(role='tabpanel' bs-collapse-target id='{{::group.group}}' number='{{::group.number}}')
.panel-body
.col-sm-6(id='{{::group.group + "-left"}}')
@@ -586,9 +586,9 @@ mixin save-remove-buttons(objectName)
div(ng-show='tableVisibleRow(displayedRows, selectedItem)' style='display: inline-block;')
.panel-tip-container(ng-hide='!backupItem || backupItem._id')
- a.btn.btn-primary(ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
+ a.btn.btn-primary(ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip='' data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
.panel-tip-container(ng-show='backupItem._id')
- a.btn.btn-primary(id='save-item' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
+ a.btn.btn-primary(id='save-item' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip='' data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
.panel-tip-container(ng-show='backupItem._id')
a.btn.btn-primary(id='clone-item' ng-click='cloneItem()' bs-tooltip=cloneTip data-placement='bottom' data-trigger='hover') Clone
.btn-group.panel-tip-container(ng-show='backupItem._id')
http://git-wip-us.apache.org/repos/asf/ignite/blob/dd321962/modules/control-center-web/src/main/js/views/settings/admin.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/admin.jade b/modules/control-center-web/src/main/js/views/settings/admin.jade
index 2663e6b..b1e08d7 100644
--- a/modules/control-center-web/src/main/js/views/settings/admin.jade
+++ b/modules/control-center-web/src/main/js/views/settings/admin.jade
@@ -42,8 +42,8 @@
ng-model='row.admin' ng-change='toggleAdmin(row)')
td(style='text-align: center;')
div(ng-show='row._id != user._id')
- i.fa.fa-remove(ng-click='removeUser(row)' bs-tooltip data-title='Remove user')
- i.fa.fa-eye(ng-click='becomeUser(row)' style='margin-left: 5px' bs-tooltip data-title='Become this user')
+ i.fa.fa-remove(ng-click='removeUser(row)' bs-tooltip='' data-title='Remove user')
+ i.fa.fa-eye(ng-click='becomeUser(row)' style='margin-left: 5px' bs-tooltip='' data-title='Become this user')
tfoot
tr
td.text-right(colspan='5')
http://git-wip-us.apache.org/repos/asf/ignite/blob/dd321962/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 72297dd..b792c93 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
@@ -41,8 +41,8 @@ mixin lbl(txt)
.details-row(ng-show='profileUser.showToken')
+lbl('Security token:')
label {{profileUser.token}}
- i.tipLabel.fa.fa-refresh(ng-click='generateToken()' bs-tooltip data-title='Generate random security token')
- i.tipLabel.fa.fa-clipboard(ng-click-copy='{{profileUser.token}}' bs-tooltip data-title='Copy security token to clipboard')
+ i.tipLabel.fa.fa-refresh(ng-click='generateToken()' bs-tooltip='' data-title='Generate random security token')
+ i.tipLabel.fa.fa-clipboard(ng-click-copy='{{profileUser.token}}' bs-tooltip='' data-title='Copy security token to clipboard')
i.tipLabel.fa.fa-question-circle(ng-if=lines bs-tooltip='' data-title='The security token is used for authorization of web agent')
.details-row
.advanced-options
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1bbb239
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1bbb239
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1bbb239
Branch: refs/heads/ignite-843-rc2
Commit: b1bbb239f3b4f22a193282f751427ae81f4fa3d5
Parents: dd32196 d044537
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 29 14:31:11 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 29 14:31:11 2015 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-docker.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------