Added missing web app scroll bars.
Ylian Saint-Hilaire committed
Apr 22, 2020 at 22:32 UTC
110ec4e5456a7a401d58ccfbe82866c098c554f5
2 files changed
+92
-80
translate/translate.json
+12
-12
@@ -4189,10 +4189,10 @@
4189
"default.handlebars->container->column_l->p19->p19title->p19BackButton",
4190
"default.handlebars->container->column_l->p20->p20title->3",
4191
"default.handlebars->container->column_l->p21->p21title->1",
4192
- "default.handlebars->container->column_l->p30->1->1->0->1->p30title->1",
4192
+ "default.handlebars->container->column_l->p30->p30title->1",
4193
"default.handlebars->container->column_l->p31->p31title->1",
4194
"default.handlebars->container->column_l->p43->p43BackButton",
4195
- "default.handlebars->container->column_l->p51->1->1->0->1->p30title->1",
4195
+ "default.handlebars->container->column_l->p51->p30title->1",
4196
"error404-mobile.handlebars->container->footer->1->1->0->3->1",
4197
"error404.handlebars->container->footer->1->1->0->3->0",
4198
"terms-mobile.handlebars->container->footer->1->1->0->3->1",
@@ -5166,7 +5166,7 @@
5166
"ru": "Проверить наличие обновлений",
5167
"zh-chs": "檢查服務器版本",
5168
"xloc": [
5169
- "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsVersion->0"
5169
+ "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsVersion->0"
5170
]
5171
},
5172
{
@@ -8740,7 +8740,7 @@
8740
"ru": "Скачать резервную копию сервера",
8741
"zh-chs": "下載服務器備份",
8742
"xloc": [
8743
- "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsBackup->0"
8743
+ "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsBackup->0"
8744
]
8745
},
8746
{
@@ -11087,7 +11087,7 @@
11087
"xloc": [
11088
"default.handlebars->container->column_l->p10->p10title->3",
11089
"default.handlebars->container->column_l->p20->p20title->5",
11090
- "default.handlebars->container->column_l->p30->1->1->0->1->p30title->3"
11090
+ "default.handlebars->container->column_l->p30->p30title->3"
11091
]
11092
},
11093
{
@@ -16592,7 +16592,7 @@
16592
"ru": "Мой сервер",
16593
"zh-chs": "我的服務器",
16594
"xloc": [
16595
- "default.handlebars->container->column_l->p6->p6title->3",
16595
+ "default.handlebars->container->column_l->p6->p6info->p6title->3",
16596
"default.handlebars->container->page_leftbar",
16597
"default.handlebars->container->topbar->1->1->MainMenuSpan->1->0->MainMenuMyServer"
16598
]
@@ -21037,7 +21037,7 @@
21037
"ru": "Восстановить сервер из резервной копии",
21038
"zh-chs": "通過備份還原服務器",
21039
"xloc": [
21040
- "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsRestore->0"
21040
+ "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsRestore->0"
21041
]
21042
},
21043
{
@@ -22291,7 +22291,7 @@
22291
"ru": "Статистика сервера",
22292
"zh-chs": "服務器統計",
22293
"xloc": [
22294
- "default.handlebars->container->column_l->p6->6"
22294
+ "default.handlebars->container->column_l->p6->p6info->6"
22295
]
22296
},
22297
{
@@ -22342,7 +22342,7 @@
22342
"ru": "Предупреждения сервера",
22343
"zh-chs": "服務器警告",
22344
"xloc": [
22345
- "default.handlebars->container->column_l->p6->serverWarningsDiv->2"
22345
+ "default.handlebars->container->column_l->p6->p6info->serverWarningsDiv->2"
22346
]
22347
},
22348
{
@@ -22359,7 +22359,7 @@
22359
"ru": "Действия сервера",
22360
"zh-chs": "服務器動作",
22361
"xloc": [
22362
- "default.handlebars->container->column_l->p6->p2ServerActions->1->0"
22362
+ "default.handlebars->container->column_l->p6->p6info->p2ServerActions->1->0"
22363
]
22364
},
22365
{
@@ -22853,7 +22853,7 @@
22853
"ru": "Показать журнал ошибок сервера",
22854
"zh-chs": "顯示服務器錯誤日誌",
22855
"xloc": [
22856
- "default.handlebars->container->column_l->p6->p2ServerActions->3->p2ServerActionsErrors->0"
22856
+ "default.handlebars->container->column_l->p6->p6info->p2ServerActions->3->p2ServerActionsErrors->0"
22857
]
22858
},
22859
{
@@ -26344,7 +26344,7 @@
26344
"ru": "Группа пользователей -",
26345
"zh-chs": "用戶組-",
26346
"xloc": [
26347
- "default.handlebars->container->column_l->p51->1->1->0->1->p30title->3"
26347
+ "default.handlebars->container->column_l->p51->p30title->3"
26348
]
26349
},
26350
{
views/default.handlebars
+80
-68
@@ -435,34 +435,36 @@
435
</table>
436
</div>
437
<div id=p6 style="display:none">
438
- <div id="p6title">
439
- <img id=MainMeshImage src="serverpic.ashx">
440
- <h1>My Server</h1>
441
- </div>
442
- <div id="p2ServerActions">
443
- <p><strong>Server actions</strong></p>
444
- <div class="mL">
445
- <div id="p2ServerActionsBackup"><a href="{{{domainurl}}}backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
446
- <div id="p2ServerActionsRestore"><a href=# onclick="return server_showRestoreDlg()">Restore server with backup</a></div>
447
- <div id="p2ServerActionsVersion"><a href=# onclick="return server_showVersionDlg()">Check server version</a></div>
448
- <div id="p2ServerActionsErrors"><a href=# onclick="return server_showErrorsDlg()">Show server error log</a></div>
438
+ <div id="p6info" style="overflow-y:auto">
439
+ <div id="p6title">
440
+ <img id=MainMeshImage src="serverpic.ashx">
441
+ <h1>My Server</h1>
442
</div>
450
- </div>
451
- <br /><strong>Server Statistics</strong><br /><br />
452
- <div id="serverStats">
453
- <div id="serverCpuChartView" style="display:none">
454
- <div class="chartViewCanvas"><canvas id="serverCpuChart"></canvas></div>
455
- <div class="chartViewText" id="serverCpuChartText"></div>
443
+ <div id="p2ServerActions">
444
+ <p><strong>Server actions</strong></p>
445
+ <div class="mL">
446
+ <div id="p2ServerActionsBackup"><a href="{{{domainurl}}}backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
447
+ <div id="p2ServerActionsRestore"><a href=# onclick="return server_showRestoreDlg()">Restore server with backup</a></div>
448
+ <div id="p2ServerActionsVersion"><a href=# onclick="return server_showVersionDlg()">Check server version</a></div>
449
+ <div id="p2ServerActionsErrors"><a href=# onclick="return server_showErrorsDlg()">Show server error log</a></div>
450
+ </div>
451
+ </div>
452
+ <br /><strong>Server Statistics</strong><br /><br />
453
+ <div id="serverStats">
454
+ <div id="serverCpuChartView" style="display:none">
455
+ <div class="chartViewCanvas"><canvas id="serverCpuChart"></canvas></div>
456
+ <div class="chartViewText" id="serverCpuChartText"></div>
457
+ </div>
458
+ <div id="serverMemoryChartView" style="display:none">
459
+ <div class="chartViewCanvas"><canvas id="serverMemoryChart"></canvas></div>
460
+ <div class="chartViewText" id="serverMemoryChartText"></div>
461
+ </div><br /><br />
462
+ <div id="serverStatsTable"></div>
463
+ </div>
464
+ <div id="serverWarningsDiv" style="display:none">
465
+ <br /><strong>Server Warnings</strong><br /><br />
466
+ <div id="serverWarnings"></div>
467
</div>
457
- <div id="serverMemoryChartView" style="display:none">
458
- <div class="chartViewCanvas"><canvas id="serverMemoryChart"></canvas></div>
459
- <div class="chartViewText" id="serverMemoryChartText"></div>
460
- </div><br /><br />
461
- <div id="serverStatsTable"></div>
462
- </div>
463
- <div id="serverWarningsDiv" style="display:none">
464
- <br /><strong>Server Warnings</strong><br /><br />
465
- <div id="serverWarnings"></div>
468
</div>
469
</div>
470
<div id=p10 style="display:none">
@@ -863,27 +865,29 @@
865
<p id=p21info></p>
866
</div>
867
<div id=p30 style="display:none">
866
- <table style="width:100%" cellpadding="0" cellspacing="0">
867
- <tr>
868
- <td style=width:auto valign=top>
869
- <div id="p30title">
870
- <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>
871
- <h1>General - <span id=p30userName></span></h1>
872
- </div>
873
- <div id=p30html></div>
874
- </td>
875
- <td style=width:20px></td>
876
- <td style=width:200px>
877
- <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
878
- <source type="image/webp" width=200 height=200 srcset="images/webp/user-256.webp" />
879
- <img alt="" width=200 height=200 src=images/user-256.png />
880
- </picture>
881
- <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
882
- </td>
883
- </tr>
884
- </table><br />
885
- <div id=p30html2></div>
886
- <div id=p30html3></div>
868
+ <div id="p30title">
869
+ <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>
870
+ <h1>General - <span id=p30userName></span></h1>
871
+ </div>
872
+ <div id="p30info" style="overflow-y:auto">
873
+ <table style="width:100%" cellpadding="0" cellspacing="0">
874
+ <tr>
875
+ <td style=width:auto valign=top>
876
+ <div id=p30html></div>
877
+ </td>
878
+ <td style=width:20px></td>
879
+ <td style=width:200px valign=top>
880
+ <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
881
+ <source type="image/webp" width=200 height=200 srcset="images/webp/user-256.webp" />
882
+ <img alt="" width=200 height=200 src=images/user-256.png />
883
+ </picture>
884
+ <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
885
+ </td>
886
+ </tr>
887
+ </table><br />
888
+ <div id=p30html2></div>
889
+ <div id=p30html3></div>
890
+ </div>
891
</div>
892
<div id=p31 style="display:none">
893
<div id="p31title">
@@ -1003,27 +1007,29 @@
1007
<div id="p50groups"></div>
1008
</div>
1009
<div id=p51 style="display:none">
1006
- <table style="width:100%" cellpadding="0" cellspacing="0">
1007
- <tr>
1008
- <td style=width:auto valign=top>
1009
- <div id="p30title">
1010
- <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>
1011
- <h1>User Group - <span id=p51groupName></span></h1>
1012
- </div>
1013
- <div id=p51group></div>
1014
- </td>
1015
- <td style=width:20px></td>
1016
- <td style=width:200px>
1017
- <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
1018
- <source type="image/webp" width=200 height=200 srcset="images/webp/group-256.webp" />
1019
- <img alt="" width=200 height=200 src=images/group-256.png />
1020
- </picture>
1021
- <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
1022
- </td>
1023
- </tr>
1024
- </table>
1025
- <div id=p51group2></div>
1026
- <br />
1010
+ <div id="p30title">
1011
+ <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>
1012
+ <h1>User Group - <span id=p51groupName></span></h1>
1013
+ </div>
1014
+ <div id="p51info" style="overflow-y:auto">
1015
+ <table style="width:100%" cellpadding="0" cellspacing="0">
1016
+ <tr>
1017
+ <td style=width:auto valign=top>
1018
+ <div id=p51group></div>
1019
+ </td>
1020
+ <td style=width:20px></td>
1021
+ <td style=width:200px valign=top>
1022
+ <picture id=MainUserImage style=border-width:0px;height:200px;width:200px;float:right>
1023
+ <source type="image/webp" width=200 height=200 srcset="images/webp/group-256.webp" />
1024
+ <img alt="" width=200 height=200 src=images/group-256.png />
1025
+ </picture>
1026
+ <div style="width:100%;text-align:center"><strong><span id=MainUserState></span></strong></div>
1027
+ </td>
1028
+ </tr>
1029
+ </table>
1030
+ <div id=p51group2></div>
1031
+ <br />
1032
+ </div>
1033
</div>
1034
<br id="column_l_bottomgap" />
1035
</div>
@@ -1444,10 +1450,16 @@
1450
}
1451
QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
1452
QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
1453
+ QS('p6info')['height'] = 'calc(100vh - ' + (-50 + xh + xh2) + 'px)';
1454
+ QS('p6info')['max-height'] = 'calc(100vh - ' + (-50 + xh + xh2) + 'px)';
1455
QS('p10info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1456
QS('p10info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1457
QS('p17info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1458
QS('p17info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1459
+ QS('p30info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1460
+ QS('p30info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1461
+ QS('p51info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1462
+ QS('p51info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
1463
QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
1464
QS('p16events')['max-height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
1465
QS('p31events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';