From 110ec4e5456a7a401d58ccfbe82866c098c554f5 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Wed, 22 Apr 2020 22:32:02 -0700
Subject: [PATCH] Added missing web app scroll bars.

---
 translate/translate.json |  24 +++----
 views/default.handlebars | 148 +++++++++++++++++++++------------------
 2 files changed, 92 insertions(+), 80 deletions(-)

diff --git a/translate/translate.json b/translate/translate.json
index 3ccd40e7..ad81c9e8 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -4189,10 +4189,10 @@
         "default.handlebars->container->column_l->p19->p19title->p19BackButton",
         "default.handlebars->container->column_l->p20->p20title->3",
         "default.handlebars->container->column_l->p21->p21title->1",
-        "default.handlebars->container->column_l->p30->1->1->0->1->p30title->1",
+        "default.handlebars->container->column_l->p30->p30title->1",
         "default.handlebars->container->column_l->p31->p31title->1",
         "default.handlebars->container->column_l->p43->p43BackButton",
-        "default.handlebars->container->column_l->p51->1->1->0->1->p30title->1",
+        "default.handlebars->container->column_l->p51->p30title->1",
         "error404-mobile.handlebars->container->footer->1->1->0->3->1",
         "error404.handlebars->container->footer->1->1->0->3->0",
         "terms-mobile.handlebars->container->footer->1->1->0->3->1",
