Skip to content

Commit 27e6dbe

Browse files
AlecRustAlecRust
authored
Refactor table HTML (hestiacp#3606)
1 parent 1552131 commit 27e6dbe

25 files changed

+1887
-1851
lines changed

‎web/templates/pages/list_access_keys.php‎

Lines changed: 55 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -41,71 +41,72 @@
4141
</div>
4242
<!-- End toolbar -->
4343

44-
45-
<div class="container units">
46-
<div class="header units-header">
47-
<div class="l-unit__col l-unit__col--right">
48-
<div>
49-
<div class="clearfix l-unit__stat-col--left super-compact">
50-
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
44+
<div class="container">
45+
<div class="units">
46+
<div class="header units-header">
47+
<div class="l-unit__col l-unit__col--right">
48+
<div>
49+
<div class="clearfix l-unit__stat-col--left super-compact">
50+
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
51+
</div>
52+
<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Access Key") ?></b></div>
53+
<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
54+
<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _("Comment") ?></b></div>
55+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
56+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Time") ?></b></div>
5157
</div>
52-
<div class="clearfix l-unit__stat-col--left wide-6"><b><?= _("Access Key") ?></b></div>
53-
<div class="clearfix l-unit__stat-col--left compact u-text-right"><b>&nbsp;</b></div>
54-
<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _("Comment") ?></b></div>
55-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
56-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Time") ?></b></div>
5758
</div>
5859
</div>
59-
</div>
6060

61-
<!-- Begin Access Keys list item loop -->
62-
<?php
63-
foreach ($data as $key => $value) {
64-
++$i;
65-
$key_user = !empty($value['USER']) ? $value['USER'] : 'admin';
66-
$key_comment = !empty($value['COMMENT']) ? $value['COMMENT'] : '-';
67-
//$key_permissions = !empty($value['PERMISSIONS']) ? $value['PERMISSIONS'] : '-';
68-
//$key_permissions = implode(' ', $key_permissions);
69-
$key_date = !empty($value['DATE']) ? $value['DATE'] : '-';
70-
$key_time = !empty($value['TIME']) ? $value['TIME'] : '-';
71-
?>
72-
<div class="l-unit animate__animated animate__fadeIn js-unit"
73-
data-sort-key="<?=strtolower($key)?>"
74-
data-sort-comment="<?=strtolower($key_comment)?>"
75-
data-sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>">
61+
<!-- Begin Access Keys list item loop -->
62+
<?php
63+
foreach ($data as $key => $value) {
64+
++$i;
65+
$key_user = !empty($value['USER']) ? $value['USER'] : 'admin';
66+
$key_comment = !empty($value['COMMENT']) ? $value['COMMENT'] : '-';
67+
//$key_permissions = !empty($value['PERMISSIONS']) ? $value['PERMISSIONS'] : '-';
68+
//$key_permissions = implode(' ', $key_permissions);
69+
$key_date = !empty($value['DATE']) ? $value['DATE'] : '-';
70+
$key_time = !empty($value['TIME']) ? $value['TIME'] : '-';
71+
?>
72+
<div class="l-unit animate__animated animate__fadeIn js-unit"
73+
data-sort-key="<?=strtolower($key)?>"
74+
data-sort-comment="<?=strtolower($key_comment)?>"
75+
data-sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>">
7676

77-
<div class="l-unit__col l-unit__col--right">
78-
<div class="clearfix l-unit__stat-col--left super-compact">
79-
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?= $key ?>">
80-
</div>
81-
<div class="clearfix l-unit__stat-col--left wide-6">
82-
<b><a href="/list/access-key/?key=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Access Key") ?>: <?= $key ?>"><?= $key ?></a></b>
83-
</div>
77+
<div class="l-unit__col l-unit__col--right">
78+
<div class="clearfix l-unit__stat-col--left super-compact">
79+
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?= $key ?>">
80+
</div>
81+
<div class="clearfix l-unit__stat-col--left wide-6">
82+
<b><a href="/list/access-key/?key=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Access Key") ?>: <?= $key ?>"><?= $key ?></a></b>
83+
</div>
8484

85-
<!-- START QUICK ACTION TOOLBAR AREA -->
86-
<div class="clearfix l-unit__stat-col--left compact u-text-right">
87-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
88-
<div class="actions-panel clearfix">
89-
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
90-
<a
91-
class="data-controls js-confirm-action"
92-
href="/delete/access-key/?key=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
93-
data-confirm-title="<?= _("Delete") ?>"
94-
data-confirm-message="<?= sprintf(_("Are you sure you want to delete access key %s?"), $key) ?>"
95-
>
96-
<i class="fas fa-trash icon-red icon-dim"></i>
97-
</a>
85+
<!-- START QUICK ACTION TOOLBAR AREA -->
86+
<div class="clearfix l-unit__stat-col--left compact u-text-right">
87+
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
88+
<div class="actions-panel clearfix">
89+
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
90+
<a
91+
class="data-controls js-confirm-action"
92+
href="/delete/access-key/?key=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
93+
data-confirm-title="<?= _("Delete") ?>"
94+
data-confirm-message="<?= sprintf(_("Are you sure you want to delete access key %s?"), $key) ?>"
95+
>
96+
<i class="fas fa-trash icon-red icon-dim"></i>
97+
</a>
98+
</div>
9899
</div>
99100
</div>
100101
</div>
102+
<!-- END QUICK ACTION TOOLBAR AREA -->
103+
<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _($key_comment) ?></b></div>
104+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_date ?></b></div>
105+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_time ?></b></div>
101106
</div>
102-
<!-- END QUICK ACTION TOOLBAR AREA -->
103-
<div class="clearfix l-unit__stat-col--left u-text-center wide-2"><b><?= _($key_comment) ?></b></div>
104-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_date ?></b></div>
105-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= $key_time ?></b></div>
106107
</div>
107-
</div>
108-
<?php } ?>
108+
<?php } ?>
109+
</div>
109110
</div>
110111

