Skip to content

Commit 3586630

Browse files
AlecRustAlecRust
authored
Migrate more list views to .units-table (hestiacp#3634)
* Migrate List Access Keys to .units-table * Migrate List Firewall Banlist to .units-table * Migrate List Firewall Ipset to .units-table
1 parent c8eeae5 commit 3586630

File tree

3 files changed

+159
-133
lines changed

3 files changed

+159
-133
lines changed

‎web/templates/pages/list_access_keys.php‎

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -45,71 +45,77 @@
4545
<!-- End toolbar -->
4646

4747
<div class="container">
48-
<div class="units js-units-container">
49-
<div class="header units-header">
50-
<div class="l-unit__col l-unit__col--right">
51-
<div>
52-
<div class="clearfix l-unit__stat-col--left super-compact">
53-
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
54-
</div>
55-
<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Access Key") ?></b></div>
56-
<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
57-
<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _("Comment") ?></b></div>
58-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
59-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Time") ?></b></div>
60-
</div>
48+
49+
<div class="units-table js-units-container">
50+
<div class="units-table-header">
51+
<div class="units-table-cell">
52+
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
6153
</div>
54+
<div class="units-table-cell"><?= _("Access Key") ?></div>
55+
<div class="units-table-cell"></div>
56+
<div class="units-table-cell"><?= _("Comment") ?></div>
57+
<div class="units-table-cell"><?= _("Date") ?></div>
58+
<div class="units-table-cell"><?= _("Time") ?></div>
6259
</div>
6360

64-
<!-- Begin Access Keys list item loop -->
6561
<?php
6662
foreach ($data as $key => $value) {
6763
++$i;
68-
$key_user = !empty($value['USER']) ? $value['USER'] : 'admin';
69-
$key_comment = !empty($value['COMMENT']) ? $value['COMMENT'] : '-';
70-
//$key_permissions = !empty($value['PERMISSIONS']) ? $value['PERMISSIONS'] : '-';
71-
//$key_permissions = implode(' ', $key_permissions);
72-
$key_date = !empty($value['DATE']) ? $value['DATE'] : '-';
73-
$key_time = !empty($value['TIME']) ? $value['TIME'] : '-';
64+
$key_user = !empty($value['USER']) ? $value['USER'] : 'admin';
65+
$key_comment = !empty($value['COMMENT']) ? $value['COMMENT'] : '-';
66+
//$key_permissions = !empty($value['PERMISSIONS']) ? $value['PERMISSIONS'] : '-';
67+
//$key_permissions = implode(' ', $key_permissions);
68+
$key_date = !empty($value['DATE']) ? $value['DATE'] : '-';
69+
$key_time = !empty($value['TIME']) ? $value['TIME'] : '-';
7470
?>
75-
<div class="l-unit animate__animated animate__fadeIn js-unit"
71+
<div class="units-table-row animate__animated animate__fadeIn js-unit"
7672
data-sort-key="<?=strtolower($key)?>"
7773
data-sort-comment="<?=strtolower($key_comment)?>"
7874
data-sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>">
79-
80-
<div class="l-unit__col l-unit__col--right">
81-
<div class="clearfix l-unit__stat-col--left super-compact">
75+
<div class="units-table-cell">
76+
<div>
8277
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?= $key ?>">
78+
<label for="check<?= $i ?>" class="u-hide-desktop"><?= _("Select") ?></label>
8379
</div>
84-
<div class="clearfix l-unit__stat-col--left wide-6">
85-
<b><a href="/list/access-key/?key=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Access Key") ?>: <?= $key ?>"><?= $key ?></a></b>
86-
</div>
87-
88-
<!-- START QUICK ACTION TOOLBAR AREA -->
89-
<div class="clearfix l-unit__stat-col--left compact u-text-right">
90-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
91-
<div class="actions-panel clearfix">
92-
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
93-
<a
94-
class="data-controls js-confirm-action"
95-
href="/delete/access-key/?key=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
96-
data-confirm-title="<?= _("Delete") ?>"
97-
data-confirm-message="<?= sprintf(_("Are you sure you want to delete access key %s?"), $key) ?>"
98-
>
99-
<i class="fas fa-trash icon-red icon-dim"></i>
100-
</a>
101-
</div>
102-
</div>
103-
</div>
104-
</div>
105-
<!-- END QUICK ACTION TOOLBAR AREA -->
106-
<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _($key_comment) ?></b></div>
107-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_date ?></b></div>
108-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_time ?></b></div>
80+
</div>
81+
<div class="units-table-cell u-text-bold">
82+
<span class="u-hide-desktop"><?= _("Access Key") ?>:</span>
83+
<a href="/list/access-key/?key=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Access Key") ?>: <?= $key ?>">
84+
<?= $key ?>
85+
</a>
86+
</div>
87+
<div class="units-table-cell">
88+
<ul class="units-table-row-actions">
89+
<li class="units-table-row-action shortcut-delete" data-key-action="js">
90+
<a
91+
class="units-table-row-action-link data-controls js-confirm-action"
92+
href="/delete/access-key/?key=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
93+
title="<?= _("Delete") ?>"
94+
data-confirm-title="<?= _("Delete") ?>"
95+
data-confirm-message="<?= sprintf(_("Are you sure you want to delete access key %s?"), $key) ?>"
96+
>
97+
<i class="fas fa-trash icon-red"></i>
98+
<span class="u-hide-desktop"><?= _("Delete") ?></span>
99+
</a>
100+
</li>
101+
</ul>
102+
</div>
103+
<div class="units-table-cell u-text-bold">
104+
<span class="u-hide-desktop"><?= _("Comment") ?>:</span>
105+
<?= _($key_comment) ?>
106+
</div>
107+
<div class="units-table-cell u-text-bold">
108+
<span class="u-hide-desktop"><?= _("Date") ?>:</span>
109+
<time datetime="<?= $key_date ?>"><?= $key_date ?></time>
110+
</div>
111+
<div class="units-table-cell u-text-bold">
112+
<span class="u-hide-desktop"><?= _("Time") ?>:</span>
113+
<?= $key_time ?>
109114
</div>
110115
</div>
111116
<?php } ?>
112117
</div>
118+
113119
</div>
114120

