Skip to content

Commit 044d7a3

Browse files
committed
patch
1 parent 999fac5 commit 044d7a3

13 files changed

Lines changed: 70 additions & 62 deletions

File tree

www/controllers/Task/Execution.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ public function end() : void
364364
$this->layoutContainerReloadController->reload('repos/kpi');
365365
$this->layoutContainerReloadController->reload('repos/list');
366366
$this->layoutContainerReloadController->reload('tasks/tasks');
367+
$this->layoutContainerReloadController->reload('tasks/log');
367368
$this->layoutContainerReloadController->reload('snapshot/kpi');
368369
$this->layoutContainerReloadController->reload('snapshot/list');
369370
} catch (Exception $e) {

www/controllers/Task/Target.php

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,24 @@ public static function describe(array $target): string
128128
$filters = [];
129129

130130
if (isset($target['group']) and $target['group'] !== '') {
131-
$filters[] = 'group <b>' . self::groupName($target['group']) . '</b>';
131+
/**
132+
* Keep <b> markup in the template, but escape the group name itself
133+
* because it comes from data and may contain HTML special characters
134+
*/
135+
$filters[] = 'group <b>' . htmlspecialchars(self::groupName(intval($target['group'])), ENT_QUOTES) . '</b>';
132136
}
133137

134138
if (!empty($target['tags'])) {
135-
$filters[] = 'tag' . (count($target['tags']) > 1 ? 's' : '') . ' <b>#' . implode(' #', $target['tags']) . '</b>';
139+
/**
140+
* Escape each tag value before injecting it in the HTML-formatted
141+
* description. This preserves the surrounding <b> tags while ensuring
142+
* tag content is displayed as text.
143+
*/
144+
$escapedTags = array_map(function ($tag) {
145+
return htmlspecialchars($tag, ENT_QUOTES);
146+
}, $target['tags']);
147+
148+
$filters[] = 'tag' . (count($escapedTags) > 1 ? 's' : '') . ' <b>#' . implode(' #', $escapedTags) . '</b>';
136149
}
137150

138151
if (!empty($target['package-type'])) {
@@ -152,7 +165,7 @@ public static function describe(array $target): string
152165
*/
153166
private static function groupName(int $groupId): string
154167
{
155-
if ($groupId === '0') {
168+
if ($groupId === 0) {
156169
return 'Default';
157170
}
158171

www/public/resources/js/classes/Repo.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class Repo {
66
{
77
// If input is empty, then show all repos and quit
88
if (!$("#repo-search-input").val()) {
9-
$('.repos-list-group, .repo-item-wrapper, .repo-item, .group-repo-name').show();
9+
$('.repos-list-group, .repos-row, .repo-item-wrapper, .repo-item, .group-repo-name').show();
1010
return;
1111
}
1212

@@ -20,7 +20,7 @@ class Repo {
2020

2121
// First, hide all groups and repo items (hide the wrapper too, otherwise
2222
// it stays in the grid flow as an empty cell and shifts the visible cards)
23-
$('.repos-list-group, .repo-item-wrapper, .repo-item, .group-repo-name').hide();
23+
$('.repos-list-group, .repos-row, .repo-item-wrapper, .repo-item, .group-repo-name').hide();
2424

2525
// Search through all repo items using their data attributes and visible text
2626
$('.repo-item').each(function () {
@@ -62,6 +62,7 @@ class Repo {
6262
if (allMatch) {
6363
$(this).show();
6464
$(this).closest('.repo-item-wrapper').show();
65+
$(this).closest('.repos-row').show();
6566
$(this).closest('.repos-row').prev('.group-repo-name').show();
6667
// Reveal ALL ancestor groups (they can be nested), not just the closest one
6768
$(this).parents('.repos-list-group').show();

www/public/resources/js/classes/ScheduledTask.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ScheduledTask
6060
*/
6161
printTarget(description)
6262
{
63-
$('#scheduled-task-target-count').text(description);
63+
$('#scheduled-task-target-count').html(description);
6464
}
6565

6666
/**

www/public/resources/styles/common.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ h6 {
118118
padding: 18px;
119119
margin-top: 15px;
120120
margin-bottom: 15px;
121-
border: 1px dashed #5473e8;
121+
/* border: 1px dashed #5473e8; */
122+
border: 1px dashed #24405c;
122123
border-radius: 20px;
123124
background-color: #13263a;
124125
}

www/public/resources/styles/components/layout.css

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ body {
44
min-height: 100vh;
55
margin: 0px;
66
padding: 0px;
7-
background-color: #0e1e2f;
8-
background-image:
9-
radial-gradient(circle at top left, rgba(84, 115, 232, 0.08), transparent 28%),
10-
radial-gradient(circle at top right, rgba(124, 92, 255, 0.09), transparent 30%),
11-
radial-gradient(circle at bottom right, rgba(124, 92, 255, 0.06), transparent 34%),
12-
linear-gradient(180deg, #091521 0%, #0e1e2f 46%, #13253a 100%);
13-
background-attachment: fixed;
7+
background-color: #0e1e30;
148
color: white;
159
overflow-y: auto;
1610
font-family: 'Roboto', sans-serif !important;

www/public/resources/styles/tasks.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
column-gap: 10px;
192192
padding: 16px 20px;
193193
border-radius: 10px;
194+
min-height: 40px;
194195
}
195196

196197
.task-step-content {

www/views/includes/containers/header/menu.inc.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div id="menu-fixed">
1313
<div class="flex flex-direction-column row-gap-30">
1414
<!-- Repositories tab -->
15-
<div class="menu-item <?= in_array($currentSection, ['', 'snapshot', 'stats']) ? 'menu-item-active' : '' ?>">
15+
<div class="menu-item <?= in_array($currentSection, ['', 'repository', 'snapshot', 'stats']) ? 'menu-item-active' : '' ?>">
1616
<a href="/">
1717
<img src="/assets/icons/package.svg" class="icon" title="Repositories" />
1818
</a>
@@ -97,17 +97,17 @@
9797
<?php
9898
endif ?>
9999

100-
<div class="menu-sub-item relative">
101-
<img src="/assets/icons/alarm.svg" class="icon-lowopacity get-panel-btn" panel="general/notification" title="Show notifications" />
100+
<div class="menu-sub-item get-panel-btn pointer relative" panel="general/notification" title="Show notifications">
101+
<img src="/assets/icons/alarm.svg" class="icon-lowopacity" />
102102
<?php
103103
if (NOTIFICATION != 0) : ?>
104104
<span id="notification-count"><?= NOTIFICATION ?></span>
105105
<?php
106106
endif ?>
107107
</div>
108108

109-
<div class="menu-sub-item get-panel-btn" panel="general/userspace">
110-
<img src="/assets/icons/user.svg" class="icon" title="Userspace" />
109+
<div class="menu-sub-item get-panel-btn pointer" panel="general/userspace" title="Userspace">
110+
<img src="/assets/icons/user.svg" class="icon" />
111111
</div>
112112
</div>
113113
</div>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
<?php
6060
if ($totalHosts == 0) : ?>
6161
<div class="empty-state">
62-
<p class="empty-state-title">No host registered yet.</p>
62+
<p class="empty-state-title">No host registered yet!</p>
6363
<p class="note">Install <b>linupdate</b> on your hosts to register them to Repomanager. This page will display dashboards and informations about the hosts and their packages (installed, available, updated...).</p>
6464
<div class="empty-state-actions">
65-
<a href="https://github.com/lbr38/linupdate" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-medium-blue">Linupdate GitHub</button></a>
66-
<a href="https://github.com/lbr38/linupdate/wiki/Module:-reposerver#quick-setup-example" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-large-tr">Linupdate quick setup</button></a>
65+
<a href="https://github.com/lbr38/linupdate" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-fit-tr">Linupdate GitHub</button></a>
66+
<a href="https://github.com/lbr38/linupdate/wiki/Module:-reposerver#quick-setup-example" target="_blank" rel="noopener noreferrer"><button type="button" class="btn-fit-tr">Linupdate quick setup</button></a>
6767
</div>
6868
</div>
6969
<?php

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<div class="flex flex-wrap align-item-center column-gap-10 row-gap-5 justify-space-between">
2828
<p class="mediumopacity-cst">Used storage</p>
29-
<p class="mediumopacity-cst margin-top-5"><?= $diskUsedSpaceHuman ?> / <?= $diskFreeSpaceHuman ?> free</p>
29+
<p class="mediumopacity-cst margin-top-5"><?= $diskUsedSpaceHuman ?> used / <?= $diskFreeSpaceHuman ?> free</p>
3030
</div>
3131
</div>
3232
</div>

0 commit comments

Comments
 (0)