Skip to content

alpha-09 (bis) #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Teyir merged 2 commits into from
Aug 6, 2025
Merged

alpha-09 (bis) #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33fa79
[FIX] Update package views
Zomblard Aug 6, 2025
82df633
[FIX] Update CMS notes
Zomblard Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions App/Package/Core/Views/Package/package.admin.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}


function renderCard($name, $image, $description, $author = null, $version = null, $id = null, $notVerified = false, $updateBadge = false, $downloads = null, $versionCMW = null, $releaseDate = null) {
function renderCard($name, $image, $description, $author = null, $versionTarget = null, $version = null, $id = null, $notVerified = false, $updateBadge = false, $downloads = null, $versionCMW = null, $releaseDate = null) {
$uniqueId = $id ?? $name;
?>
<div class="card relative h-full" style="overflow: hidden;">
Expand All @@ -37,12 +37,19 @@ function renderCard($name, $image, $description, $author = null, $version = null
<div class="flex justify-between">
<h6><?= $name ?></h6>
<div>
<button data-modal-toggle="delete-<?= $uniqueId ?>" class="btn-danger-sm" type="button">
<?= LangManager::translate('core.Package.delete') ?>
</button>
<button data-modal-toggle="modal-<?= $uniqueId ?>" class="btn-primary-sm" type="button">
<?= LangManager::translate('core.Package.details') ?>
</button>
<?php if ($updateBadge): ?>
<a class="btn-warning" type="button"
href="update/<?= $id ?>/<?= $version ?>/<?= $name ?>">
<?= LangManager::translate('core.Package.update') ?>
</a>
<?php else: ?>
<button data-modal-toggle="delete-<?= $uniqueId ?>" class="btn-danger-sm" type="button">
<?= LangManager::translate('core.Package.delete') ?>
</button>
<button data-modal-toggle="modal-<?= $uniqueId ?>" class="btn-primary-sm" type="button">
<?= LangManager::translate('core.Package.details') ?>
</button>
<?php endif; ?>
</div>
</div>
<div>
Expand Down Expand Up @@ -72,6 +79,13 @@ function renderCard($name, $image, $description, $author = null, $version = null
</div>
<?php endif; ?>

<?php if ($updateBadge): ?>
<div class="alert-warning text-center">
<?= LangManager::translate('core.theme.manage.theme_need_update',
['version' => $version, 'target' => $versionTarget]) ?>
</div>
<?php endif; ?>

<?php if ($downloads !== null && $versionCMW): ?>
<hr>
<div class="flex justify-between">
Expand Down Expand Up @@ -162,6 +176,7 @@ function renderModalDelete($id, $name) {
$pkg['icon'],
mb_strimwidth($pkg['description_short'], 0, 280, '...'),
$pkg['author_pseudo'],
$pkg['version_name'],
$local->version(),
$pkg['id'],
false,
Expand Down Expand Up @@ -193,6 +208,7 @@ function renderModalDelete($id, $name) {
$pkg['icon'],
mb_strimwidth($pkg['description_short'], 0, 280, '...'),
$pkg['author_pseudo'],
$pkg['version_name'],
$local->version(),
$pkg['id'],
false,
Expand Down
2 changes: 1 addition & 1 deletion App/Package/Core/Views/Update/updates.admin.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class="text-success fa-solid fa-heart-pulse fa-beat-fade"></i>
<hr>
<h6>À noter sur cette mise à jour :</h6>
<div class="alert-warning">
<?= $latestVersion['notes'] ?>
<?= html_entity_decode($latestVersion['notes']) ?>
</div>
<?php endif; ?>
<hr>
Expand Down
Loading