115121
<footer class="app-footer">

‎web/templates/pages/list_firewall_banlist.php‎

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,17 @@
2626
<!-- End toolbar -->
2727

2828
<div class="container">
29-
<div class="units js-units-container">
30-
<div class="header units-header">
31-
<div class="l-unit__col l-unit__col--right">
32-
<div class="clearfix l-unit__stat-col--left super-compact">
33-
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
34-
</div>
35-
<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("IP Address") ?></b></div>
36-
<div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>
37-
<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Date") ?></b></div>
38-
<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Time") ?></b></div>
39-
<div class="clearfix l-unit__stat-col--left wide u-text-center"><b><?= _("Comment") ?></b></div>
29+
30+
<div class="units-table js-units-container">
31+
<div class="units-table-header">
32+
<div class="units-table-cell">
33+
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
4034
</div>
35+
<div class="units-table-cell"><?= _("IP Address") ?></div>
36+
<div class="units-table-cell"></div>
37+
<div class="units-table-cell"><?= _("Date") ?></div>
38+
<div class="units-table-cell"><?= _("Time") ?></div>
39+
<div class="units-table-cell"><?= _("Comment") ?></div>
4140
</div>
4241

4342
<!-- Begin banned IP address list item loop -->
@@ -46,37 +45,49 @@
4645
++$i;
4746
$ip = $key;
4847
?>
49-
<div class="l-unit animate__animated animate__fadeIn js-unit">
50-
<div class="l-unit__col l-unit__col--right">
51-
<div class="clearfix l-unit__stat-col--left super-compact">
48+
<div class="units-table-row animate__animated animate__fadeIn js-unit">
49+
<div class="units-table-cell">
50+
<div>
5251
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="ipchain[]" value="<?= $ip . ":" . $value["CHAIN"] ?>">
52+
<label for="check<?= $i ?>" class="u-hide-desktop"><?= _("Select") ?></label>
5353
</div>
54-
<div class="clearfix l-unit__stat-col--left wide-3"><b><?= $ip ?></b></div>
55-
<!-- START QUICK ACTION TOOLBAR AREA -->
56-
<div class="clearfix l-unit__stat-col--left compact-4">
57-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
58-
<div class="actions-panel clearfix">
59-
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
60-
<a
61-
class="data-controls js-confirm-action"
62-
href="/delete/firewall/banlist/?ip=<?= $ip ?>&chain=<?= $value["CHAIN"] ?>&token=<?= $_SESSION["token"] ?>"
63-
data-confirm-title="<?= _("Delete") ?>"
64-
data-confirm-message="<?= sprintf(_("Are you sure you want to delete IP address %s?"), $key) ?>"
65-
>
66-
<i class="fas fa-trash icon-red icon-dim"></i>
67-
</a>
68-
</div>
69-
</div>
70-
</div>
71-
</div>
72-
<!-- END QUICK ACTION TOOLBAR AREA -->
73-
<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><?= _($data[$key]["DATE"]) ?></div>
74-
<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><?= $data[$key]["TIME"] ?></div>
75-
<div class="clearfix l-unit__stat-col--left u-text-center wide"><b><?= _($value["CHAIN"]) ?></b></div>
54+
</div>
55+
<div class="units-table-cell u-text-bold">
56+
<span class="u-hide-desktop"><?= _("IP Address") ?>:</span>
57+
<?= $ip ?>
58+
</div>
59+
<div class="units-table-cell">
60+
<ul class="units-table-row-actions">
61+
<li class="units-table-row-action shortcut-delete" data-key-action="js">
62+
<a
63+
class="units-table-row-action-link data-controls js-confirm-action"
64+
href="/delete/firewall/banlist/?ip=<?= $ip ?>&chain=<?= $value["CHAIN"] ?>&token=<?= $_SESSION["token"] ?>"
65+
title="<?= _("Delete") ?>"
66+
data-confirm-title="<?= _("Delete") ?>"
67+
data-confirm-message="<?= sprintf(_("Are you sure you want to delete IP address %s?"), $key) ?>"
68+
>
69+
<i class="fas fa-trash icon-red"></i>
70+
<span class="u-hide-desktop"><?= _("Delete") ?></span>
71+
</a>
72+
</li>
73+
</ul>
74+
</div>
75+
<div class="units-table-cell">
76+
<span class="u-hide-desktop u-text-bold"><?= _("Date") ?>:</span>
77+
<time datetime="<?= _($data[$key]["DATE"]) ?>"><?= _($data[$key]["DATE"]) ?></time>
78+
</div>
79+
<div class="units-table-cell">
80+
<span class="u-hide-desktop u-text-bold"><?= _("Time") ?>:</span>
81+
<?= $data[$key]["TIME"] ?>
82+
</div>
83+
<div class="units-table-cell u-text-bold">
84+
<span class="u-hide-desktop"><?= _("Comment") ?>:</span>
85+
<?= _($value["CHAIN"]) ?>
7686
</div>
7787
</div>
7888
<?php } ?>
7989
</div>
90+
8091
</div>
8192

