Skip to content

Commit d9ae47b

Browse files
lbr38lbr38
committed
patch
1 parent ba7cc46 commit d9ae47b

9 files changed

Lines changed: 45 additions & 20 deletions

File tree

‎www/controllers/Layout/Container/vars/repos/kpi.vars.inc.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
$diskUsedSpacePercent = round(($diskUsedSpace / $diskTotalSpace) * 100);
1717
$diskFreeSpacePercent = round(($diskFreeSpace / $diskTotalSpace) * 100);
1818

19+
if ($diskUsedSpacePercent <= 50) {
20+
$diskUsedSpaceClass = 'storage-meter-accent-green';
21+
} elseif ($diskUsedSpacePercent <= 80) {
22+
$diskUsedSpaceClass = 'storage-meter-accent-yellow';
23+
} else {
24+
$diskUsedSpaceClass = 'storage-meter-accent-red';
25+
}
26+
1927
// Get last and next scheduled tasks
2028
$lastScheduledTask = $taskController->getLastScheduledTask();
2129
$nextScheduledTasks = $taskController->getNextScheduledTask();

‎www/controllers/Task/Target.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static function describe(array $target): string
132132
* Keep <b> markup in the template, but escape the group name itself
133133
* because it comes from data and may contain HTML special characters
134134
*/
135-
$filters[] = 'group <b>' . htmlspecialchars(self::groupName(intval($target['group'])), ENT_QUOTES) . '</b>';
135+
$filters[] = 'from group <b>' . htmlspecialchars(self::groupName(intval($target['group'])), ENT_QUOTES) . '</b>';
136136
}
137137

138138
if (!empty($target['tags'])) {
@@ -145,18 +145,18 @@ public static function describe(array $target): string
145145
return htmlspecialchars($tag, ENT_QUOTES);
146146
}, $target['tags']);
147147

148-
$filters[] = 'tag' . (count($escapedTags) > 1 ? 's' : '') . ' <b>#' . implode(' #', $escapedTags) . '</b>';
148+
$filters[] = 'with tag' . (count($escapedTags) > 1 ? 's' : '') . ' <b>#' . implode(' #', $escapedTags) . '</b>';
149149
}
150150

151151
if (!empty($target['package-type'])) {
152-
$filters[] = 'package type ' . $target['package-type'];
152+
$filters[] = 'with package type <b>' . $target['package-type'] . '</b>';
153153
}
154154

155155
if (empty($filters)) {
156156
return 'All repositories (latest snapshots)';
157157
}
158158

159-
return 'All repositories with ' . implode(' and ', $filters) . ' (latest snapshots)';
159+
return 'All repositories ' . implode(' and ', $filters) . ' (latest snapshots)';
160160
}
161161

