Skip to content

Commit 4210688

Browse files
AlecRustAlecRust
authored
Fix regressions, remove tables (hestiacp#3042)
1 parent 795667d commit 4210688

29 files changed

+679
-755
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -866,15 +866,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
866866
}
867867

868868
.context-menu.sort-order {
869-
display: inline-block;
870869
position: absolute;
870+
top: 35px;
871+
left: 0;
871872
z-index: 3;
872-
left: 397px;
873873
overflow: hidden;
874-
top: 42px;
874+
border-radius: 4px;
875875
background-color: rgb(255 255 255 / 95%);
876876
box-shadow: 0 2px 14px 0 rgb(20 20 20 / 35%);
877-
border-radius: 4px;
878877
border: 1px solid rgb(255 255 255 / 100%);
879878
}
880879

@@ -892,14 +891,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
892891

893892
.context-menu.sort-order span.name {
894893
display: inline-block;
895-
padding: 12px;
894+
padding: 11px;
896895
width: 141px;
897896
font-weight: 500;
898897
}
899898

900899
.context-menu.sort-order span.up {
901900
display: inline-block;
902-
padding: 12px 14px;
901+
padding: 11px 14px;
903902
width: 44px;
904903
}
905904

@@ -943,7 +942,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
943942

944943
.l-sort-toolbar {
945944
display: flex;
946-
text-transform: uppercase;
945+
position: relative;
947946
font-size: 0.8rem;
948947
}
949948

