From 51dd5071a15c51045d93df3f321c16b5d13e35cb Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Thu, 21 Apr 2022 19:36:42 +0300
Subject: [PATCH] [all] refactoring header's icons

---
 apps/common/main/lib/view/Header.js                 | 13 -------------
 apps/common/main/resources/img/header/icons.svg     |  8 ++++++++
 apps/documenteditor/main/index.html                 |  2 +-
 apps/documenteditor/main/index.html.deploy          |  2 +-
 apps/documenteditor/main/index_loader.html          |  2 +-
 apps/documenteditor/main/index_loader.html.deploy   |  2 +-
 apps/presentationeditor/main/index.html             |  2 +-
 apps/presentationeditor/main/index.html.deploy      |  2 +-
 apps/presentationeditor/main/index_loader.html      |  2 +-
 .../main/index_loader.html.deploy                   |  2 +-
 apps/spreadsheeteditor/main/index.html              |  2 +-
 apps/spreadsheeteditor/main/index.html.deploy       |  2 +-
 apps/spreadsheeteditor/main/index_loader.html       |  2 +-
 .../spreadsheeteditor/main/index_loader.html.deploy |  2 +-
 14 files changed, 20 insertions(+), 25 deletions(-)
 create mode 100644 apps/common/main/resources/img/header/icons.svg

diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index f4c5c5c9e..3be730768 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -598,19 +598,6 @@ define([
                     me.btnUndo = createTitleButton('toolbar__icon icon--inverse btn-undo', $html.findById('#slot-btn-dt-undo'), true, undefined, undefined, 'Z');
                     me.btnRedo = createTitleButton('toolbar__icon icon--inverse btn-redo', $html.findById('#slot-btn-dt-redo'), true, undefined, undefined, 'Y');
 
-                    if ( me.btnSave.$icon.is('svg') ) {
-                        me.btnSave.$icon.addClass('icon-save btn-save');
-                        var _create_use = function (extid, intid) {
-                            var _use = document.createElementNS('http://www.w3.org/2000/svg', 'use');
-                            _use.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', extid);
-                            _use.setAttribute('id', intid);
-
-                            return $(_use);
-                        };
-
-                        _create_use('#svg-btn-save-coauth', 'coauth').appendTo(me.btnSave.$icon);
-                        _create_use('#svg-btn-save-sync', 'sync').appendTo(me.btnSave.$icon);
-                    }
                     return $html;
                 }
             },
diff --git a/apps/common/main/resources/img/header/icons.svg b/apps/common/main/resources/img/header/icons.svg
new file mode 100644
index 000000000..3599fad38
--- /dev/null
+++ b/apps/common/main/resources/img/header/icons.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="60px" viewBox="0 0 28 60" enable-background="new 0 0 20 60" xml:space="preserve">
+  <symbol id="svg-icon-crypted" viewBox="0 0 20 20">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M10 3.00049C6.99987 4.99948 4 5.00023 4 5.00023V8.50023C4 10.5001 4.56284 15.9767 9.99961 17.0001C15.4364 15.9767 16 10.5001 16 8.50023V5.00023C16 5.00023 13.0001 4.99948 10 3.00049ZM14.0232 7.96528L12.9768 7.03517L9.42726 11.0284L6.94813 8.96247L6.05187 10.038L9.57274 12.972L14.0232 7.96528Z" fill="#fff"/>
+  </symbol>
+  <symbol id="svg-icon-users" viewBox="0 0 28 20">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M27 10c0 4.9706-4.0294 9-9 9s-9-4.0294-9-9 4.0294-9 9-9 9 4.0294 9 9Zm1 0c0 5.5228-4.4772 10-10 10-2.6253 0-5.0143-1.0116-6.7984-2.6664C10.2212 17.7622 9.1384 18 8 18c-4.4183 0-8-3.5817-8-8s3.5817-8 8-8c1.1384 0 2.2212.2378 3.2016.6664C12.9857 1.0116 15.3747 0 18 0c5.5228 0 10 4.4771 10 10ZM10.4512 3.4412A6.9851 6.9851 0 0 0 8 3c-3.866 0-7 3.134-7 7 0 1.5218.4856 2.9302 1.3103 4.0786a10.8167 10.8167 0 0 1 1.1237-.7596C4.5435 12.6664 6.1317 12 8 12c.0672 0 .134.0009.2006.0026a9.9847 9.9847 0 0 1-.1513-1.003A2.7009 2.7009 0 0 1 8 11c-1.6569 0-3-1.3431-3-3s1.3431-3 3-3c.426 0 .8314.0888 1.1985.249a10.0216 10.0216 0 0 1 1.2527-1.8078ZM8.767 6.1524A1.9939 1.9939 0 0 0 8 6c-1.1046 0-2 .8954-2 2s.8954 2 2 2c0-1.3635.2729-2.6632.767-3.8476Zm-.3043 6.8632A6.9148 6.9148 0 0 0 8 13c-1.6317 0-3.0435.5836-4.059 1.181a9.8046 9.8046 0 0 0-.9906.6668C4.2242 16.1743 6.0157 17 8 17a6.9835 6.9835 0 0 0 2.4512-.4412 9.9832 9.9832 0 0 1-1.9885-3.5432Z"/>
+  </symbol>
+</svg>
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 42963309b..f20c40c65 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -316,7 +316,7 @@
     </script>
 
     <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
