From d8f85fa4b30d70470c2f01527da482fb64f97844 Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Thu, 25 May 2023 23:21:29 -0500
Subject: [PATCH] Add text/javascript to apache cache policy

---
 config/apache/standardebooks.org.conf  |  1 +
 config/apache/standardebooks.test.conf |  1 +
 www/polls/get.php                      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config/apache/standardebooks.org.conf b/config/apache/standardebooks.org.conf
index 55c4f56d..305b5bcd 100644
--- a/config/apache/standardebooks.org.conf
+++ b/config/apache/standardebooks.org.conf
@@ -19,6 +19,7 @@ Protocols		h2 h2c http/1.1
 # Set up caching directives for infrequently changed files
 ExpiresActive		on
 ExpiresByType		application/javascript		"access plus 6 months"
+ExpiresByType		text/javascript			"access plus 6 months"
 ExpiresByType		font/woff2			"access plus 6 months"
 ExpiresByType		image/avif			"access plus 6 months"
 ExpiresByType		image/gif			"access plus 6 months"
diff --git a/config/apache/standardebooks.test.conf b/config/apache/standardebooks.test.conf
index 7da3402b..f3d7d099 100644
--- a/config/apache/standardebooks.test.conf
+++ b/config/apache/standardebooks.test.conf
@@ -19,6 +19,7 @@ Protocols		h2 h2c http/1.1
 # Set up caching directives for infrequently changed files
 ExpiresActive		on
 ExpiresByType		application/javascript		"access plus 6 months"
+ExpiresByType		text/javascript			"access plus 6 months"
 ExpiresByType		font/woff2			"access plus 6 months"
 ExpiresByType		image/avif			"access plus 6 months"
 ExpiresByType		image/gif			"access plus 6 months"
diff --git a/www/polls/get.php b/www/polls/get.php
index 63f82378..151554f5 100644
--- a/www/polls/get.php
+++ b/www/polls/get.php
@@ -42,18 +42,18 @@ catch(Exceptions\SeException $ex){
 			<? if(!$canVote){ ?>
 				<p class="center-notice">You’ve already voted in this poll.</p>
 			<? } ?>
-		<p class="button-row narrow">
-			<? if($canVote){ ?>
-			<a href="<?= $poll->Url ?>/votes/new" class="button">Vote now</a>
-			<? } ?>
-			<a href="<?= $poll->Url ?>/votes" class="button">View results</a>
-		</p>
+			<p class="button-row narrow">
+				<? if($canVote){ ?>
+				<a href="<?= $poll->Url ?>/votes/new" class="button">Vote now</a>
+				<? } ?>
+				<a href="<?= $poll->Url ?>/votes" class="button">View results</a>
+			</p>
 		<? }else{ ?>
 			<? if($poll->Start !== null && $poll->Start > new DateTime()){ ?>
 				<p class="center-notice">This poll opens on <?= $poll->Start->format('F j, Y g:i a') ?>.</p>
 			<? }else{ ?>
-			<p class="center-notice">This poll closed on <?= $poll->End->format('F j, Y g:i a') ?>.</p>
-			<p class="button-row narrow"><a href="<?= $poll->Url ?>/votes" class="button">View results</a></p>
+				<p class="center-notice">This poll closed on <?= $poll->End->format('F j, Y g:i a') ?>.</p>
+				<p class="button-row narrow"><a href="<?= $poll->Url ?>/votes" class="button">View results</a></p>
 			<? } ?>
 		<? } ?>
 	</section>