From 1e32a97c7de3b05628c8a9802baf241de11847dd Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Thu, 16 Feb 2023 18:37:20 -0600
Subject: [PATCH] Some tweaks to collections

---
 config/apache/standardebooks.org.conf  |  1 -
 config/apache/standardebooks.test.conf |  1 -
 lib/Library.php                        |  1 +
 templates/CollectionTable.php          | 14 --------------
 www/collections/index.php              | 16 ++++++++++------
 5 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 templates/CollectionTable.php

diff --git a/config/apache/standardebooks.org.conf b/config/apache/standardebooks.org.conf
index 09601469..25f2d7dd 100644
--- a/config/apache/standardebooks.org.conf
+++ b/config/apache/standardebooks.org.conf
@@ -251,7 +251,6 @@ Define webroot /standardebooks.org/web
 	RewriteRule				^/ebooks/([^\./]+?)/downloads$			/bulk-downloads/get.php?author=$1 [QSA]
 	RewriteRule				^/ebooks/([^\./]+?)/feeds$			/feeds/get.php?author=$1 [QSA]
 	RewriteRule				^/subjects/([^\./]+?)$				/ebooks/index.php?tags[]=$1 [QSA]
-	RewriteRule				^/collections$			/collections/index.php [L]
 	RewriteRule				^/collections/([^\./]+?)$			/ebooks/index.php?collection=$1 [QSA]
 	RewriteRule				^/collections/([^/]+?)/downloads$		/bulk-downloads/get.php?collection=$1
 	RewriteRule				^/collections/([^/]+?)/feeds$			/feeds/get.php?collection=$1
diff --git a/config/apache/standardebooks.test.conf b/config/apache/standardebooks.test.conf
index 5f84ce68..12e8ffc5 100644
--- a/config/apache/standardebooks.test.conf
+++ b/config/apache/standardebooks.test.conf
@@ -233,7 +233,6 @@ Define webroot /standardebooks.org/web
 	RewriteRule				^/ebooks/([^\./]+?)/downloads$			/bulk-downloads/get.php?author=$1 [QSA]
 	RewriteRule				^/ebooks/([^\./]+?)/feeds$			/feeds/get.php?author=$1 [QSA]
 	RewriteRule				^/subjects/([^\./]+?)$				/ebooks/index.php?tags[]=$1 [QSA]
-	RewriteRule				^/collections$			/collections/index.php [L]
 	RewriteRule				^/collections/([^\./]+?)$			/ebooks/index.php?collection=$1 [QSA]
 	RewriteRule				^/collections/([^/]+?)/downloads$		/bulk-downloads/get.php?collection=$1
 	RewriteRule				^/collections/([^/]+?)/feeds$			/feeds/get.php?collection=$1
diff --git a/lib/Library.php b/lib/Library.php
index b1c89f29..60b1587a 100644
--- a/lib/Library.php
+++ b/lib/Library.php
@@ -451,6 +451,7 @@ class Library{
 		if($collator === null){
 			throw new Exceptions\SeException('Couldn\'t create collator object when rebuilding cache.');
 		}
+
 		$ebooks = [];
 		$ebooksByCollection = [];
 		$ebooksByTag = [];
diff --git a/templates/CollectionTable.php b/templates/CollectionTable.php
deleted file mode 100644
index 08b2f7c6..00000000
--- a/templates/CollectionTable.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="download-list">
-	<thead>
-		<tr class="mid-header">
-			<th scope="col">Collection</th>
-		</tr>
-	</thead>
-	<tbody>
-		<? foreach($collections as $collection){ ?>
-		<tr>
-			<td class="row-header"><a href="<?= $collection->Url ?>"><?= Formatter::ToPlainText($collection->Name) ?></a></td>
-		</tr>
-		<? } ?>
-	</tbody>
-</table>
diff --git a/www/collections/index.php b/www/collections/index.php
index 6eb72b76..b5874157 100644
--- a/www/collections/index.php
+++ b/www/collections/index.php
@@ -1,20 +1,24 @@
 <?
 require_once('Core.php');
 
-use function Safe\apcu_fetch;
-
-$collection = Library::GetEbookCollections();
+$collections = Library::GetEbookCollections();
 
 ?><?= Template::Header(['title' => 'Ebook Collections', 'highlight' => '', 'description' => 'Browse collections of Standard Ebooks.']) ?>
 <main>
 	<section class="narrow has-hero">
 		<h1>Ebook Collections</h1>
-		<picture data-caption="Still Life with Books. Jan Davidsz. de Heem, 1625">
+		<picture data-caption="Still Life with Books and a Violin. Jan Davidszoon de Heem, 1625">
 			<source srcset="/images/still-life-with-books@2x.avif 2x, /images/still-life-with-books.avif 1x" type="image/avif"/>
 			<source srcset="/images/still-life-with-books@2x.jpg 2x, /images/still-life-with-books.jpg 1x" type="image/jpg"/>
-			<img src="/images/still-life-with-books@2x.jpg" alt="A gentleman in regency-era dress buys books from a bookseller."/>
+			<img src="/images/still-life-with-books@2x.jpg" alt="A pile of moldering books lying on a table."/>
 		</picture>
-		<?= Template::CollectionTable(['collections' => $collection]); ?>
+		<ul>
+			<? foreach($collections as $collection){ ?>
+			<li>
+				<p><a href="<?= $collection->Url ?>"><?= Formatter::ToPlainText($collection->Name) ?></a></p>
+			</li>
+			<? } ?>
+		</ul>
 	</section>
 </main>
 <?= Template::Footer() ?>