162162
/**

‎www/public/resources/styles/common.css‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,12 @@ pre.codeblock {
218218
.wordbreakall{word-break:break-all}
219219
.overflowx-auto{overflow-x:auto}
220220
.overflowy-hidden{overflow-y:hidden}
221+
.text-ellipsis {
222+
white-space: nowrap;
223+
overflow: hidden;
224+
text-overflow: ellipsis;
225+
display: block;
226+
}
221227
.flex{display:flex!important;}
222228
.flex-div-15 { flex: 0 0 14%; }.flex-div-20 { flex: 0 0 19%; }.flex-div-25 { flex: 0 0 24%; }.flex-div-30 { flex: 0 0 29%; }
223229
.flex-div-33 { flex: 0 0 32%; }.flex-div-40 { flex: 0 0 39%; }.flex-div-50 { flex: 0 0 48.5%; }.flex-div-60 { flex: 0 0 59%; }
@@ -281,7 +287,7 @@ pre.codeblock {
281287
.margin-top-0 {margin-top: 0px !important}.margin-top-5 {margin-top: 5px !important}.margin-top-8{margin-top:8px!important}.margin-top-10 {margin-top: 10px !important}.margin-top-15 {margin-top: 15px !important}.margin-top-20 {margin-top: 20px !important}.margin-top-30 {margin-top: 30px !important}.margin-top-40 {margin-top: 40px !important}.margin-top-50{margin-top:50px !important}
282288
.margin-bottom-0 {margin-bottom: 0px !important}.margin-bottom-5 {margin-bottom: 5px !important}.margin-bottom-8{margin-bottom:8px!important}.margin-bottom-10 {margin-bottom: 10px !important}.margin-bottom-15 {margin-bottom: 15px !important}.margin-bottom-20 {margin-bottom: 20px !important}.margin-bottom-30 {margin-bottom: 30px !important}.margin-bottom-40 {margin-bottom: 40px !important} .margin-bottom-50{margin-bottom:50px!important}
283289
.min-height-100{min-height:100px!important}.min-height-120{min-height:120px!important}.min-height-150{min-height:150px!important}.min-height-200{min-height:200px!important}.min-height-300{min-height:300px!important}.min-height-400{min-height:400px!important}.min-height-500{min-height:500px!important}.min-height-600{min-height:600px!important}.min-height-700{min-height:700px!important}.min-height-800{min-height:800px!important}.min-height-900{min-height:900px!important}.min-height-1000{min-height:1000px!important}
284-
.min-width-100 {min-width: 100px}.min-width-150{min-width: 150px}.min-width-200 {min-width: 200px}.min-width-300 {min-width: 300px}.min-width-400 {min-width: 400px}.min-width-500 {min-width: 500px}.min-width-600 {min-width: 600px}.min-width-700 {min-width: 700px}.min-width-800 {min-width: 800px}.min-width-900 {min-width: 900px}.min-width-1000 {min-width: 1000px}
290+
.min-width-0{min-width:0}.min-width-100 {min-width: 100px}.min-width-150{min-width: 150px}.min-width-200 {min-width: 200px}.min-width-300 {min-width: 300px}.min-width-400 {min-width: 400px}.min-width-500 {min-width: 500px}.min-width-600 {min-width: 600px}.min-width-700 {min-width: 700px}.min-width-800 {min-width: 800px}.min-width-900 {min-width: 900px}.min-width-1000 {min-width: 1000px}
285291
.min-height-50vh{min-height:50vh}.min-height-90vh{min-height:90vh}.min-height-100vh{min-height:100vh}
286292
.min-width-100vw{min-width:100vw}
287293
.width-50{width:50%}.width-100{width:100%}

‎www/public/resources/styles/components/card.css‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
max-width: 100vw;
5555
}
5656

57-
.storage-meter {
57+
[class^="storage-meter"] {
5858
width: 100%;
5959
height: 9px;
6060
overflow: hidden;
@@ -63,14 +63,23 @@
6363
border-radius: 20px;
6464
}
6565

66-
.storage-meter span {
66+
[class^="storage-meter"] span {
6767
display: block;
6868
height: 100%;
6969
min-width: 3px;
70-
background-color: #15bf7f;
7170
border-radius: 20px;
7271
}
7372

73+
.storage-meter-accent-green span {
74+
background-color: #15bf7f;
75+
}
76+
.storage-meter-accent-yellow span {
77+
background-color: #ffb536;
78+
}
79+
.storage-meter-accent-red span {
80+
background-color: #F32F63;
81+
}
82+
7483
.kpi-container > .kpi-card,
7584
.kpi-container > .storage-card {
7685
flex: 1 1 calc(50% - 10px);

‎www/public/resources/styles/components/icon.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
}
3232
.icon-copy {
3333
height: 13px;
34+
flex-shrink: 0;
3435
}
3536
.icon-copy-top-right {
3637
position: absolute;

‎www/public/resources/styles/main.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ article {
206206
padding-bottom: 6px !important;
207207
-webkit-box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
208208
box-shadow: rgb(0 0 0) 0px 10px 13px -12px, rgb(0 0 0 / 15%) 0px 0px 10px 2px;
209-
210209
white-space: nowrap;
211210
overflow: hidden;
212211
text-overflow: ellipsis;

‎www/views/includes/containers/hosts/list.inc.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,12 @@
262262
<?php
263263
if ($compactView) : ?>
264264
<div class="grid hosts-compact-view">
265-
<div class="flex align-item-center column-gap-10">
265+
<div class="flex align-item-center column-gap-10 min-width-0">
266266
<?= Icon::os($os); ?>
267267

268-
<div>
269-
<p title="Hostname" class="copy">
270-
<a href="/host/<?= $id ?>" class="wordbreakall" target="_blank" rel="noopener noreferrer">
268+
<div class="min-width-0">
269+
<p title="<?= $hostname ?>" class="copy flex align-item-center min-width-0">
270+
<a href="/host/<?= $id ?>" class="text-ellipsis min-width-0" target="_blank" rel="noopener noreferrer">
271271
<b><?= $hostname ?></b>
272272
</a>
273273
</p>
@@ -303,12 +303,12 @@
303303

304304
<div class="flex align-item-center column-gap-8 row-gap-5 justify-end">
305305
<?php
306-
if (!$compliance['compliant']) {
307-
echo '<img src="/assets/icons/' . $compliantIcon . '" class="icon-np" title="' . $compliantTitle . '" />';
308-
}
309-
310306
if ($rebootRequired == 'true') {
311307
echo '<img src="/assets/icons/warning.svg" class="icon-np" title="Reboot required" />';
308+
}
309+
310+
if (!$compliance['compliant']) {
311+
echo '<img src="/assets/icons/' . $compliantIcon . '" class="icon-np" title="' . $compliantTitle . '" />';
312312
} ?>
313313
</div>
314314
</div>

‎www/views/includes/containers/repos/kpi.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div class="flex flex-wrap-mobile align-item-center column-gap-30 justify-space-between">
2020
<p class="kpi-value"><?= $diskUsedSpacePercent ?>%</p>
2121

22-
<div class="storage-meter" title="<?= $diskUsedSpacePercent ?>% used storage">
22+
<div class="<?= $diskUsedSpaceClass ?>" title="<?= $diskUsedSpacePercent ?>% used storage">
2323
<span style="width: <?= $diskUsedSpacePercent ?>%"></span>
2424
</div>
2525
</div>

‎www/views/includes/containers/repos/repo.inc.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@
109109
$repoRelativePath = 'deb/' . $repo['Name'] . '/' . $repo['Dist'] . '/' . $repo['Section'] . '/' . $snapshot['Date'];
110110
}
111111

112+
$date = DateTime::createFromFormat('Y-m-d', $snapshot['Date'])->format('d-m-Y');
113+
112114
// Check if a task is running on the snapshot
113115
$taskRunning = $repoSnapshotController->taskRunning($snapshot['Id']); ?>
114116

115-
<div class="snap-container grid-rfr-1-2 pointer" cid="<?= $repo['repoId'] . $snapshot['Id'] ?>" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" repo-type="<?= $repo['Type'] ?>" group-id="<?= $groupId ?>" title="Select and execute an action.">
117+
<div class="snap-container grid-rfr-1-2 pointer" cid="<?= $repo['repoId'] . $snapshot['Id'] ?>" repo-id="<?= $repo['repoId'] ?>" snap-id="<?= $snapshot['Id'] ?>" repo-type="<?= $repo['Type'] ?>" group-id="<?= $groupId ?>" title="Click to select">
116118
<div class="flex align-item-center column-gap-20">
117119
<?php
118120
if ($taskRunning) : ?>
@@ -123,7 +125,7 @@
123125
<?php
124126
endif ?>
125127

126-
<div class="flex align-item-center column-gap-10" title="Browse snapshot content">
128+
<div class="flex align-item-center column-gap-10" title="Snapshot created at <?= $date . ' ' . $snapshot['Time'] ?>. Click to browse content">
127129
<img src="/assets/icons/calendar.svg" class="snap-icon icon-np lowopacity-cst" />
128130
<a href="/snapshot/<?= $snapshot['Id'] ?>"><span class="snap-date lowopacity"><?= DateTime::createFromFormat('Y-m-d', $snapshot['Date'])->format('d-m-Y') ?></span></a>
129131
</div>

0 commit comments

Comments
 (0)