Skip to content

Commit 20468bb

Browse files
ScIT-RaphaelScIT-Raphael
authored
Merge pull request hestiacp#2146 from jaapmarcus/fix/2145
Fix multiple UI bugs
2 parents ce42bc6 + db42b71 commit 20468bb

File tree

8 files changed

+26
-16
lines changed

8 files changed

+26
-16
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4065,6 +4065,7 @@ form#vstobjects.suspended {
40654065
.ui-widget-overlay {
40664066
opacity: 0.8 !important;
40674067
background: rgba(10,10,10,0.9) !important;
4068+
position: fixed !important;
40684069
}
40694070

40704071
.helper-container {

‎web/css/themes/default.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/js/pages/add_web.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ App.Listeners.WEB.keypress_ftp_path = function() {
121121
//
122122
//
123123
App.Actions.WEB.add_ftp_user_form = function() {
124-
var ref = $('#templates').find('.ftptable').clone(true);
124+
var ref = $('#templates').find('.ftptable-nrm').clone(true);
125125
var index = $('.data-col2 .ftptable').length + 1;
126126

127127
ref.find('input').each(function(i, elm) {
@@ -131,7 +131,7 @@ App.Actions.WEB.add_ftp_user_form = function() {
131131

132132
ref.find('.ftp-user-number').text(index);
133133

134-
$('.data-col2 .ftptable:last').after(ref);
134+
$('#ftp_users').append(ref);
135135

136136
var index = 1;
137137
$('.data-col2 .ftp-user-number:visible').each(function(i, o) {

‎web/js/pages/edit_web.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ App.Listeners.WEB.keypress_ftp_path = function() {
106106
//
107107
//
108108
App.Actions.WEB.add_ftp_user_form = function() {
109-
var ref = $('#templates').find('.ftptable').clone(true);
109+
var ref = $('#templates').find('.ftptable-nrm').clone(true);
110110
var index = $('.data-col2 .ftptable').length + 1;
111111

112112
ref.find('input').each(function(i, elm) {
@@ -116,7 +116,7 @@ App.Actions.WEB.add_ftp_user_form = function() {
116116

117117
ref.find('.ftp-user-number').text(index);
118118

119-
$('.data-col2 .ftptable:last').after(ref);
119+
$('#ftp_users').append(ref);
120120

121121
var index = 1;
122122
$('.data-col2 .ftp-user-number:visible').each(function(i, o) {

‎web/templates/pages/add_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
</td>
411411
</tr>
412412
<tr>
413-
<td>
413+
<td id="ftp_users">
414414
<?php foreach ($v_ftp_users as $i => $ftp_user): ?>
415415
<?php
416416
$v_ftp_user = $ftp_user['v_ftp_user'];

‎web/templates/pages/edit_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@
537537
</td>
538538
</tr>
539539
<tr>
540-
<td>
540+
<td id="ftp_users">
541541
<?php foreach ($v_ftp_users as $i => $ftp_user): ?>
542542
<?php
543543
$v_ftp_user = $ftp_user['v_ftp_user'];

‎web/templates/pages/list_server_info.html‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
77
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
88
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/top_js.html'; ?>
9-
<script type="text/javascript" src="/inc/jquery/jquery-3.6.0.min.js"></script>
10-
<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
11-
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>
12-
<script type="text/javascript" src="/js/events.js"></script>
9+
<script src="/js/jquery/jquery.cookie.js?<?=JS_LATEST_UPDATE?>"></script>
10+
<script src="/js/jquery/jquery-ui.min.js?<?=JS_LATEST_UPDATE?>"></script>
11+
<script src="/js/jquery/jquery.finder.js?<?=JS_LATEST_UPDATE?>"></script>
12+
<script src="/js/hotkeys.js?<?=JS_LATEST_UPDATE?>"></script>
13+
<script src="/js/events.js?<?=JS_LATEST_UPDATE?>"></script>
14+
<script src="/js/app.js?<?=JS_LATEST_UPDATE?>"></script>
15+
<script src="/js/init.js?<?=JS_LATEST_UPDATE?>"></script>
16+
<script src="/js/i18n.js.php?<?=JS_LATEST_UPDATE?>"></script>
17+
<script src="/js/templates.js?<?=JS_LATEST_UPDATE?>"></script>
1318
</head>
1419

1520
<body>

‎web/templates/pages/list_weblog.html‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/title.html'; ?>
77
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/css.html'; ?>
88
<?php require ''.$_SERVER['HESTIA'].'/web/templates/includes/top_js.html'; ?>
9-
10-
<script type="text/javascript" src="/inc/jquery/jquery-3.6.0.min.js"></script>
11-
<script type="text/javascript" src="/js/jquery/jquery.cookie.js"></script>
12-
<script type="text/javascript" src="/js/jquery/jquery-ui-1.8.20.custom.min.js"></script>
13-
<script type="text/javascript" src="/js/events.js"></script>
9+
<script src="/js/jquery/jquery.cookie.js?<?=JS_LATEST_UPDATE?>"></script>
10+
<script src="/js/jquery/jquery-ui.min.js?<?=JS_LATEST_UPDATE?>"></script>
11+
<script src="/js/jquery/jquery.finder.js?<?=JS_LATEST_UPDATE?>"></script>
12+
<script src="/js/hotkeys.js?<?=JS_LATEST_UPDATE?>"></script>
13+
<script src="/js/events.js?<?=JS_LATEST_UPDATE?>"></script>
14+
<script src="/js/app.js?<?=JS_LATEST_UPDATE?>"></script>
15+
<script src="/js/init.js?<?=JS_LATEST_UPDATE?>"></script>
16+
<script src="/js/i18n.js.php?<?=JS_LATEST_UPDATE?>"></script>
17+
<script src="/js/templates.js?<?=JS_LATEST_UPDATE?>"></script>
1418
</head>
1519

1620
<body>

0 commit comments

Comments
 (0)