111112
<footer class="app-footer">

‎web/templates/pages/list_backup.php‎

Lines changed: 75 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -34,91 +34,93 @@
3434
</div>
3535
<!-- End toolbar -->
3636

37-
<div class="container units">
38-
<div class="header units-header">
39-
<div class="l-unit__col l-unit__col--right">
40-
<div>
41-
<div class="clearfix l-unit__stat-col--left super-compact">
42-
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>" <?= $display_mode ?>>
37+
<div class="container">
38+
<div class="units">
39+
<div class="header units-header">
40+
<div class="l-unit__col l-unit__col--right">
41+
<div>
42+
<div class="clearfix l-unit__stat-col--left super-compact">
43+
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>" <?= $display_mode ?>>
44+
</div>
45+
<div class="clearfix l-unit__stat-col--left wide-4"><b><?= _("File Name") ?></b></div>
46+
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right"><b>&nbsp;</b></div>
47+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
48+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Size") ?></b></div>
49+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Type") ?></b></div>
50+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Runtime") ?></b></div>
4351
</div>
44-
<div class="clearfix l-unit__stat-col--left wide-4"><b><?= _("File Name") ?></b></div>
45-
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right"><b>&nbsp;</b></div>
46-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Date") ?></b></div>
47-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Size") ?></b></div>
48-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Type") ?></b></div>
49-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Runtime") ?></b></div>
5052
</div>
5153
</div>
52-
</div>
5354

