From f800abeea4f6c68182c51cd4aaea19d7636431c8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 9 Oct 2019 17:31:19 +0200
Subject: [minilinux] Rewrite for multiple version/sources handling

* You can supply multiple sources for updates (URLs)
* Sources can provide multiple branches
* Each branch can supply multiple versions (eg. updates)

TODO: Set global default version
TODO: Supply hook to serversetup-ipxe to add specific boot entries
TODO: UX polish
TODO: phpdoc/polish
---
 .../minilinux/templates/branches.html              |  73 ++++++++++++
 .../minilinux/templates/download.html              |   1 -
 .../minilinux/templates/filelist.html              | 125 +++++++++------------
 .../minilinux/templates/page-minilinux.html        |  26 +----
 modules-available/minilinux/templates/sources.html |  42 +++++++
 .../minilinux/templates/versionlist.html           |  39 +++++++
 6 files changed, 208 insertions(+), 98 deletions(-)
 create mode 100644 modules-available/minilinux/templates/branches.html
 delete mode 100644 modules-available/minilinux/templates/download.html
 create mode 100644 modules-available/minilinux/templates/sources.html
 create mode 100644 modules-available/minilinux/templates/versionlist.html

(limited to 'modules-available/minilinux/templates')

diff --git a/modules-available/minilinux/templates/branches.html b/modules-available/minilinux/templates/branches.html
new file mode 100644
index 00000000..1ba9497c
--- /dev/null
+++ b/modules-available/minilinux/templates/branches.html
@@ -0,0 +1,73 @@
+{{#branches}}
+<div id="ibm-mainframe" class="panel panel-default">
+	<div class="panel-heading">
+		<div class="pull-right">
+			{{sourceid}} {{branchid}}
+		</div>
+		{{title}}
+	</div>
+	<div class="panel-body">
+
+	</div>
+	{{{versionlist}}}
+</div>
+{{/branches}}
+<script>
+	document.addEventListener('DOMContentLoaded', function () {
+		var addHandlers = function(parent) {
+			parent.find('.btn-verify').click(function() {
+				loadDetails($(this).data('version'), { show: "version", verify: 1 });
+			});
+			parent.find('.btn-download').click(function() {
+				loadDetails($(this).data('version'), { show: "download" });
+				$(this).remove();
+			});
+		};
+		var loadDetails = function(version, params) {
+			var c = $('.version-container[data-version="' + version + '"]');
+			c.show();
+			if (c.is(':empty')) {
+				c.html('<span class="glyphicon glyphicon-refresh slx-rotation"></span>');
+			} else {
+				c.addClass('slx-fade');
+				c.find('button, a').addClass('disabled').prop('disabled', true);
+			}
+			var data = { version: version, token: TOKEN };
+			$.extend(data, params);
+			c.load('?do=minilinux', data,
+				function () {
+					c.removeClass('slx-fade');
+					addHandlers(c);
+					c.find('button[data-confirm]').click(slxModalConfirmHandler);
+					tmInit();
+				});
+		};
+		$('.version-link').click(function(e) {
+			e.preventDefault();
+			$(this).removeClass('version-link').off().removeAttr('href');
+			loadDetails($(this).data('version'), { show: "version" });
+		});
+		addHandlers($('#ibm-mainframe'));
+		$('[data-autoclick="true"]').click();
+	});
+	var taskDone = {};
+	function dlTmCb(task) {
+		if (!task.data || !task.data.files)
+			return;
+		for (var i = 0; i < task.data.files.length; ++i) {
+			var f = task.data.files[i];
+			var id = task.id + f.id;
+			if (taskDone[id] === true)
+				continue;
+			var $div = $('#' + f.id);
+			if (f.error) {
+				$div.text(f.error).addClass('text-danger');
+				taskDone[id] = true;
+			} else {
+				var wasDone = (taskDone[id] === 100);
+				tmSetProgress($div, f.progress, wasDone ? 'TASK_FINISHED' : task.statusCode);
+				taskDone[id] = wasDone ? true : f.progress;
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/modules-available/minilinux/templates/download.html b/modules-available/minilinux/templates/download.html
deleted file mode 100644
index 2e32df5a..00000000
--- a/modules-available/minilinux/templates/download.html
+++ /dev/null
@@ -1 +0,0 @@
-<div data-tm-id="{{task}}" data-tm-log="error" data-tm-progress="progress">{{name}}</div>
\ No newline at end of file
diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html
index 234b6c41..2c26edf9 100644
--- a/modules-available/minilinux/templates/filelist.html
+++ b/modules-available/minilinux/templates/filelist.html
@@ -1,74 +1,53 @@
-	{{#systems}}
-	<h1>{{title}}</h1>
-		<div id="download-{{id}}">
-			<div class="input-group pull-right" style="max-width: 400px">
-				<span class="input-group-addon slx-ga">{{lang_desiredVersion}}</span>
-				<select id="versionbox" class="form-control">
-					{{#versions}}
-					{{#selected}}
-					<option value="{{version}}" selected>{{version}}</option>
-					{{/selected}}
-					{{^selected}}
-					<option value="{{version}}">{{version}}</option>
-					{{/selected}}
-					{{/versions}}
-				</select>
+<div class="text-right">
+	<form method="post" action="?do=minilinux">
+		<input type="hidden" name="token" value="{{token}}">
+		<input type="hidden" name="version" value="{{versionid}}">
+		{{#verify_button}}
+		<button type="button" class="btn btn-default btn-xs btn-verify" data-version="{{versionid}}" title="{{lang_verifyToolTip}}">
+			<span class="glyphicon glyphicon-search"></span>
+			{{lang_verify}}
+		</button>
+		{{/verify_button}}
+		{{#download_button}}
+		<button type="button" class="btn btn-xs btn-success btn-download" data-version="{{versionid}}">
+			<span class="glyphicon glyphicon-download"></span>
+			{{lang_download}}
+		</button>
+		{{/download_button}}
+		{{#delete_button}}
+		<button type="submit" name="show" value="delete" class="btn btn-xs btn-danger"
+				  data-confirm="{{lang_confirmDeleteVersion}}">
+			<span class="glyphicon glyphicon-trash"></span>
+			{{lang_delete}}
+		</button>
+		{{/delete_button}}
+	</form>
+</div>
+<div class="clearfix slx-smallspace"></div>
+<table class="slx-table" style="width:100%">
+{{#files}}
+	<tr>
+		<td class="text-nowrap">&nbsp;</td>
+		<td class="text-nowrap">{{name}}</td>
+		<td class="text-nowrap text-right">{{size_s}}</td>
+		<td class="text-nowrap text-right">{{mtime_s}}</td>
+		<td style="width:100%">
+			{{^dltask}}
+			{{state}}
+			{{/dltask}}
+			{{#dltask}}
+			<div id="{{fileid}}">
+				<div class="progress" style="margin-bottom:0">
+					<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"
+						  style="width:0"></div>
+				</div>
 			</div>
-			{{#systemChanged}}
-			<p>
-				{{lang_canUpdate1}} <b>{{title}}</b> {{lang_canUpdate2}}
-			</p>
-			<button {{perms.update.disabled}} class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_updateAll}}<span></span></button>
-			{{/systemChanged}}
-			{{^systemChanged}}
-			<p>{{lang_systemUpdated}}</p>
-			{{/systemChanged}}
-			<hr>
-			<p><b>{{lang_filesInVersion}} {{version}}</b></p>
-			<ul class="list-group">
-				{{#files}}
-				<li class="list-group-item" id="{{uid}}">
-					<div class="row">
-						<div class="col-sm-2">{{name}}</div>
-						<div class="col-xs-2">
-							{{^fileChanged}}<span class="glyphicon glyphicon-ok"></span> <b>{{lang_uptodate}}</b>{{/fileChanged}}
-							{{#fileChanged}}<span class="glyphicon glyphicon-exclamation-sign"></span> <b>{{lang_outdated}}</b>{{/fileChanged}}
-						</div>
-						<div class="col-xs-2">
-							{{#fileChanged}}<button {{perms.update.disabled}} class="btn btn-primary btn-xs update-button" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}</button> {{/fileChanged}}
-							{{^fileChanged}}<button {{perms.update.disabled}} class="btn btn-default btn-xs" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-download-alt"></span> {{lang_redownload}}</button> {{/fileChanged}}
-						</div>
-					</div>
-					{{{download}}}
-				</li>
-				{{/files}}
-			</ul>
-		</div>
-	</div>
-	{{/systems}}
-	{{^systems}}
-	<div class="row well well-sm">{{lang_configurationPackageNotFound}}</div>
-	{{/systems}}
-
-<script type="text/javascript">
-function slxUpdate(uid, id, name)
-{
-	$('#' + uid).html('');
-	$('#' + uid).load('?do=MiniLinux',
-		{ action : "download", token : TOKEN, id : id, name : name, version : $('#versionbox').val() },
-		function(response, status, xhr) {
-			if (status === "error") {
-				var msg = "Fehler beim Abruf: ";
-				$('#' + uid).html(msg + xhr.status + " " + xhr.statusText);
-			} else {
-				setTimeout(tmInit, 100);
-			}
-		});
-}
-function slxUpdateAll(t, uid)
-{
-	$(t).hide(0);
-	$('#' + uid).find('.update-button').click();
-}
-tmInit();
-</script>
+			{{/dltask}}
+		</td>
+	</tr>
+{{/files}}
+</table>
+{{#dltask}}
+<div class="hidden" data-tm-id="{{dltask}}" data-tm-callback="dlTmCb"></div>
+{{/dltask}}
+<div class="slx-space"></div>
\ No newline at end of file
diff --git a/modules-available/minilinux/templates/page-minilinux.html b/modules-available/minilinux/templates/page-minilinux.html
index afccf230..2cbde608 100644
--- a/modules-available/minilinux/templates/page-minilinux.html
+++ b/modules-available/minilinux/templates/page-minilinux.html
@@ -1,25 +1,3 @@
-<div id="systemlist">
-	<div class="panel panel-default">{{lang_listObtained}}</div>
-</div>
+<h1>{{lang_minilinuxHeading}}</h1>
 
-<script type="text/javascript"><!--
-	document.addEventListener('DOMContentLoaded', function() {
-		var $list = $('#systemlist');
-		function loadSystemList(version) {
-			$list.addClass('disabled');
-			$list.find('select, input, button').prop('disabled', true);
-			$list.find('div, p, span').addClass('text-muted');
-			$list.load('{{{listurl}}}', { token: TOKEN, version: version }, function( response, status, xhr ) {
-				if ( status === "error" ) {
-					var msg = "{{lang_errorGetting}}";
-					$list.html( msg + xhr.status + " " + xhr.statusText );
-				}
-				$list.removeClass('disabled');
-				$('#versionbox').change(function() {
-					loadSystemList($('#versionbox').val());
-				});
-			});
-		}
-		loadSystemList(0);
-	});
-// --></script>
\ No newline at end of file
+<p>{{lang_introText}}</p>
\ No newline at end of file
diff --git a/modules-available/minilinux/templates/sources.html b/modules-available/minilinux/templates/sources.html
new file mode 100644
index 00000000..f2e54745
--- /dev/null
+++ b/modules-available/minilinux/templates/sources.html
@@ -0,0 +1,42 @@
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_sources}}
+	</div>
+	<table class="table table-condensed">
+		<thead>
+		<tr>
+			<th>{{lang_id}}</th>
+			<th>{{lang_title}}</th>
+			<th>{{lang_url}}</th>
+			<th>{{lang_lastUpdate}}</th>
+			<th>{{lang_key}}</th>
+		</tr>
+		</thead>
+		<tbody>
+		{{#list}}
+		<tr>
+			<td class="small">{{sourceid}}</td>
+			<td>{{title}}</td>
+			<td class="small">{{url}}</td>
+			<td class="{{update_class}}">{{lastupdate_s}}</td>
+			<td class="text-center">
+				<button type="button" class="btn btn-default btn-xs" data-confirm="#confirm-{{source}}" data-close="{{lang_close}}">
+					<span class="glyphicon glyphicon-eye-open"></span>
+				</button>
+				<pre id="confirm-{{source}}" class="hidden">{{pubkey}}</pre>
+			</td>
+		</tr>
+		{{/list}}
+		</tbody>
+	</table>
+	<div class="panel-body text-right">
+		<form method="post" action="?do=minilinux">
+			<input type="hidden" name="token" value="{{token}}">
+			<button type="submit" name="show" value="updatesources" class="btn btn-default"
+					  onclick="$(this).find('.glyphicon').addClass('slx-rotation')" {{^show_refresh}}disabled{{/show_refresh}}>
+				<span class="glyphicon glyphicon-refresh"></span>
+				{{lang_updateSourcesButton}}
+			</button>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/modules-available/minilinux/templates/versionlist.html b/modules-available/minilinux/templates/versionlist.html
new file mode 100644
index 00000000..1e5c7c96
--- /dev/null
+++ b/modules-available/minilinux/templates/versionlist.html
@@ -0,0 +1,39 @@
+<table class="table table-striped">
+<tr>
+	<th>{{lang_version}}</th>
+	<th>{{lang_releaseDate}}</th>
+	<th>{{lang_title}}</th>
+	<th class="slx-smallcol"></th>
+	<th class="slx-smallcol"></th>
+</tr>
+{{#versions}}
+<tr>
+	<td>
+		<a href="#" class="version-link" data-version="{{versionid}}" {{#downloading}}data-autoclick="true"{{/downloading}}>
+			{{versionid}}
+			<b class="caret"></b>
+		</a>
+	</td>
+	<td>{{dateline_s}}</td>
+	<td>{{title}}</td>
+	<td>
+		{{^installed}}
+		{{^downloading}}
+		<button type="button" class="btn btn-xs btn-success btn-download" data-version="{{versionid}}">
+			<span class="glyphicon glyphicon-download"></span>
+			{{lang_download}}
+		</button>
+		{{/downloading}}
+		{{/installed}}
+	</td>
+	<td>
+		{{#orphan}}
+		{{lang_orphanedVersion}}
+		{{/orphan}}
+	</td>
+</tr>
+<tr>
+	<td colspan="5" class="version-container collapse" data-version="{{versionid}}"></td>
+</tr>
+{{/versions}}
+</table>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522