Skip to content

Commit 21f85e7

Browse files
AlecRustAlecRust
authored
Migrate List Services to .units-table (hestiacp#3668)
1 parent cc5c7a6 commit 21f85e7

File tree

1 file changed

+80
-56
lines changed

1 file changed

+80
-56
lines changed

‎web/templates/pages/list_services.php‎

Lines changed: 80 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,17 @@ class="button button-secondary button-danger data-controls js-confirm-action"
9191
</div>
9292
</div>
9393

94-
<div class="units js-units-container">
95-
96-
<div class="units-header">
97-
<div class="l-unit__col l-unit__col--right">
98-
<div class="clearfix l-unit__stat-col--left super-compact">
99-
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
100-
</div>
101-
102-
<div class="clearfix l-unit__stat-col--left wide-2"><b><?= _("Service") ?></b></div>
103-
<div class="clearfix l-unit__stat-col--left u-text-right compact-2">&nbsp;</div>
104-
<div class="clearfix l-unit__stat-col--left wide-3"><b><?= _("Description") ?></b></div>
105-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Uptime") ?></b></div>
106-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("CPU") ?></b></div>
107-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?= _("Memory") ?></b></div>
94+
<div class="units-table js-units-container">
95+
<div class="units-table-header">
96+
<div class="units-table-cell">
97+
<input type="checkbox" class="js-toggle-all-checkbox" title="<?= _("Select all") ?>">
10898
</div>
99+
<div class="units-table-cell"><?= _("Service") ?></div>
100+
<div class="units-table-cell"></div>
101+
<div class="units-table-cell"><?= _("Description") ?></div>
102+
<div class="units-table-cell u-text-center"><?= _("Uptime") ?></div>
103+
<div class="units-table-cell u-text-center"><?= _("CPU") ?></div>
104+
<div class="units-table-cell u-text-center"><?= _("Memory") ?></div>
109105
</div>
110106

111107
<!-- Begin services status list item loop -->
@@ -116,11 +112,13 @@ class="button button-secondary button-danger data-controls js-confirm-action"
116112
$status = 'active';
117113
$action = 'stop';
118114
$spnd_icon = 'fa-stop';
115+
$spnd_icon_class = 'icon-red';
119116
$state_icon = 'fa-circle-check icon-green';
120117
} else {
121118
$status = 'suspended';
122119
$action = 'start';
123120
$spnd_icon = 'fa-play';
121+
$spnd_icon_class = 'icon-green';
124122
$state_icon = 'fa-circle-minus icon-red';
125123
}
126124
if (in_array($key, $phpfpm)){
@@ -133,50 +131,76 @@ class="button button-secondary button-danger data-controls js-confirm-action"
133131
$cpu = number_format($cpu, 1);
134132
if ($cpu == '0.0') $cpu = 0;
135133
?>
136-
<div class="l-unit <?php if ($status == 'suspended') echo 'l-unit--suspended';?> animate__animated animate__fadeIn js-unit"
137-
data-sort-name="<?=strtolower($key)?>"
138-
data-sort-memory="<?=$data[$key]['MEM']?>"
139-
data-sort-cpu="<?=$cpu;?>"
140-
data-sort-uptime="<?=$data[$key]['RTIME']?>">
141-
<div class="l-unit__col l-unit__col--right">
142-
<div class="clearfix l-unit__stat-col--left super-compact">
134+
<div class="units-table-row <?php if ($status == 'suspended') echo 'disabled'; ?> animate__animated animate__fadeIn js-unit"
135+
data-sort-name="<?= strtolower($key) ?>"
136+
data-sort-memory="<?= $data[$key]['MEM'] ?>"
137+
data-sort-cpu="<?= $cpu; ?>"
138+
data-sort-uptime="<?= $data[$key]['RTIME'] ?>">
139+
<div class="units-table-cell">
140+
<div>
143141
<input id="check<?= $i ?>" class="js-unit-checkbox" type="checkbox" title="<?= _("Select") ?>" name="service[]" value="<?= $key ?>">
142+
<label for="check<?= $i ?>" class="u-hide-desktop"><?= _("Select") ?></label>
144143
</div>
145-
<div class="clearfix l-unit__stat-col--left wide-2">
146-
<i class="fas <?= $state_icon ?> u-mr5"></i>
147-
<b><a href="/edit/server/<? echo $edit_url ?>/" title="<?= _("Edit") ?>: <?= $key ?>"><?= $key ?></a></b>
148-
</div>
149-
<div class="clearfix l-unit__stat-col--left u-text-center compact-2">
150-
<div class="actions-panel clearfix">
151-
<div class="actions-panel__col actions-panel__edit shortcut-enter" data-key-action="href">
152-
<a href="/edit/server/<? echo $edit_url ?>/" title="<?= _("Edit") ?>"><i class="fas fa-pencil icon-orange icon-dim"></i></a>
153-
</div>
154-
<div class="actions-panel__col actions-panel__stop shortcut-s" data-key-action="js">
155-
<a
156-
class="data-controls js-confirm-action"
157-
href="/restart/service/?srv=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
158-
data-confirm-title="<?= _("Restart") ?>"
159-
data-confirm-message="<?= sprintf(_('Are you sure you want to restart %s?'), $key) ?>"
160-
>
161-
<i class="fas fa-arrow-rotate-left icon-highlight icon-dim"></i>
162-
</a>
163-
</div>
164-
<div class="actions-panel__col actions-panel__delete shortcut-delete" data-key-action="js">
165-
<a
166-
class="data-controls js-confirm-action"
167-
href="/<?= $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"
168-
data-confirm-title="<?= _($action) ?>"
169-
data-confirm-message="<?php if ($action == 'stop'){ echo sprintf(_('Are you sure you want to stop service %s?'), $key); } else { echo sprintf(_('Are you sure you want to start service %s?'), $key); }?>"
170-
>
171-
<i class="fas <?= $spnd_icon ?> icon-red icon-dim"></i>
172-
</a>
173-
</div>
174-
</div>
175-
</div>
176-
<div class="clearfix l-unit__stat-col--left wide-3"><?=_($data[$key]['SYSTEM'])?></div>
177-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=humanize_time($data[$key]['RTIME'])?></b></div>
178-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=$cpu?></b></div>
179-
<div class="clearfix l-unit__stat-col--left u-text-center"><b><?=$data[$key]['MEM']?> <?= _("MB") ?></b></div>
144+
</div>
145+
<div class="units-table-cell units-table-heading-cell">
146+
<span class="u-hide-desktop u-text-bold"><?= _("Service") ?>:</span>
147+
<i class="fas <?= $state_icon ?> u-mr5"></i>
148+
<a class="u-text-bold" href="/edit/server/<? echo $edit_url ?>/" title="<?= _("Edit") ?>: <?= $key ?>">
149+
<?= $key ?>
150+
</a>
151+
</div>
152+
<div class="units-table-cell">
153+
<ul class="units-table-row-actions">
154+
<li class="units-table-row-action shortcut-enter" data-key-action="href">
155+
<a
156+
class="units-table-row-action-link"
157+
href="/edit/server/<? echo $edit_url ?>/"
158+
title="<?= _("Edit") ?>"
159+
>
160+
<i class="fas fa-pencil icon-orange"></i>
161+
<span class="u-hide-desktop"><?= _("Edit") ?></span>
162+
</a>
163+
</li>
164+
<li class="units-table-row-action shortcut-s" data-key-action="js">
165+
<a
166+
class="units-table-row-action-link data-controls js-confirm-action"
167+
href="/restart/service/?srv=<?= $key ?>&token=<?= $_SESSION["token"] ?>"
168+
title="<?= _("Restart") ?>"
169+
data-confirm-title="<?= _("Restart") ?>"
170+
data-confirm-message="<?= sprintf(_('Are you sure you want to restart %s?'), $key) ?>"
171+
>
172+
<i class="fas fa-arrow-rotate-left icon-highlight"></i>
173+
<span class="u-hide-desktop"><?= _("Restart") ?></span>
174+
</a>
175+
</li>
176+
<li class="units-table-row-action shortcut-delete" data-key-action="js">
177+
<a
178+
class="units-table-row-action-link data-controls js-confirm-action"
179+
href="/<?= $action ?>/service/?srv=<?=$key?>&token=<?=$_SESSION['token']?>"
180+
title="<?= _($action) ?>"
181+
data-confirm-message="<?php if ($action == 'stop'){ echo sprintf(_('Are you sure you want to stop service %s?'), $key); } else { echo sprintf(_('Are you sure you want to start service %s?'), $key); }?>"
182+
>
183+
<i class="fas <?= $spnd_icon ?> <?= $spnd_icon_class ?>"></i>
184+
<span class="u-hide-desktop"><?= _($action) ?></span>
185+
</a>
186+
</li>
187+
</ul>
188+
</div>
189+
<div class="units-table-cell">
190+
<span class="u-hide-desktop u-text-bold"><?= _("Description") ?>:</span>
191+
<?= _($data[$key]['SYSTEM']) ?>
192+
</div>
193+
<div class="units-table-cell u-text-bold u-text-center-desktop">
194+
<span class="u-hide-desktop"><?= _("Uptime") ?>:</span>
195+
<?= humanize_time($data[$key]['RTIME']) ?>
196+
</div>
197+
<div class="units-table-cell u-text-bold u-text-center-desktop">
198+
<span class="u-hide-desktop"><?= _("CPU") ?>:</span>
199+
<?= $cpu ?>
200+
</div>
201+
<div class="units-table-cell u-text-bold u-text-center-desktop">
202+
<span class="u-hide-desktop"><?= _("Memory") ?>:</span>
203+
<?= $data[$key]['MEM'] ?> <?= _("MB") ?>
180204
</div>
181205
</div>
182206
<?php } ?>

0 commit comments

Comments
 (0)