8293
<footer class="app-footer">

‎web/templates/pages/list_firewall_ipset.php‎

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -26,65 +26,74 @@
2626
<!-- End toolbar -->
2727

2828
<div class="container">
29-
<div class="units js-units-container">
30-
<div class="header units-header">
31-
<div class="l-unit__col l-unit__col--right">
32-
<div class="clearfix l-unit__stat-col--left super-compact">
33-
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
34-
</div>
35-
<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("IP List Name") ?></b></div>
36-
<div class="clearfix l-unit__stat-col--left compact-4"><b>&nbsp;</b></div>
37-
<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b><?= _("Auto Update") ?></b></div>
38-
<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><b><?= _("IP Version") ?></b></div>
39-
<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><b><?= _("Date") ?></b></div>
40-
<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><b><?= _("Time") ?></b></div>
29+
30+
<div class="units-table js-units-container">
31+
<div class="units-table-header">
32+
<div class="units-table-cell">
33+
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
4134
</div>
35+
<div class="units-table-cell"><?= _("IP List Name") ?></div>
36+
<div class="units-table-cell"></div>
37+
<div class="units-table-cell"><?= _("Auto Update") ?></div>
38+
<div class="units-table-cell"><?= _("IP Version") ?></div>
39+
<div class="units-table-cell"><?= _("Date") ?></div>
40+
<div class="units-table-cell"><?= _("Time") ?></div>
4241
</div>
4342