-    <img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
     <script>
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 7fedd8dd0..6e65565bc 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -308,7 +308,7 @@
         };
     </script>
 
-    <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/header/icons.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
     <script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html
index 289055c84..72095a3aa 100644
--- a/apps/documenteditor/main/index_loader.html
+++ b/apps/documenteditor/main/index_loader.html
@@ -268,7 +268,7 @@
 <div id="viewport"></div>
 
 <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
-<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+<img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
 <script>
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
index 98382edb5..53d0f76e1 100644
--- a/apps/documenteditor/main/index_loader.html.deploy
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -317,7 +317,7 @@
         };
     </script>
 
-    <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/header/icons.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
 
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 0ec95cdfe..ee876897f 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -330,7 +330,7 @@
     </script>
 
     <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
-    <img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
     <script>
diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy
index 96afd8c58..d3179c1a2 100644
--- a/apps/presentationeditor/main/index.html.deploy
+++ b/apps/presentationeditor/main/index.html.deploy
@@ -352,7 +352,7 @@
         };
     </script>
 
-    <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/header/icons.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
 
diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html
index 2b93f6274..27078a161 100644
--- a/apps/presentationeditor/main/index_loader.html
+++ b/apps/presentationeditor/main/index_loader.html
@@ -258,7 +258,7 @@
 <div id="viewport"></div>
 
 <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
-<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+<img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
 <script>
diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy
index 6b99c2cb4..44b6de9ab 100644
--- a/apps/presentationeditor/main/index_loader.html.deploy
+++ b/apps/presentationeditor/main/index_loader.html.deploy
@@ -318,7 +318,7 @@
         };
     </script>
 
-    <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/header/icons.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
 
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index c68bc5eae..e091cc9f8 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -352,7 +352,7 @@
     </script>
 
     <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
-    <img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
     <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
     <img class="inline-svg" src="resources/img/cf-icons.svg">
diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy
index 85e8d9062..887f0417e 100644
--- a/apps/spreadsheeteditor/main/index.html.deploy
+++ b/apps/spreadsheeteditor/main/index.html.deploy
@@ -366,7 +366,7 @@
         };
     </script>
 
-    <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/header/icons.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
     <inline src="resources/img/cf-icons.svg" />
diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html
index 3a6770649..f7403d86e 100644
--- a/apps/spreadsheeteditor/main/index_loader.html
+++ b/apps/spreadsheeteditor/main/index_loader.html
@@ -259,7 +259,7 @@
 <div id="viewport"></div>
 
 <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
-<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+<img class="inline-svg" src="../../common/main/resources/img/header/icons.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/shapetypes.svg">
 <img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
 <img class="inline-svg" src="resources/img/cf-icons.svg">
diff --git a/apps/spreadsheeteditor/main/index_loader.html.deploy b/apps/spreadsheeteditor/main/index_loader.html.deploy
index 73b82c533..22314a906 100644
--- a/apps/spreadsheeteditor/main/index_loader.html.deploy
+++ b/apps/spreadsheeteditor/main/index_loader.html.deploy
@@ -317,7 +317,7 @@
         };
     </script>
 
-    <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/header/icons.svg" />
     <inline src="resources/img/toolbar/shapetypes.svg" />
     <inline src="resources/img/toolbar/charttypes.svg" />
     <inline src="resources/img/cf-icons.svg" />