54-
<!-- Begin user backup list item loop -->
55-
<?php
56-
foreach ($data as $key => $value) {
57-
++$i;
58-
$web = _('No');
59-
$dns = _('No');
60-
$mail = _('No');
61-
$db = _('No');
62-
$cron = _('No');
63-
$udir = _('No');
55+
<!-- Begin user backup list item loop -->
56+
<?php
57+
foreach ($data as $key => $value) {
58+
++$i;
59+
$web = _('No');
60+
$dns = _('No');
61+
$mail = _('No');
62+
$db = _('No');
63+
$cron = _('No');
64+
$udir = _('No');
6465

65-
if (!empty($data[$key]['WEB'])) $web = _('Yes');
66-
if (!empty($data[$key]['DNS'])) $dns = _('Yes');
67-
if (!empty($data[$key]['MAIL'])) $mail = _('Yes');
68-
if (!empty($data[$key]['DB'])) $db = _('Yes');
69-
if (!empty($data[$key]['CRON'])) $cron = _('Yes');
70-
if (!empty($data[$key]['UDIR'])) $udir = _('Yes');
71-
?>
72-
<div class="l-unit animate__animated animate__fadeIn">
73-
<div class="l-unit__col l-unit__col--right">
74-
<div>
75-
<div class="clearfix l-unit__stat-col--left super-compact">
76-
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="backup[]" value="<?= $key ?>" <?= $display_mode ?>>
77-
</div>
78-
<div class="clearfix l-unit__stat-col--left wide-4 truncate">
79-
<b>
80-
<?php if ($read_only === "true") { ?>
81-
<?= $key ?>
82-
<?php } else { ?>
83-
<a href="/list/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>"><?= $key ?></a>
84-
<?php } ?>
85-
</b>
86-
</div>
87-
<!-- START QUICK ACTION TOOLBAR AREA -->
88-
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
89-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
90-
<div class="actions-panel clearfix">
91-
<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["look"] === "admin" && $read_only === "true") { ?>
92-
<!-- Restrict ability to restore or delete backups when impersonating 'admin' account -->
93-
&nbsp;
66+
if (!empty($data[$key]['WEB'])) $web = _('Yes');
67+
if (!empty($data[$key]['DNS'])) $dns = _('Yes');
68+
if (!empty($data[$key]['MAIL'])) $mail = _('Yes');
69+
if (!empty($data[$key]['DB'])) $db = _('Yes');
70+
if (!empty($data[$key]['CRON'])) $cron = _('Yes');
71+
if (!empty($data[$key]['UDIR'])) $udir = _('Yes');
72+
?>
73+
<div class="l-unit animate__animated animate__fadeIn">
74+
<div class="l-unit__col l-unit__col--right">
75+
<div>
76+
<div class="clearfix l-unit__stat-col--left super-compact">
77+
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="backup[]" value="<?= $key ?>" <?= $display_mode ?>>
78+
</div>
79+
<div class="clearfix l-unit__stat-col--left wide-4 truncate">
80+
<b>
81+
<?php if ($read_only === "true") { ?>
82+
<?= $key ?>
9483
<?php } else { ?>
95-
<div class="actions-panel__col actions-panel__download shortcut-d" data-key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Download") ?>"><i class="fas fa-file-arrow-down icon-lightblue icon-dim"></i></a></div>
96-
<?php if ($read_only !== 'true') {?>
97-
<div class="actions-panel__col actions-panel__list shortcut-enter" data-key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>"><i class="fas fa-arrow-rotate-left icon-green icon-dim"></i></a></div>
98-
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
99-
<a
100-
class="data-controls js-confirm-action"
101-
href="/delete/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
102-
data-confirm-title="<?= _("Delete") ?>"
103-
data-confirm-message="<?= sprintf(_("Are you sure you want to delete backup %s?"), $key) ?>"
104-
>
105-
<i class="fas fa-trash icon-red icon-dim"></i>
106-
</a>
107-
</div>
108-
<?php } ?>
84+
<a href="/list/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>"><?= $key ?></a>
10985
<?php } ?>
86+
</b>
87+
</div>
88+
<!-- START QUICK ACTION TOOLBAR AREA -->
89+
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
90+
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
91+
<div class="actions-panel clearfix">
92+
<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["look"] === "admin" && $read_only === "true") { ?>
93+
<!-- Restrict ability to restore or delete backups when impersonating 'admin' account -->
94+
&nbsp;
95+
<?php } else { ?>
96+
<div class="actions-panel__col actions-panel__download shortcut-d" data-key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Download") ?>"><i class="fas fa-file-arrow-down icon-lightblue icon-dim"></i></a></div>
97+
<?php if ($read_only !== 'true') {?>
98+
<div class="actions-panel__col actions-panel__list shortcut-enter" data-key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>"><i class="fas fa-arrow-rotate-left icon-green icon-dim"></i></a></div>
99+
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
100+
<a
101+
class="data-controls js-confirm-action"
102+
href="/delete/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
103+
data-confirm-title="<?= _("Delete") ?>"
104+
data-confirm-message="<?= sprintf(_("Are you sure you want to delete backup %s?"), $key) ?>"
105+
>
106+
<i class="fas fa-trash icon-red icon-dim"></i>
107+
</a>
108+
</div>
109+
<?php } ?>
110+
<?php } ?>
111+
</div>
110112
</div>
111113
</div>
114+
<!-- END QUICK ACTION TOOLBAR AREA -->
115+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= translate_date($data[$key]["DATE"]) ?></b></div>
116+
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= humanize_usage_size($data[$key]["SIZE"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["SIZE"]) ?></span></div>
117+
<div class="clearfix l-unit__stat-col--left u-text-center"><?= $data[$key]["TYPE"] ?></div>
118+
<div class="clearfix l-unit__stat-col--left u-text-center"><?= humanize_time($data[$key]["RUNTIME"]) ?></div>
112119
</div>
113-
<!-- END QUICK ACTION TOOLBAR AREA -->
114-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= translate_date($data[$key]["DATE"]) ?></b></div>
115-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= humanize_usage_size($data[$key]["SIZE"]) ?></b> <span class="u-text-small"><?= humanize_usage_measure($data[$key]["SIZE"]) ?></span></div>
116-
<div class="clearfix l-unit__stat-col--left u-text-center"><?= $data[$key]["TYPE"] ?></div>
117-
<div class="clearfix l-unit__stat-col--left u-text-center"><?= humanize_time($data[$key]["RUNTIME"]) ?></div>
118120
</div>
119121
</div>
120-
</div>
121-
<?php } ?>
122+
<?php } ?>
123+
</div>
122124
</div>
123125

124126
<footer class="app-footer">

0 commit comments

Comments
 (0)