From ba4156d6a43020ac4e992e6729dfcaea92fee13d Mon Sep 17 00:00:00 2001
From: Felipe Dalcin <felipe.sdalcin@gmail.com>
Date: Wed, 28 Sep 2022 09:44:18 -0400
Subject: [PATCH 1/4] fix: aldine contact form warnings (#360)

---
 partials/contact-form.php | 90 ++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/partials/contact-form.php b/partials/contact-form.php
index 83345848..2ab637c3 100644
--- a/partials/contact-form.php
+++ b/partials/contact-form.php
@@ -31,65 +31,67 @@
 			</label>
 		</p>
 		<p class="form__row">
-			<input id="contact-name"
-			<?php
-			if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_name' ) :
-				?>
-				class="error"<?php endif; ?> type="text" name="visitor_name" value="
-							<?php
-							if ( $contact_form_response['status'] === 'error' ) :
-								echo $contact_form_response['values']['visitor_name'];
-			endif;
-							?>
-			" required>
+			<input
+					id="contact-name"
+					<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_name' ) : ?>
+						class="error"
+					<?php endif; ?>
+					type="text"
+					name="visitor_name"
+					<?php if ( $contact_form_response && $contact_form_response['status'] === 'error' ) : ?>
+						value="<?php echo $contact_form_response['values']['visitor_name']; ?>"
+					<?php endif; ?>
+					required
+			/>
 			<label for="contact-name">
 				<?php _e( 'Your name (required)', 'pressbooks-aldine' ); ?>
 			</label>
 		</p>
 		<p class="form__row">
-			<input id="contact-email"
-			<?php
-			if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_email' ) :
-				?>
-				class="error" <?php endif; ?>type="email" name="visitor_email" value="
-								<?php
-								if ( $contact_form_response['status'] === 'error' ) :
-										echo $contact_form_response['values']['visitor_email'];
-			endif;
-								?>
-			" required>
+			<input
+					id="contact-email"
+					<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_email' ) : ?>
+						class="error"
+					<?php endif; ?>
+					type="email"
+					name="visitor_email"
+					<?php if ( $contact_form_response && $contact_form_response['status'] === 'error' ) : ?>
+						value="<?php echo $contact_form_response['values']['visitor_email']; ?>"
+					<?php endif; ?>
+					required
+			/>
 			<label for="contact-email">
 				<?php _e( 'Your email address (required)', 'pressbooks-aldine' ); ?>
 			</label>
 		</p>
 		<p class="form__row">
-			<input id="contact-institution"
-			<?php
-			if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_institution' ) :
-				?>
-				class="error" <?php endif; ?>type="text" name="visitor_institution" value="
-								<?php
-								if ( $contact_form_response['status'] === 'error' ) :
-									echo $contact_form_response['values']['visitor_institution'];
-			endif;
-								?>
-			" required>
+			<input
+					id="contact-institution"
+					<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'visitor_institution' ) : ?>
+						class="error"
+					<?php endif; ?>
+					type="text"
+					name="visitor_institution"
+					<?php if ( $contact_form_response && $contact_form_response['status'] === 'error' ) : ?>
+						value="<?php echo $contact_form_response['values']['visitor_institution']; ?>"
+					<?php endif; ?>
+					required
+			/>
 			<label for="contact-institution">
 				<?php _e( 'Your institution (required)', 'pressbooks-aldine' ); ?>
 			</label>
 		</p>
 		<p class="form__row">
-			<textarea id="contact-message"
-			<?php
-			if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'message' ) :
-				?>
-				class="error" <?php endif; ?>name="message" required>
-								<?php
-								if ( $contact_form_response['status'] === 'error' ) :
-									echo $contact_form_response['values']['message'];
-			endif;
-								?>
-			</textarea>
+			<textarea
+					id="contact-message"
+					<?php if ( isset( $contact_form_response['field'] ) && $contact_form_response['field'] === 'message' ) : ?>
+						class="error"
+					<?php endif; ?>
+					name="message"
+					required
+			><?php if ( $contact_form_response && $contact_form_response['status'] === 'error' ) : ?>
+					<?php echo $contact_form_response['values']['message']; ?>
+				<?php endif; ?></textarea>
 			<label for="contact-message">
 				<?php _e( 'Your message (required)', 'pressbooks-aldine' ); ?>
 			</label>