@@ -954,8 +953,8 @@ div.l-content > div.l-separator:nth-of-type(4) {
954953

955954
.l-sort-toolbar .sort-by {
956955
cursor: pointer;
957-
padding-top: 7px;
958-
padding-left: 10px;
956+
text-transform: uppercase;
957+
padding: 6px 12px 0;
959958
}
960959

961960
.l-sort-toolbar .sort-by:hover {
@@ -2963,8 +2962,7 @@ form#vstobjects.suspended {
29632962
}
29642963

29652964
.l-sort-toolbar__search-box {
2966-
float: right !important;
2967-
padding-right: 0 !important;
2965+
margin-left: 12px;
29682966
}
29692967

29702968
.ui-dialog .ui-dialog-buttonpane {

‎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/templates/includes/panel.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<a href="<?=htmlspecialchars($home_url)?>" class="l-logo" title="<?=_('Hestia Control Panel');?>"></a>
1616

1717
<!-- Left Menu -->
18-
<div class="l-menu clearfix u-noselect">
18+
<div class="l-menu u-noselect">
1919
<!-- Records tab -->
2020
<div class="l-menu__item <?php if(in_array($TAB, ['WEB', 'DNS', 'MAIL', 'DB', 'BACKUP', 'CRON', 'PACKAGE', 'USER', 'LOG'])) echo 'l-menu__item--active' ?>"><a href="<?=htmlspecialchars($home_url)?>"><i class="fas fa-tasks panel-icon"></i><?=_('Records');?></a></div>
2121

‎web/templates/pages/list_access_keys.html‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,27 @@
55
<a class="button button-secondary" id="btn-back" href="/edit/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
66
<a href="/add/access-key/" class="button button-secondary" id="btn-create"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Access Key');?></a>
77
</div>
8-
9-
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
10-
<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
11-
<li entity="sort-key"><span class="name"><?=_('Access Key');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
12-
<li entity="sort-comment"><span class="name"><?=_('Comment');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
13-
</ul>
14-
<div class="l-sort-toolbar clearfix">
15-
<table>
16-
<tr>
17-
<td class="sort-by" title="<?=_('Sort items');?>">
18-
<?=_('sort by');?>: <span><b><?=_('Date');?> <i class="fas fa-sort-alpha-down"></i></b></span>
19-
</td>
20-
<td>
21-
<form action="/bulk/access-key/" method="post" id="objects">
22-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
23-
<div class="l-select">
24-
<select name="action" id="">
25-
<option value=""><?=_('apply to selected');?></option>
26-
<option value="delete"><?=_('delete');?></option>
27-
</select>
28-
</div>
29-
<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>"><i class="fas fa-arrow-right"></i></button>
30-
</form>
31-
</td>
32-
</tr>
33-
</table>
8+
<div class="l-sort-toolbar">
9+
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
10+
<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
11+
<li entity="sort-key"><span class="name"><?=_('Access Key');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
12+
<li entity="sort-comment"><span class="name"><?=_('Comment');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
13+
</ul>
14+
<div class="sort-by" title="<?=_('Sort items');?>">
15+
<?=_('sort by');?>: <span><b><?=_('Date');?> <i class="fas fa-sort-alpha-down"></i></b></span>
16+
</div>
17+
<form action="/bulk/access-key/" method="post" id="objects">
18+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
19+
<div class="l-select">
20+
<select name="action" id="">
21+
<option value=""><?=_('apply to selected');?></option>
22+
<option value="delete"><?=_('delete');?></option>
23+
</select>
24+
</div>
25+
<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>">
26+
<i class="fas fa-arrow-right"></i>
27+
</button>
28+
</form>
3429
</div>
3530
</div>
3631
</div>

‎web/templates/pages/list_backup.html‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,30 @@
77
<a href="/list/backup/exclusions/" class="button button-secondary"><i class="fas fa-folder-minus status-icon orange"></i><?=_('backup exclusions');?></a>
88
<?php } ?>
99
</div>
10-
<div class="l-sort-toolbar clearfix">
11-
<table>
12-
<tr>
13-
<td class="l-sort-toolbar__search-box">
14-
<form action="/search/" method="get">
15-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
16-
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
17-
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search');?>"><i class="fas fa-search"></i></button>
18-
</form>
19-
</td>
20-
<?php if ($read_only !== 'true') {?>
21-
<td>
22-
<form action="/bulk/backup/" method="post" id="objects">
23-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
24-
<div class="l-select">
25-
<select name="action" id="">
26-
<option value=""><?=_('apply to selected');?></option>
27-
<option value="delete"><?=_('delete') ?></option>
28-
</select>
29-
</div>
30-
<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>"><i class="fas fa-arrow-right"></i></button>
31-
</form>
32-
</td>
33-
<?php } ?>
34-
</tr>
35-
</table>
10+
<div class="l-sort-toolbar">
11+
<?php if ($read_only !== 'true') {?>
12+
<form action="/bulk/backup/" method="post" id="objects">
13+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
14+
<div class="l-select">
15+
<select name="action" id="">
16+
<option value=""><?=_('apply to selected');?></option>
17+
<option value="delete"><?=_('delete') ?></option>
18+
</select>
19+
</div>
20+
<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>">
21+
<i class="fas fa-arrow-right"></i>
22+
</button>
23+
</form>
24+
<?php } ?>
25+
<div class="l-sort-toolbar__search-box">
26+
<form action="/search/" method="get">
27+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
28+
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
29+
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search');?>">
30+
<i class="fas fa-search"></i>
31+
</button>
32+
</form>
33+
</div>
3634
</div>
3735
</div>
3836
</div>

‎web/templates/pages/list_backup_detail.html‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,25 @@
55
<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
66
<a href="/schedule/restore/?token=<?=$_SESSION['token']?>&backup=<?=htmlentities($_GET['backup'])?>" class="button button-secondary"><i class="fas fa-undo status-icon green"></i><?=_('Restore All');?></a>
77
</div>
8-
<div class="l-sort-toolbar clearfix">
9-
<table>
10-
<tr>
11-
<td class="l-sort-toolbar__search-box">
12-
<form action="/search/" method="get">
13-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
14-
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>">
15-
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
16-
</form>
17-
</td>
18-
<td>
19-
<form action="/bulk/restore/" method="post" id="objects">
20-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
21-
<input type="hidden" name="backup" value="<?=htmlentities($_GET['backup']); ?>">
22-
<div class="l-select">
23-
<select name="action">
24-
<option value=""><?=_('apply to selected');?></option>
25-
<option value="restore"><?=_('restore') ?></option>
26-
</select>
27-
</div>
28-
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
29-
</form>
30-
</td>
31-
</tr>
32-
</table>
8+
<div class="l-sort-toolbar">
9+
<form action="/bulk/restore/" method="post" id="objects">
10+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
11+
<input type="hidden" name="backup" value="<?=htmlentities($_GET['backup']); ?>">
12+
<div class="l-select">
13+
<select name="action" id="">
14+
<option value=""><?=_('apply to selected');?></option>
15+
<option value="restore"><?=_('restore') ?></option>
16+
</select>
17+
</div>
18+
<button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
19+
</form>
20+
<div class="l-sort-toolbar__search-box">
21+
<form action="/search/" method="get">
22+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
23+
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>">
24+
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
25+
</form>
26+
</div>
3327
</div>
3428
</div>
3529
</div>

‎web/templates/pages/list_backup_exclusions.html‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@
55
<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
66
<a href="/edit/backup/exclusions/" class="button button-secondary"><i class="fas fa-pencil-alt status-icon orange"></i><?=_('Editing Backup Exclusions');?></a>
77
</div>
8-
<div class="l-sort-toolbar clearfix">
9-
<table>
10-
<tr>
11-
<td class="l-sort-toolbar__search-box">
12-
<form action="/search/" method="get">
13-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
14-
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
15-
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search');?>"><i class="fas fa-search"></i></button>
16-
</form>
17-
</td>
18-
</tr>
19-
</table>
8+
<div class="l-sort-toolbar">
9+
<div class="l-sort-toolbar__search-box">
10+
<form action="/search/" method="get">
11+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
12+
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
13+
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search');?>">
14+
<i class="fas fa-search"></i>
15+
</button>
16+
</form>
17+
</div>
2018
</div>
2119
</div>
2220
</div>

‎web/templates/pages/list_cron.html‎

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,46 @@
1111
<?php } ?>
1212
<?php } ?>
1313
</div>
14-
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
15-
<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Command');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
16-
<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
17-
</ul>
18-
<div class="l-sort-toolbar clearfix">
19-
<table>
20-
<tr>
21-
<td class="sort-by" title="<?=_('Sort items');?>">
22-
<?=_('sort by');?>: <span>
23-
<b>
24-
<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
25-
<?=$label;?> <i class="fas fa-sort-alpha-down"></i>
26-
</b>
27-
</span>
28-
</td>
29-
<td class="l-sort-toolbar__search-box">
30-
<form action="/search/" method="get">
31-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
32-
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
33-
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search');?>"><i class="fas fa-search"></i></button>
34-
</form>
35-
</td>
36-
<?php if ($read_only !== 'true') {?>
37-
<td class="">
38-
<form action="/bulk/cron/" method="post" id="objects">
39-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
40-
<div class="l-select">
41-
<select name="action" id="">
42-
<option value=""><?=_('apply to selected');?></option>
43-
<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'._('turn off notifications').'</option>'; ?>
44-
<?php if($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'._('turn on notifications').'</option>'; ?>
45-
<option value="suspend"><?=_('suspend');?></option>
46-
<option value="unsuspend"><?=_('unsuspend');?></option>
47-
<option value="delete"><?=_('delete');?></option>
48-
</select>
49-
</div>
50-
<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>"><i class="fas fa-arrow-right"></i></button>
51-
</form>
52-
</td>
53-
<?php } ?>
54-
</tr>
55-
</table>
14+
<div class="l-sort-toolbar">
15+
<ul class="context-menu sort-order animated fadeIn" style="display:none;">
16+
<li entity="sort-name"><span class="name <?php if ($_SESSION['userSortOrder'] === 'name') { echo 'active'; } ?>"><?=_('Command');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
17+
<li entity="sort-date" sort_as_int="1"><span class="name <?php if ($_SESSION['userSortOrder'] === 'date') { echo 'active'; } ?>"><?=_('Date');?> <i class="fas fa-sort-alpha-down"></i></span><span class="up"><i class="fas fa-sort-alpha-up"></i></span></li>
18+
</ul>
19+
<div class="sort-by" title="<?=_('Sort items');?>">
20+
<?=_('sort by');?>: <span>
21+
<b>
22+
<?php if ($_SESSION['userSortOrder'] === 'name') { $label = _('Name'); } else { $label = _('Date'); } ?>
23+
<?=$label;?> <i class="fas fa-sort-alpha-down"></i>
24+
</b>
25+
</span>
26+
</div>
27+
<?php if ($read_only !== 'true') {?>
28+
<form action="/bulk/cron/" method="post" id="objects">
29+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
30+
<div class="l-select">
31+
<select name="action" id="">
32+
<option value=""><?=_('apply to selected');?></option>
33+
<?php if($panel[$user_plain]['CRON_REPORTS'] == 'yes') echo '<option value="delete-cron-reports">'._('turn off notifications').'</option>'; ?>
34+
<?php if($panel[$user_plain]['CRON_REPORTS'] == 'no') echo '<option value="add-cron-reports">'._('turn on notifications').'</option>'; ?>
35+
<option value="suspend"><?=_('suspend');?></option>
36+
<option value="unsuspend"><?=_('unsuspend');?></option>
37+
<option value="delete"><?=_('delete');?></option>
38+
</select>
39+
</div>
40+
<button type="submit" class="l-sort-toolbar__filter-apply" value="" title="<?=_('apply to selected');?>">
41+
<i class="fas fa-arrow-right"></i>
42+
</button>
43+
</form>
44+
<?php } ?>
45+
<div class="l-sort-toolbar__search-box">
46+
<form action="/search/" method="get">
47+
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
48+
<input type="text" class="search-input" name="q" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" title="<?=_('Search');?>">
49+
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value="" title="<?=_('Search');?>">
50+
<i class="fas fa-search"></i>
51+
</button>
52+
</form>
53+
</div>
5654
</div>
5755
</div>
5856
</div>

0 commit comments

Comments
 (0)