From 60bded48aa265879cb518f2d6d8821d5301f3179 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 Jan 2020 17:04:03 +0100
Subject: [minilinux] Remove duplicate DL button; hide it for orphaned versions
---
modules-available/minilinux/page.inc.php | 3 +--
modules-available/minilinux/templates/filelist.html | 6 ------
modules-available/minilinux/templates/versionlist.html | 4 +++-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 575177a8..0ad6cefc 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -88,7 +88,7 @@ class Page_MiniLinux extends Page
$eff = Property::get(MiniLinux::PROPERTY_DEFAULT_BOOT_EFFECTIVE);
foreach ($versions as &$version) {
$version['dateline_s'] = Util::prettyTime($version['dateline']);
- $version['orphan'] = ($version['orphan'] > 2);
+ $version['orphan'] = ($version['orphan'] > 0 && !$version['installed']) || ($version['orphan'] > 1);
$version['downloading'] = $version['taskid'] && Taskmanager::isRunning(Taskmanager::status($version['taskid']));
if ($version['installed'] && $version['versionid'] !== $def) {
$version['showsetdefault'] = true;
@@ -155,7 +155,6 @@ class Page_MiniLinux extends Page
array_multisort($sort, SORT_ASC, $data['files']);
if (!$valid) {
$data['verify_button'] = false;
- $data['download_button'] = !$data['dltask'];
if ($ver['installed']) {
MiniLinux::setInstalledState($versionid, false);
}
diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html
index 0d8b9901..b006fd1e 100644
--- a/modules-available/minilinux/templates/filelist.html
+++ b/modules-available/minilinux/templates/filelist.html
@@ -8,12 +8,6 @@
{{lang_verify}}
{{/verify_button}}
- {{#download_button}}
-
- {{/download_button}}
{{#delete_button}}