From 28aa39e5c69cff7dc5f5f997a3089c7293d1286c Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 6 Apr 2016 19:03:48 +0200
Subject: [PATCH] new package listing

---
 public/html.php | 160 +++++++++++++++++++++++-------------------------
 1 file changed, 75 insertions(+), 85 deletions(-)

diff --git a/public/html.php b/public/html.php
index 8ab4470..e93122b 100644
--- a/public/html.php
+++ b/public/html.php
@@ -44,11 +44,11 @@ ob_start($res);
 			.header h1 a:hover {
 				text-decoration: underline;
 			}
-			.header h1 big {
+			.header h1 a {
 				/* normalize browser difference */
 				font-size: 1.3em;
 			}
-			.header h1 big, .footer, .footer a {
+			.header h1 a, .footer, .footer a {
 				color: #fdfdfd;
 				text-shadow: grey 0 0 .1em;
 			}
@@ -63,22 +63,26 @@ ob_start($res);
 			pre.publickey {
 				font-size: .8rem;
 				line-height: 1rem;
-				word-wrap: none;
-			}
-			code {
-				background: #EEE;
-				padding: .1rem;
-				border-radius: 4px;
 			}
 			pre.code {
 				background: #333;
 				color: #62B3E7;
-				padding: 1em;
+				padding: 0 1.5em 1.5em 1em;
 				border-radius: 4px;
 				margin-right: 2em;
+				display: inline-block;
+			}
+			pre.code>code {
+				font-size: .9rem;
 			}
-			pre.code code {
-				background: transparent;
+			.row>h3 {
+				margin-bottom: 0;
+			}
+			@media(max-width: 80em) {
+				.column-8 {
+					float: none;
+					width: auto;
+				}
 			}
 		</style>
 	</head>
@@ -86,7 +90,7 @@ ob_start($res);
 		<div class="header">
 			<header>
 				<h1 class="container">
-					<a href="?"><big>Replicator</big></a><br>
+					<a href="?">Replicator</a><br>
 					<small>Replicating PECL releases as pharext packages since 2015</small>
 				</h1>
 				<a href="https://github.com/m6w6/replicator"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
@@ -94,42 +98,39 @@ ob_start($res);
 		</div>
 		<div class="container">
 
-			<?php if (!empty($package)) : ?>
+			<?php if (!empty($package)) : $versions = package_versions($package); ?>
 
 			<h2><?= htmlspecialchars($package) ?></h2>
 			<table class="table table-full">
 				<thead>
 					<tr>
-						<th class="text-left" colspan="4">Package</th>
+						<th class="text-left" colspan="2">Package</th>
+						<th class="text-left" colspan="<?= count(SIGS) ?>">Signatures</th>
 						<th class="text-left">Date</th>
 						<th class="text-right">Pharext</th>
 					</tr>
 				</thead>
 				<tbody>
 
-					<?php foreach (array_reverse(package_versions($package)) as $version => $phars) : ?>
-
+					<?php foreach (array_reverse($versions) as $version => $phars) : ?>
+						<?php foreach (array_map("array_values", $phars) as $ext => list($phar, $date, $size, $pharext)) : ?>
 					<tr>
-						<td class="text-left">
+						<?php if (empty($ext)) : ?>
+						<td class="text-left" rowspan="<?= count($phars) ?>">
 							<?= htmlspecialchars($package) ?>
 							<?= htmlspecialchars($version) ?>
 						</td>
+						<?php endif ?>
 
-						<?php foreach (array_map("array_values", $phars) as $ext => list($phar, $date, $size, $pharext)) : ?>
 						<td class="text-left">
 							&#10507;&nbsp;<a href="<?= htmlspecialchars($phar) ?>"
-							   download>ext.phar<?= htmlspecialchars($ext) ?></a>&nbsp;<small>(<?= human_size($size) ?>)</small><br>
-
+							   download>phar<?= htmlspecialchars($ext) ?></a>&nbsp;<small>(<?= human_size($size) ?>)</small><br>
+						</td>
 							<?php foreach (SIGS as $typ => $sig) : ?>
-								<small>#&nbsp;<a href="<?= sigof($phar, $sig) ?>" download><?= "$typ.$sig" ?></a></small>
-							<?php endforeach; ?>
+						<td>
+								#&nbsp;<a href="<?= sigof($phar, $sig) ?>" download><?= "$typ.$sig" ?></a>
 						</td>
-						<?php endforeach; ?>
-						<?php for($i = 0; $i < 3-count($phars); ++$i) : ?>
-
-						<td></td>
-						<?php endfor; ?>
-
+							<?php endforeach; ?>
 						<td class="text-left">
 							<?= human_date($date); ?>
 
@@ -138,6 +139,7 @@ ob_start($res);
 							v<?= $pharext ?>
 						</td>
 					</tr>
+						<?php endforeach; ?>
 					<?php endforeach; ?>
 
 				</tbody>
@@ -146,76 +148,64 @@ ob_start($res);
 
 			<h2>Available Packages</h2>
 			<ul class="list-inline">
-			<?php foreach (array_map("htmlspecialchars", $packages) as $index => $package) : ?>
-				<?php $next = strtolower($package{0}); ?>
+			<?php foreach (array_map("htmlspecialchars", $packages) as $index => $pkg) : ?>
+				<?php $next = strtolower($pkg{0}); ?>
 				<?php if (isset($prev) && $next != $prev) : ?>
 
 			</ul>
 			<ul class="list-inline">
 				<?php endif; ?>
 
-				<li><a href="?<?= $package ?>"><?=  $package ?></a></li>
+				<li><a href="?<?= $pkg ?>"><?=  $pkg ?></a></li>
 				<?php $prev = $next; ?>
 			<?php endforeach; ?>
 
 			</ul>
 			<?php endif; ?>
-		</div>
-		<div class="container">
-			<h3>Public Keys</h3>
-			<div class="column-8">
-				<h4>RSA <small><a href="replicator.pub" download>replicator.pub</a></small></h4>
-				<p>Verify with:</p>
-					<pre class="code"><code># openssl dgst \
-	-verify replicator.pub \
-	-signature <?= isset($phar) ? htmlspecialchars(basename($phar)).".sig" : "apfd-1.0.1.ext.phar.sig" ?> \
-	           <?= isset($phar) ? htmlspecialchars(basename($phar)): "apfd-1.0.1.ext.phar" ?></code></pre>
-				<pre class="publickey">
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnzsDXNox5V0V9GLcnXEu
-kxnhFs9+/AMm//1qJAoNwP6sgmYShuyI3NDZzCmT7tOIcpqW0I4P8D1Psrftyqbt
-spedAvyOLCLZXaOuE130aMlvfqEiO+s8ZVZL8aHLE/orLbpOexEs33a1j6shl5C6
-MoojzK3uYccL4XJfj0t2nrC+XMfWE9oQGvyLZv3tNCzH4Oy7knWVVy10EKbKgPft
-izCFR+0mPYw35RN3gAGrug+khnVRMRNpS7B0uZ6E29Bgsrud9l91mVbrL+DaoaSa
-IFGeYuFGe2ZpHUfxf16S0w7ybPrrJJsD6cYOtwXjRZo+4ux6PdKZ+m3hnKWoj9IF
-OwIDAQAB
------END PUBLIC KEY-----</pre>
+			<hr>
+			<div class="row">
+		<?php if (empty($package)) : ?>
+				<h3>Public keys</h3>
+		<?php else : list($phar) = array_values(current(end($versions))); ?>
+				<h3>Download latest version and signatures:</h3>
+				<div class="column-16">
+					<pre class="code fit-code"><code>
+curl -sS \
+     -O https://replicator.pharext.org/<?= htmlspecialchars($phar) ?><?php foreach (SIGS as $sig) : ?> \
+     -O https://replicator.pharext.org/<?= htmlspecialchars(sigof($phar, $sig)) ?><?php endforeach; ?></code></pre>
+				</div>
 			</div>
-			<div class="column-8">
-				<h4>OpenPGP <small><a href="4093AEF6.pub" download>4093AEF6.pub</a></small></h4>
-				<p>Verify with:</p>
-					<pre class="code"><code># gpg --import 4093AEF6.pub
-
-# gpg --verify <?= isset($phar) ? htmlspecialchars(basename($phar)).".asc" : "apfd-1.0.1.ext.phar.asc" ?> \
-               <?= isset($phar) ? htmlspecialchars(basename($phar)): "apfd-1.0.1.ext.phar" ?></code></pre>
-				</p>
-				<pre class="publickey">
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFcBXgsBCACfOwNc2jHlXRX0YtydcS6TGeEWz378Ayb//WokCg3A/qyCZhKG
-7Ijc0NnMKZPu04hympbQjg/wPU+yt+3Kpu2yl50C/I4sItldo64TXfRoyW9+oSI7
-6zxlVkvxocsT+istuk57ESzfdrWPqyGXkLoyiiPMre5hxwvhcl+PS3aesL5cx9YT
-2hAa/Itm/e00LMfg7LuSdZVXLXQQpsqA9+2LMIVH7SY9jDflE3eAAau6D6SGdVEx
-E2lLsHS5noTb0GCyu532X3WZVusv4NqhpJogUZ5i4UZ7ZmkdR/F/XpLTDvJs+usk
-mwPpxg63BeNFmj7i7Ho90pn6beGcpaiP0gU7ABEBAAG0K1BIQVJleHQgUmVwbGlj
-YXRvciA8cmVwbGljYXRvckBwaGFyZXh0Lm9yZz6JATcEEwEKACEFAlcBXgsCGwMF
-CwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQZJhrlUCTrvbYGAgAi120YHruidld
-uPTUS05/ZLoSn3orKkmkskOsjBrUqJvQHx1s8mqJpNJdbIrgPIxQPHauiE6Fj72q
-uv6TsVRxM+7VjiCHTbHmDheP5Zcyac7Nd/e62DsCYP7LAAx7MHbQvki6XQg4EsQZ
-cXMKRYuuizJxNGVUeZpusY5WXmc5PRIigsI4eh/2l96IK/eqTDSZiDUwv9ze+HMf
-JxOunBZVebYUQ3RYEWx1NseInxbiAnEdGM7phZH43jkohxPLROr3nWBmrJbBqULn
-m6M5fRucJoldU8VIzMdy0xxu+3PuX8aug96njK448r53wjb7yRf6WLonwjlFqTWq
-0tZzZR3Nd4kBHAQTAQoABgUCVwFehAAKCRBIDj4UsKTHx8iNB/0dl+8T8zp0Pksc
-jGo8WBA8sfdnMqaE/NkUCbMhT5wkAk+4JRlv/DUfokB6cF87yQCC/IjVAapPT2xS
-h31QubsjfnfrqSiF4ls8JCTLp/xkafx+tFsJKJOEgCsoeFCOeZBfvhhLPwLyhHLZ
-ZIsHmYX8YEeku+gsbQIVnWC06WJbJ5HuKByr8VEpgGBig4eRRMcDTJShgDQhn476
-VLKah3xplnU6bgOzsLn1Ssv095DOouh7tZabkS4jtvDAQK/1g2VQ/d0sOrbKAugQ
-IHEcyAQedGERU0JqXrXW9WdOqs1AZTl/YGWe94kZqJ1XSWibTSq1TUNCtTcrW558
-yImBVgJx
-=nFzc
------END PGP PUBLIC KEY BLOCK-----</pre>
+			<div class="row">
+				<h3>Verify with a public key:</h3>
+		<?php endif; ?>
+
+				<div class="column-8">
+					<h4>RSA <small><a href="replicator.pub" download>replicator.pub</a></small></h4>
+					<?php if (!empty($phar)) : ?>
+					<pre class="code"><code>
+curl -sSO https://replicator.pharext.org/replicator.pub
+
+openssl dgst \
+	-verify replicator.pub \
+	-signature <?= htmlspecialchars(basename($phar)).".sig" ?> \
+	           <?= htmlspecialchars(basename($phar)) ?></code></pre>
+					<?php endif; ?>
+					<pre class="publickey"><?php readfile("./replicator.pub") ?></pre>
+				</div>
+				<div class="column-8">
+					<h4>OpenPGP <small><a href="4093AEF6.pub" download>4093AEF6.pub</a></small></h4>
+					<?php if (!empty($phar)) : ?>
+					<pre class="code"><code>
+curl -sSO https://replicator.pharext.org/4093AEF6.pub
+
+gpg --import 4093AEF6.pub
+
+gpg --verify <?= htmlspecialchars(basename($phar)).".asc" ?> \
+             <?= htmlspecialchars(basename($phar)) ?></code></pre>
+					<?php endif; ?>
+				<pre class="publickey"><?php readfile("./4093AEF6.pub") ?></pre>
+				</div>
 			</div>
-			<div style="clear:both"></div>
 		</div>
 		<div class="footer">
 			<footer>
-- 
2.30.2