Merge branch 'develop' into feature/sse-function-wizard

apps/common/main/lib/controller/Desktop.js

@@ -209,32 +209,37 @@ define([
                             Common.NotificationCenter.trigger('app:config', {canUndock: true});
                         }
 
-                        var header = webapp.getController('Viewport').getView('Common.Views.Header');
                         titlebuttons = {};
-                        if ( !!header.btnSave ) {
-                            titlebuttons['save'] = {btn: header.btnSave};
+                        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) {
+                                titlebuttons['save'] = {btn: header.btnSave};
 
-                            var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
-                            !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
-                        }
+                                var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
+                                !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
+                            }
 
-                        if ( !!header.btnPrint )
-                            titlebuttons['print'] = {btn: header.btnPrint};
+                            if (!!header.btnPrint)
+                                titlebuttons['print'] = {btn: header.btnPrint};
 
-                        if ( !!header.btnUndo )
-                            titlebuttons['undo'] = {btn: header.btnUndo};
+                            if (!!header.btnUndo)
+                                titlebuttons['undo'] = {btn: header.btnUndo};
 
-                        if ( !!header.btnRedo )
-                            titlebuttons['redo'] = {btn: header.btnRedo};
+                            if (!!header.btnRedo)
+                                titlebuttons['redo'] = {btn: header.btnRedo};
 
-                        for (var i in titlebuttons) {
-                            titlebuttons[i].btn.options.signals = ['disabled'];
-                            titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i));
-                        }
+                            for (var i in titlebuttons) {
+                                titlebuttons[i].btn.options.signals = ['disabled'];
+                                titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i));
+                            }
 
-                        if (!!titlebuttons.save) {
-                            titlebuttons.save.btn.options.signals.push('icon:changed');
-                            titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
+                            if (!!titlebuttons.save) {
+                                titlebuttons.save.btn.options.signals.push('icon:changed');
+                                titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this));
+                            }
                         }
 
                         if ( !!config.callback_editorconfig ) {

apps/common/main/resources/less/input.less

@@ -108,4 +108,8 @@ textarea.form-control:focus {
             right: 22px;
         }
     }
+    
+    input {
+        padding-right: 20px;
+    }
 }

apps/documenteditor/main/app/view/Links.js

@@ -133,7 +133,7 @@ define([
 
                 this.btnContentsUpdate = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
-                    iconCls: 'toolbar__icon btn-contents-update',
+                    iconCls: 'toolbar__icon btn-update',
                     caption: this.capBtnContentsUpdate,
                     split: true,
                     menu: true,

apps/spreadsheeteditor/main/app/view/PivotTable.js

@@ -228,7 +228,7 @@ define([
 
                 this.btnRefreshPivot = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
-                    iconCls: 'toolbar__icon btn-update-pivot',
+                    iconCls: 'toolbar__icon btn-update',
                     caption: this.txtRefresh,
                     disabled    : true,
                     lock        : [_set.lostConnect, _set.coAuth, _set.noPivot]