From fc6504f5acc675dc2d401f71dcbda964b0205dcd Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 24 Jan 2018 14:10:33 +0300
Subject: [PATCH] [PE][SSE] Added print, save, undo, redo buttons and user name
 to header panel.

---
 apps/presentationeditor/main/app/controller/Main.js |  1 +
 .../main/app/controller/Toolbar.js                  |  5 +++++
 .../main/app/template/Viewport.template             |  7 +++++++
 apps/presentationeditor/main/app/view/Toolbar.js    |  6 ++++++
 apps/spreadsheeteditor/main/app/controller/Main.js  |  1 +
 .../main/app/controller/Toolbar.js                  |  5 +++++
 .../main/app/template/Viewport.template             | 13 ++++++++++---
 apps/spreadsheeteditor/main/app/view/Toolbar.js     |  5 +++++
 8 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 7df2dbad65..766a46523b 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -284,6 +284,7 @@ define([
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 appHeader.setCanBack(this.appOptions.canBackToFolder === true);
+                appHeader.setUserName(this.appOptions.user);
 
                 if (this.editorConfig.lang)
                     this.api.asc_setLocale(this.editorConfig.lang);
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 96c767fd07..9f6e10f442 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -132,6 +132,11 @@ define([
                         var _main = this.getApplication().getController('Main');
                         _main.onPrint();
                     },
+                    'save': function (opts) {
+                        this.api.asc_Save();
+                    },
+                    'undo': this.onUndo,
+                    'redo': this.onRedo,
                     'downloadas': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         var _file_type = _main.document.fileType,
diff --git a/apps/presentationeditor/main/app/template/Viewport.template b/apps/presentationeditor/main/app/template/Viewport.template
index 40c80aae50..faff999e69 100644
--- a/apps/presentationeditor/main/app/template/Viewport.template
+++ b/apps/presentationeditor/main/app/template/Viewport.template
@@ -5,7 +5,14 @@
     </section>
     <div id="viewport-vbox-layout" class="layout-ct vbox">
         <section id="box-document-title" class="layout-item">
+            <div class="hedset">
+                <div class="btn-slot" id="slot-btn-dt-save"></div>
+                <div class="btn-slot" id="slot-btn-dt-print"></div>
+                <div class="btn-slot" id="slot-btn-dt-undo"></div>
+                <div class="btn-slot" id="slot-btn-dt-redo"></div>
+            </div>
             <input type="text" id="title-doc-name" spellcheck="false" data-can-copy="false">
+            <label id="title-user-name"></label>
         </section>
         <div id="toolbar" class="layout-item"></div>
         <div class="layout-item middle">
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index d2c80229a7..c2778d251f 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1411,6 +1411,12 @@ define([
                     this.lockControls.push(btnsave);
                     btnsave.setDisabled(this.btnsSave[0].isDisabled());
                 }
+                btnsave = PE.getController('Viewport').getView('Common.Views.Header').getButton('save');
+                if (btnsave && this.btnsSave) {
+                    this.btnsSave.push(btnsave);
+                    this.lockControls.push(btnsave);
+                    btnsave.setDisabled(this.btnsSave[0].isDisabled());
+                }
 
                 /** coauthoring begin **/
                 this.showSynchTip = !Common.localStorage.getBool('pe-hide-synch');
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 3c2c2ec8a7..3b5f02e14b 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -305,6 +305,7 @@ define([
 
                 this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
                 this.headerView.setCanBack(this.appOptions.canBackToFolder === true);
+                this.headerView.setUserName(this.appOptions.user);
 
                 var value = Common.localStorage.getItem("sse-settings-reg-settings");
                 if (value!==null)
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 947e2db9d3..a55351eb30 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -83,6 +83,11 @@ define([
                         var _main = this.getApplication().getController('Main');
                         _main.onPrint();
                     },
+                    'save': function (opts) {
+                        this.api.asc_Save();
+                    },
+                    'undo': this.onUndo,
+                    'redo': this.onRedo,
                     'downloadas': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         var _file_type = _main.appOptions.spreadsheet.fileType,
diff --git a/apps/spreadsheeteditor/main/app/template/Viewport.template b/apps/spreadsheeteditor/main/app/template/Viewport.template
index 17a3911e81..2f7e2e59bc 100644
--- a/apps/spreadsheeteditor/main/app/template/Viewport.template
+++ b/apps/spreadsheeteditor/main/app/template/Viewport.template
@@ -1,11 +1,18 @@
 <div class="layout-region">
     <div id="viewport-vbox-layout" class="layout-ct vbox">
-        <section id="box-document-title" class="layout-item">
-            <input type="text" id="title-doc-name" spellcheck="false" data-can-copy="false">
-        </section>
         <section class="layout-ct">
             <div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div>
         </section>
+        <section id="box-document-title" class="layout-item">
+            <div class="hedset">
+                <div class="btn-slot" id="slot-btn-dt-save"></div>
+                <div class="btn-slot" id="slot-btn-dt-print"></div>
+                <div class="btn-slot" id="slot-btn-dt-undo"></div>
+                <div class="btn-slot" id="slot-btn-dt-redo"></div>
+            </div>
+            <input type="text" id="title-doc-name" spellcheck="false" data-can-copy="false">
+            <label id="title-user-name"></label>
+        </section>
         <div id="toolbar" class="layout-item"></div>
         <div class="layout-item">
             <div id="viewport-hbox-layout" class="layout-ct hbox">
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index ee92da09ab..751c842b11 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -1723,6 +1723,11 @@ define([
                 this.btnsSave.push(btnsave);
                 btnsave.setDisabled(this.btnsSave[0].isDisabled());
             }
+            btnsave = SSE.getController('Viewport').getView('Common.Views.Header').getButton('save');
+            if (btnsave && this.btnsSave) {
+                this.btnsSave.push(btnsave);
+                btnsave.setDisabled(this.btnsSave[0].isDisabled());
+            }
         },
 
         onToolbarAfterRender: function(toolbar) {