@@ -5166,7 +5166,7 @@
       "ru": "Проверить наличие обновлений",
       "zh-chs": "檢查服務器版本",
       "xloc": [
-        "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsVersion->0"
+        "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsVersion->0"
       ]
     },
     {
@@ -8740,7 +8740,7 @@
       "ru": "Скачать резервную копию сервера",
       "zh-chs": "下載服務器備份",
       "xloc": [
-        "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsBackup->0"
+        "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsBackup->0"
       ]
     },
     {
@@ -11087,7 +11087,7 @@
       "xloc": [
         "default.handlebars->container->column_l->p10->p10title->3",
         "default.handlebars->container->column_l->p20->p20title->5",
-        "default.handlebars->container->column_l->p30->1->1->0->1->p30title->3"
+        "default.handlebars->container->column_l->p30->p30title->3"
       ]
     },
     {
@@ -16592,7 +16592,7 @@
       "ru": "Мой сервер",
       "zh-chs": "我的服務器",
       "xloc": [
-        "default.handlebars->container->column_l->p6->p6title->3",
+        "default.handlebars->container->column_l->p6->p6info->p6title->3",
         "default.handlebars->container->page_leftbar",
         "default.handlebars->container->topbar->1->1->MainMenuSpan->1->0->MainMenuMyServer"
       ]
@@ -21037,7 +21037,7 @@
       "ru": "Восстановить сервер из резервной копии",
       "zh-chs": "通過備份還原服務器",
       "xloc": [
-        "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsRestore->0"
+        "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsRestore->0"
       ]
     },
     {
@@ -22291,7 +22291,7 @@
       "ru": "Статистика сервера",
       "zh-chs": "服務器統計",
       "xloc": [
-        "default.handlebars->container->column_l->p6->6"
+        "default.handlebars->container->column_l->p6->p6info->6"
       ]
     },
     {
@@ -22342,7 +22342,7 @@
       "ru": "Предупреждения сервера",
       "zh-chs": "服務器警告",
       "xloc": [
-        "default.handlebars->container->column_l->p6->serverWarningsDiv->2"
+        "default.handlebars->container->column_l->p6->p6info->serverWarningsDiv->2"
       ]
     },
     {
@@ -22359,7 +22359,7 @@
       "ru": "Действия сервера",
       "zh-chs": "服務器動作",
       "xloc": [
-        "default.handlebars->container->column_l->p6->p2ServerActions->1->0"
+        "default.handlebars->container->column_l->p6->p6info->p2ServerActions->1->0"
       ]
     },
     {
@@ -22853,7 +22853,7 @@
       "ru": "Показать журнал ошибок сервера",
       "zh-chs": "顯示服務器錯誤日誌",
       "xloc": [
-        "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsErrors->0"
+        "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsErrors->0"
       ]
     },
     {
@@ -26344,7 +26344,7 @@
       "ru": "Группа пользователей -",
       "zh-chs": "用戶組-",
       "xloc": [
-        "default.handlebars->container->column_l->p51->1->1->0->1->p30title->3"
+        "default.handlebars->container->column_l->p51->p30title->3"
       ]
     },
     {
diff --git a/views/default.handlebars b/views/default.handlebars
index b92e8940..51ea1780 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -435,34 +435,36 @@
                 </table>
             </div>
             <div id=p6 style="display:none">
-                <div id="p6title">
-                    <img id=MainMeshImage src="serverpic.ashx">
-                    <h1>My Server</h1>
-                </div>
-                <div id="p2ServerActions">
-                    <p><strong>Server actions</strong></p>
-                    <div class="mL">
-                        <div id="p2ServerActionsBackup"><a href="{{{domainurl}}}backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
-                        <div id="p2ServerActionsRestore"><a href=# onclick="return server_showRestoreDlg()">Restore server with backup</a></div>
-                        <div id="p2ServerActionsVersion"><a href=# onclick="return server_showVersionDlg()">Check server version</a></div>
-                        <div id="p2ServerActionsErrors"><a href=# onclick="return server_showErrorsDlg()">Show server error log</a></div>
+                <div id="p6info" style="overflow-y:auto">
+                    <div id="p6title">
+                        <img id=MainMeshImage src="serverpic.ashx">
+                        <h1>My Server</h1>
                     </div>
-                </div>
-                <br /><strong>Server Statistics</strong><br /><br />
-                <div id="serverStats">
-                    <div id="serverCpuChartView" style="display:none">
-                        <div class="chartViewCanvas"><canvas id="serverCpuChart"></canvas></div>
-                        <div class="chartViewText" id="serverCpuChartText"></div>
+                    <div id="p2ServerActions">
+                        <p><strong>Server actions</strong></p>
+                        <div class="mL">
+                            <div id="p2ServerActionsBackup"><a href="{{{domainurl}}}backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
+                            <div id="p2ServerActionsRestore"><a href=# onclick="return server_showRestoreDlg()">Restore server with backup</a></div>
+                            <div id="p2ServerActionsVersion"><a href=# onclick="return server_showVersionDlg()">Check server version</a></div>
+                            <div id="p2ServerActionsErrors"><a href=# onclick="return server_showErrorsDlg()">Show server error log</a></div>
+                        </div>
+                    </div>
+                    <br /><strong>Server Statistics</strong><br /><br />
+                    <div id="serverStats">
+                        <div id="serverCpuChartView" style="display:none">
+                            <div class="chartViewCanvas"><canvas id="serverCpuChart"></canvas></div>
+                            <div class="chartViewText" id="serverCpuChartText"></div>
+                        </div>
+                        <div id="serverMemoryChartView" style="display:none">
+                            <div class="chartViewCanvas"><canvas id="serverMemoryChart"></canvas></div>
+                            <div class="chartViewText" id="serverMemoryChartText"></div>
+                        </div><br /><br />
+                        <div id="serverStatsTable"></div>
+                    </div>
+                    <div id="serverWarningsDiv" style="display:none">
+                        <br /><strong>Server Warnings</strong><br /><br />
+                        <div id="serverWarnings"></div>
                     </div>
-                    <div id="serverMemoryChartView" style="display:none">
-                        <div class="chartViewCanvas"><canvas id="serverMemoryChart"></canvas></div>
-                        <div class="chartViewText" id="serverMemoryChartText"></div>
-                    </div><br /><br />
-                    <div id="serverStatsTable"></div>
-                </div>
-                <div id="serverWarningsDiv" style="display:none">
-                    <br /><strong>Server Warnings</strong><br /><br />
-                    <div id="serverWarnings"></div>
                 </div>
             </div>
             <div id=p10 style="display:none">
@@ -863,27 +865,29 @@
                 <p id=p21info></p>
             </div>
             <div id=p30 style="display:none">
-                <table style="width:100%" cellpadding="0" cellspacing="0">
-                    <tr>
-                        <td style=width:auto valign=top>
-                            <div id="p30title">
-                                <div style="float:left"><div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
-                                <h1>General - <span id=p30userName></span></h1>
-                            </div>
-                            <div id=p30html></div>
-                        </td>
-                        <td style=width:20px></td>
-                        <td style=width:200px>
-                            <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
-                                <source type="image/webp" width=200 height=200 srcset="images/webp/user-256.webp" />
-                                <img alt="" width=200 height=200 src=images/user-256.png />
-                            </picture>
-                            <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
-                        </td>
-                    </tr>
-                </table><br />
-                <div id=p30html2></div>
-                <div id=p30html3></div>
+                <div id="p30title">
+                    <div style="float:left"><div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
+                    <h1>General - <span id=p30userName></span></h1>
+                </div>
+                <div id="p30info" style="overflow-y:auto">
+                    <table style="width:100%" cellpadding="0" cellspacing="0">
+                        <tr>
+                            <td style=width:auto valign=top>
+                                <div id=p30html></div>
+                            </td>
+                            <td style=width:20px></td>
+                            <td style=width:200px valign=top>
+                                <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
+                                    <source type="image/webp" width=200 height=200 srcset="images/webp/user-256.webp" />
+                                    <img alt="" width=200 height=200 src=images/user-256.png />
+                                </picture>
+                                <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
+                            </td>
+                        </tr>
+                    </table><br />
+                    <div id=p30html2></div>
+                    <div id=p30html3></div>
+                </div>
             </div>
             <div id=p31 style="display:none">
                 <div id="p31title">
@@ -1003,27 +1007,29 @@
                 <div id="p50groups"></div>
             </div>
             <div id=p51 style="display:none">
-                <table style="width:100%" cellpadding="0" cellspacing="0">
-                    <tr>
-                        <td style=width:auto valign=top>
-                            <div id="p30title">
-                                <div style="float:left"><div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
-                                <h1>User Group - <span id=p51groupName></span></h1>
-                            </div>
-                            <div id=p51group></div>
-                        </td>
-                        <td style=width:20px></td>
-                        <td style=width:200px>
-                            <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
-                                <source type="image/webp" width=200 height=200 srcset="images/webp/group-256.webp" />
-                                <img alt="" width=200 height=200 src=images/group-256.png />
-                            </picture>
-                            <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
-                        </td>
-                    </tr>
-                </table>
-                <div id=p51group2></div>
-                <br />
+                <div id="p30title">
+                    <div style="float:left"><div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
+                    <h1>User Group - <span id=p51groupName></span></h1>
+                </div>
+                <div id="p51info" style="overflow-y:auto">
+                    <table style="width:100%" cellpadding="0" cellspacing="0">
+                        <tr>
+                            <td style=width:auto valign=top>
+                                <div id=p51group></div>
+                            </td>
+                            <td style=width:20px></td>
+                            <td style=width:200px valign=top>
+                                <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
+                                    <source type="image/webp" width=200 height=200 srcset="images/webp/group-256.webp" />
+                                    <img alt="" width=200 height=200 src=images/group-256.png />
+                                </picture>
+                                <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
+                            </td>
+                        </tr>
+                    </table>
+                    <div id=p51group2></div>
+                    <br />
+                </div>
             </div>
             <br id="column_l_bottomgap" />
         </div>
@@ -1444,10 +1450,16 @@
             }
             QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
             QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
+            QS('p6info')['height'] = 'calc(100vh - ' + (-50 + xh + xh2) + 'px)';
+            QS('p6info')['max-height'] = 'calc(100vh - ' + (-50 + xh + xh2) + 'px)';
             QS('p10info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
             QS('p10info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
             QS('p17info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
             QS('p17info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
+            QS('p30info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
+            QS('p30info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
+            QS('p51info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
+            QS('p51info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
             QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
             QS('p16events')['max-height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
             QS('p31events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';