From fa223c609a2993e9271edb2459dc9e42db4bbe92 Mon Sep 17 00:00:00 2001
From: SteelWagstaff <SteelWagstaff@users.noreply.github.com>
Date: Wed, 28 Sep 2022 13:45:04 +0000
Subject: [PATCH 2/4] chore(l10n): update languages/pressbooks-aldine.pot

---
 languages/pressbooks-aldine.pot | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/languages/pressbooks-aldine.pot b/languages/pressbooks-aldine.pot
index 028e99ee..6d136173 100644
--- a/languages/pressbooks-aldine.pot
+++ b/languages/pressbooks-aldine.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the GNU GPL v3 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Aldine 1.16.0-dev\n"
+"Project-Id-Version: Aldine 1.16.0\n"
 "Report-Msgid-Bugs-To: https://github.com/pressbooks/pressbooks-aldine/issues\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-09-26T19:56:58+00:00\n"
+"POT-Creation-Date: 2022-09-28T13:44:47+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: pressbooks-aldine\n"
@@ -490,23 +490,23 @@ msgstr ""
 msgid "Keep this field blank (required)"
 msgstr ""
 
-#: partials/contact-form.php:46
+#: partials/contact-form.php:47
 msgid "Your name (required)"
 msgstr ""
 
-#: partials/contact-form.php:62
+#: partials/contact-form.php:64
 msgid "Your email address (required)"
 msgstr ""
 
-#: partials/contact-form.php:78
+#: partials/contact-form.php:81
 msgid "Your institution (required)"
 msgstr ""
 
-#: partials/contact-form.php:94
+#: partials/contact-form.php:96
 msgid "Your message (required)"
 msgstr ""
 
-#: partials/contact-form.php:98
+#: partials/contact-form.php:100
 msgid "Send"
 msgstr ""
 

From ef7ab2d031a21fa34c5910ac20ffda17259dda6b Mon Sep 17 00:00:00 2001
From: Steel Wagstaff <steel@pressbooks.com>
Date: Mon, 17 Oct 2022 08:52:18 -0700
Subject: [PATCH 3/4] Bump version (#362)

---
 README.md | 4 ++--
 style.css | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4175e9b9..3ab0d80b 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,9 @@ Aldine is the default theme for the home page of [Pressbooks](https://pressbooks
 
 ## Changelog
 
-### 1.16.0
+### 1.16.1
 
-* See: https://github.com/pressbooks/pressbooks-aldine/releases/tag/1.16.0
+* See: https://github.com/pressbooks/pressbooks-aldine/releases/tag/1.16.1
 * Full release history available at: https://github.com/pressbooks/pressbooks-aldine/releases
 
 ## Upgrade Notice
diff --git a/style.css b/style.css
index 4b0f79ad..87561a47 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Author:				Pressbooks (Book Oven Inc.)
 Author URI:			https://pressbooks.org
 Description:		Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.
 Tags:				publishing, catalog, pressbooks, default-theme
-Version:			1.16.0
+Version:			1.16.1
 Requires at least:	6.0.2
 Tested up to:		6.0.2
 Requires PHP:		7.4

From f61b4bc03ded74a99a10dd249634765c96a34b01 Mon Sep 17 00:00:00 2001
From: SteelWagstaff <SteelWagstaff@users.noreply.github.com>
Date: Mon, 17 Oct 2022 15:53:43 +0000
Subject: [PATCH 4/4] chore(l10n): update languages/pressbooks-aldine.pot

---
 languages/pressbooks-aldine.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/pressbooks-aldine.pot b/languages/pressbooks-aldine.pot
index 6d136173..0577f8e3 100644
--- a/languages/pressbooks-aldine.pot
+++ b/languages/pressbooks-aldine.pot
@@ -2,16 +2,16 @@
 # This file is distributed under the GNU GPL v3 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Aldine 1.16.0\n"
+"Project-Id-Version: Aldine 1.16.1\n"
 "Report-Msgid-Bugs-To: https://github.com/pressbooks/pressbooks-aldine/issues\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-09-28T13:44:47+00:00\n"
+"POT-Creation-Date: 2022-10-17T15:53:25+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.6.0\n"
+"X-Generator: WP-CLI 2.7.0\n"
 "X-Domain: pressbooks-aldine\n"
 
 #. Theme Name of the theme