4443
<!-- Begin firewall IP address list item loop -->
4544
<?php foreach ($data as $key => $value) {
4645
$listname = $key; ?>
47-
<div class="l-unit animate__animated animate__fadeIn js-unit">
48-
<div class="l-unit__col l-unit__col--right">
49-
<div class="clearfix l-unit__stat-col--left super-compact">
46+
<div class="units-table-row animate__animated animate__fadeIn js-unit">
47+
<div class="units-table-cell">
48+
<div>
5049
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="setname[]" value="<?= $listname ?>">
50+
<label for="check<?= $i ?>" class="u-hide-desktop"><?= _("Select") ?></label>
5151
</div>
52-
<div class="clearfix l-unit__stat-col--left wide-3"><b><?= $listname ?></b></div>
53-
<!-- START QUICK ACTION TOOLBAR AREA -->
54-
<div class="clearfix l-unit__stat-col--left compact-4">
55-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
56-
<div class="actions-panel clearfix">
57-
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
58-
<a
59-
class="data-controls js-confirm-action"
60-
href="/delete/firewall/ipset/?listname=<?= $listname ?>&token=<?= $_SESSION["token"] ?>"
61-
data-confirm-title="<?= _("Delete") ?>"
62-
data-confirm-message="<?= sprintf(_("Are you sure you want to delete IP list %s?"), $key) ?>"
63-
>
64-
<i class="fas fa-trash icon-red icon-dim"></i>
65-
</a>
66-
</div>
67-
</div>
68-
</div>
69-
</div>
70-
<!-- END QUICK ACTION TOOLBAR AREA -->
71-
<div class="clearfix l-unit__stat-col--left u-text-center compact-5"><b>
72-
<?php if ($data[$key]["AUTOUPDATE"] == "no") { ?>
73-
<i class="fas fa-circle-xmark icon-red"></i>
74-
<?php } else { ?>
75-
<i class="fas fa-circle-check icon-green"></i>
76-
<?php } ?>
77-
</b>
78-
</div>
79-
<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><?= _($data[$key]["IP_VERSION"]) ?></div>
80-
<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><?= _($data[$key]["DATE"]) ?></div>
81-
<div class="clearfix l-unit__stat-col--left u-text-center compact-4"><?= $data[$key]["TIME"] ?></div>
52+
</div>
53+
<div class="units-table-cell u-text-bold">
54+
<span class="u-hide-desktop"><?= _("IP List Name") ?>:</span>
55+
<?= $listname ?>
56+
</div>
57+
<div class="units-table-cell">
58+
<ul class="units-table-row-actions">
59+
<li class="units-table-row-action shortcut-delete" data-key-action="js">
60+
<a
61+
class="units-table-row-action-link data-controls js-confirm-action"
62+
href="/delete/firewall/ipset/?listname=<?= $listname ?>&token=<?= $_SESSION["token"] ?>"
63+
title="<?= _("Delete") ?>"
64+
data-confirm-title="<?= _("Delete") ?>"
65+
data-confirm-message="<?= sprintf(_("Are you sure you want to delete IP list %s?"), $key) ?>"
66+
>
67+
<i class="fas fa-trash icon-red"></i>
68+
<span class="u-hide-desktop"><?= _("Delete") ?></span>
69+
</a>
70+
</li>
71+
</ul>
72+
</div>
73+
<div class="units-table-cell u-text-bold">
74+
<span class="u-hide-desktop"><?= _("Auto Update") ?>:</span>
75+
<?php if ($data[$key]["AUTOUPDATE"] == "no") { ?>
76+
<i class="fas fa-circle-xmark icon-red" title="<?= _("Disabled") ?>"></i>
77+
<?php } else { ?>
78+
<i class="fas fa-circle-check icon-green" title="<?= _("Enabled") ?>"></i>
79+
<?php } ?>
80+
</div>
81+
<div class="units-table-cell">
82+
<span class="u-hide-desktop u-text-bold"><?= _("IP Version") ?>:</span>
83+
<?= _($data[$key]["IP_VERSION"]) ?>
84+
</div>
85+
<div class="units-table-cell">
86+
<span class="u-hide-desktop u-text-bold"><?= _("Date") ?>:</span>
87+
<time datetime="<?= _($data[$key]["DATE"]) ?>"><?= _($data[$key]["DATE"]) ?></time>
88+
</div>
89+
<div class="units-table-cell">
90+
<span class="u-hide-desktop u-text-bold"><?= _("Time") ?>:</span>
91+
<?= $data[$key]["TIME"] ?>
8292
</div>
8393
</div>
84-
<?php
85-
$i++;
86-
} ?>
94+
<?php } ?>
8795
</div>
96+
8897
</div>
8998

9099
<footer class="app-footer">

0 commit comments

Comments
 (0)