Merge branch 'develop' into feature/sse-function-wizard
|
@ -209,8 +209,12 @@ define([
|
||||||
Common.NotificationCenter.trigger('app:config', {canUndock: true});
|
Common.NotificationCenter.trigger('app:config', {canUndock: true});
|
||||||
}
|
}
|
||||||
|
|
||||||
var header = webapp.getController('Viewport').getView('Common.Views.Header');
|
|
||||||
titlebuttons = {};
|
titlebuttons = {};
|
||||||
|
if ( !mode.isEdit ) {
|
||||||
|
native.execCommand('webapps:features', JSON.stringify(
|
||||||
|
{version: config.version, eventloading:true, titlebuttons:true, viewmode:true} ));
|
||||||
|
} else {
|
||||||
|
var header = webapp.getController('Viewport').getView('Common.Views.Header');
|
||||||
if (!!header.btnSave) {
|
if (!!header.btnSave) {
|
||||||
titlebuttons['save'] = {btn: header.btnSave};
|
titlebuttons['save'] = {btn: header.btnSave};
|
||||||
|
|
||||||
|
@ -236,6 +240,7 @@ define([
|
||||||
titlebuttons.save.btn.options.signals.push('icon:changed');
|
titlebuttons.save.btn.options.signals.push('icon:changed');
|
||||||
titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
|
titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( !!config.callback_editorconfig ) {
|
if ( !!config.callback_editorconfig ) {
|
||||||
config.callback_editorconfig();
|
config.callback_editorconfig();
|
||||||
|
|
Before Width: | Height: | Size: 229 B |
BIN
apps/common/main/resources/img/toolbar/1.5x/big/btn-update.png
Normal file
After Width: | Height: | Size: 623 B |
Before Width: | Height: | Size: 275 B |
Before Width: | Height: | Size: 187 B |
BIN
apps/common/main/resources/img/toolbar/1x/big/btn-update.png
Normal file
After Width: | Height: | Size: 468 B |
Before Width: | Height: | Size: 246 B |
Before Width: | Height: | Size: 316 B |
BIN
apps/common/main/resources/img/toolbar/2x/big/btn-update.png
Normal file
After Width: | Height: | Size: 868 B |
Before Width: | Height: | Size: 356 B |
|
@ -108,4 +108,8 @@ textarea.form-control:focus {
|
||||||
right: 22px;
|
right: 22px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
padding-right: 20px;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -133,7 +133,7 @@ define([
|
||||||
|
|
||||||
this.btnContentsUpdate = new Common.UI.Button({
|
this.btnContentsUpdate = new Common.UI.Button({
|
||||||
cls: 'btn-toolbar x-huge icon-top',
|
cls: 'btn-toolbar x-huge icon-top',
|
||||||
iconCls: 'toolbar__icon btn-contents-update',
|
iconCls: 'toolbar__icon btn-update',
|
||||||
caption: this.capBtnContentsUpdate,
|
caption: this.capBtnContentsUpdate,
|
||||||
split: true,
|
split: true,
|
||||||
menu: true,
|
menu: true,
|
||||||
|
|
Before Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 800 B |
|
@ -228,7 +228,7 @@ define([
|
||||||
|
|
||||||
this.btnRefreshPivot = new Common.UI.Button({
|
this.btnRefreshPivot = new Common.UI.Button({
|
||||||
cls: 'btn-toolbar x-huge icon-top',
|
cls: 'btn-toolbar x-huge icon-top',
|
||||||
iconCls: 'toolbar__icon btn-update-pivot',
|
iconCls: 'toolbar__icon btn-update',
|
||||||
caption: this.txtRefresh,
|
caption: this.txtRefresh,
|
||||||
disabled : true,
|
disabled : true,
|
||||||
lock : [_set.lostConnect, _set.coAuth, _set.noPivot]
|
lock : [_set.lostConnect, _set.coAuth, _set.noPivot]
|
||||||
|
|
Before Width: | Height: | Size: 275 B |
Before Width: | Height: | Size: 230 B |
Before Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 229 B |
Before Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 394 B |
Before Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 800 B |