From 5b068c5d28a534e68b1434a27df714ad0423835d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 9 Aug 2019 10:04:43 +0300
Subject: [PATCH] Fix Bug 40231

---
 .../main/app/view/FileMenuPanels.js           |  8 ++++----
 .../mobile/app/template/Settings.template     | 20 +++++++++----------
 .../main/app/view/FileMenuPanels.js           |  8 ++++----
 .../mobile/app/template/Settings.template     | 20 +++++++++----------
 .../main/app/view/FileMenuPanels.js           |  8 ++++----
 .../mobile/app/template/Settings.template     | 20 +++++++++----------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index c90f4a776..2538460a4 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -726,14 +726,14 @@ define([
                     //     '<td class="left"><label>' + this.txtEditTime + '</label></td>',
                     //     '<td class="right"><label id="id-info-edittime"></label></td>',
                     // '</tr>',
-                    '<tr>',
-                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
-                        '<td class="right"><div id="id-info-subject"></div></td>',
-                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtTitle + '</label></td>',
                         '<td class="right"><div id="id-info-title"></div></td>',
                     '</tr>',
+                    '<tr>',
+                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
+                        '<td class="right"><div id="id-info-subject"></div></td>',
+                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtComment + '</label></td>',
                         '<td class="right"><div id="id-info-comment"></div></td>',
diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template
index 129b99184..a3e6bc4b6 100644
--- a/apps/documenteditor/mobile/app/template/Settings.template
+++ b/apps/documenteditor/mobile/app/template/Settings.template
@@ -368,16 +368,6 @@
                     </ul>
                 </div>
 
-                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
-                <div class="list-block display-subject">
-                    <ul>
-                        <li class="item-content">
-                            <div class="item-inner">
-                                <div id="settings-doc-subject" class="item-title"><%= scope.textLoading %></div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
                 <div class="content-block-title display-title"><%= scope.textTitle %></div>
                 <div class="list-block display-title">
                     <ul>
@@ -388,6 +378,16 @@
                         </li>
                     </ul>
                 </div>
+                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
+                <div class="list-block display-subject">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-doc-subject" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
                 <div class="content-block-title display-comment"><%= scope.textComment %></div>
                 <div class="list-block display-comment">
                     <ul>
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 17a41d5c8..af9828b86 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -612,14 +612,14 @@ define([
                     //     '<td class="left"><label>' + this.txtEditTime + '</label></td>',
                     //     '<td class="right"><label id="id-info-edittime"></label></td>',
                     // '</tr>',
-                    '<tr>',
-                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
-                        '<td class="right"><div id="id-info-subject"></div></td>',
-                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtTitle + '</label></td>',
                         '<td class="right"><div id="id-info-title"></div></td>',
                     '</tr>',
+                    '<tr>',
+                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
+                        '<td class="right"><div id="id-info-subject"></div></td>',
+                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtComment + '</label></td>',
                         '<td class="right"><div id="id-info-comment"></div></td>',
diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template
index bcb316596..d9b90cb1b 100644
--- a/apps/presentationeditor/mobile/app/template/Settings.template
+++ b/apps/presentationeditor/mobile/app/template/Settings.template
@@ -183,16 +183,6 @@
                         </li>
                     </ul>
                 </div>
-                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
-                <div class="list-block display-subject">
-                    <ul>
-                        <li class="item-content">
-                            <div class="item-inner">
-                                <div id="settings-pe-subject" class="item-title"><%= scope.textLoading %></div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
                 <div class="content-block-title display-title"><%= scope.textTitle %></div>
                 <div class="list-block display-title">
                     <ul>
@@ -203,6 +193,16 @@
                         </li>
                     </ul>
                 </div>
+                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
+                <div class="list-block display-subject">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-pe-subject" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
                 <div class="content-block-title display-comment"><%= scope.textComment %></div>
                 <div class="list-block display-comment">
                     <ul>
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 12ceef6eb..69f1b40bc 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -1061,14 +1061,14 @@ define([
                     '</tr>',
                     '<tr class="divider general"></tr>',
                     '<tr class="divider general"></tr>',
-                    '<tr>',
-                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
-                        '<td class="right"><div id="id-info-subject"></div></td>',
-                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtTitle + '</label></td>',
                         '<td class="right"><div id="id-info-title"></div></td>',
                     '</tr>',
+                    '<tr>',
+                        '<td class="left"><label>' + this.txtSubject + '</label></td>',
+                        '<td class="right"><div id="id-info-subject"></div></td>',
+                    '</tr>',
                     '<tr>',
                         '<td class="left"><label>' + this.txtComment + '</label></td>',
                         '<td class="right"><div id="id-info-comment"></div></td>',
diff --git a/apps/spreadsheeteditor/mobile/app/template/Settings.template b/apps/spreadsheeteditor/mobile/app/template/Settings.template
index 96803a72f..a87da9488 100644
--- a/apps/spreadsheeteditor/mobile/app/template/Settings.template
+++ b/apps/spreadsheeteditor/mobile/app/template/Settings.template
@@ -195,16 +195,6 @@
                         </li>
                     </ul>
                 </div>
-                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
-                <div class="list-block display-subject">
-                    <ul>
-                        <li class="item-content">
-                            <div class="item-inner">
-                                <div id="settings-sse-subject" class="item-title"><%= scope.textLoading %></div>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
                 <div class="content-block-title display-title"><%= scope.textTitle %></div>
                 <div class="list-block display-title">
                     <ul>
@@ -215,6 +205,16 @@
                         </li>
                     </ul>
                 </div>
+                <div class="content-block-title display-subject"><%= scope.textSubject %></div>
+                <div class="list-block display-subject">
+                    <ul>
+                        <li class="item-content">
+                            <div class="item-inner">
+                                <div id="settings-sse-subject" class="item-title"><%= scope.textLoading %></div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
                 <div class="content-block-title display-comment"><%= scope.textComment %></div>
                 <div class="list-block display-comment">
                     <ul>