From 68c16aae493275a9f70aaeb4bfb76dfc64ea344b Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@gmail.com>
Date: Thu, 17 Oct 2019 21:33:19 +0000
Subject: [PATCH 1/5] Initial pass at creating bare-bones offline template.

---
 offline.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 offline.php

diff --git a/offline.php b/offline.php
new file mode 100644
index 000000000..99541b805
--- /dev/null
+++ b/offline.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * The main template file
+ *
+ * This is the most generic template file in a WordPress theme
+ * and one of the two required files for a theme (the other being style.css).
+ * It is used to display a page when nothing more specific matches a query.
+ * E.g., it puts together the home page when no home.php file exists.
+ *
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
+ *
+ * @package Newspack
+ */
+
+get_header();
+?>
+	<section id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<?php wp_service_worker_error_message_placeholder(); ?>
+		</main><!-- .site-main -->
+	</section><!-- .content-area -->
+
+<?php
+get_footer();
+
+

From 0fc3f3e262eb9dfaacc48c23372c0001e5a0cd85 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@gmail.com>
Date: Thu, 17 Oct 2019 22:01:17 +0000
Subject: [PATCH 2/5] Clean up offline header.

---
 offline.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/offline.php b/offline.php
index 99541b805..96a99187b 100644
--- a/offline.php
+++ b/offline.php
@@ -1,13 +1,6 @@
 <?php
 /**
- * The main template file
- *
- * This is the most generic template file in a WordPress theme
- * and one of the two required files for a theme (the other being style.css).
- * It is used to display a page when nothing more specific matches a query.
- * E.g., it puts together the home page when no home.php file exists.
- *
- * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
+ * The PWA Offline template file
  *
  * @package Newspack
  */
@@ -15,6 +8,9 @@
 get_header();
 ?>
 	<section id="primary" class="content-area">
+		<header class="entry-header">
+			<h1 class="entry-title"><?php esc_html_e( 'Error', 'newspack' ); ?></h1>
+		</header><!-- .entry-header -->
 		<main id="main" class="site-main">
 			<?php wp_service_worker_error_message_placeholder(); ?>
 		</main><!-- .site-main -->

From dcd01a19a36924c14ea4c986b7ef03534df050e3 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@gmail.com>
Date: Thu, 17 Oct 2019 22:17:53 +0000
Subject: [PATCH 3/5] Update messages; add function_exists check.

---
 offline.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/offline.php b/offline.php
index 96a99187b..7e21c58a9 100644
--- a/offline.php
+++ b/offline.php
@@ -9,13 +9,16 @@
 ?>
 	<section id="primary" class="content-area">
 		<header class="entry-header">
-			<h1 class="entry-title"><?php esc_html_e( 'Error', 'newspack' ); ?></h1>
+			<h1 class="entry-title"><?php esc_html_e( 'Oops! It looks like you&rsquo;re offline.', 'newspack' ); ?></h1>
 		</header><!-- .entry-header -->
 		<main id="main" class="site-main">
-			<?php wp_service_worker_error_message_placeholder(); ?>
+			<?php
+			if ( function_exists( 'wp_service_worker_error_message_placeholder' ) ) {
+				wp_service_worker_error_message_placeholder();
+			}
+			?>
 		</main><!-- .site-main -->
 	</section><!-- .content-area -->
-
 <?php
 get_footer();
 

From f92f9c1ea67ed575111efc98fda280919709b931 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@gmail.com>
Date: Tue, 22 Oct 2019 20:43:09 +0000
Subject: [PATCH 4/5] Update title on PWA offline template to be more accurate.

---
 offline.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline.php b/offline.php
index 7e21c58a9..a1f5fd5f9 100644
--- a/offline.php
+++ b/offline.php
@@ -9,7 +9,7 @@
 ?>
 	<section id="primary" class="content-area">
 		<header class="entry-header">
-			<h1 class="entry-title"><?php esc_html_e( 'Oops! It looks like you&rsquo;re offline.', 'newspack' ); ?></h1>
+			<h1 class="entry-title"><?php esc_html_e( 'Offline', 'newspack' ); ?></h1>
 		</header><!-- .entry-header -->
 		<main id="main" class="site-main">
 			<?php

From 48f8181c568855742066e7841ac586961e33aa15 Mon Sep 17 00:00:00 2001
From: laurelfulford <laurelfulford@gmail.com>
Date: Tue, 22 Oct 2019 22:32:07 +0000
Subject: [PATCH 5/5] Improvements to PWA template: remove menus, widgets and
 WordAds; add minimum height for content area.

---
 header.php               |  2 +-
 offline.php              | 10 ++++++++++
 sass/layout/_layout.scss |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/header.php b/header.php
index 89792cb63..321eb9e32 100755
--- a/header.php
+++ b/header.php
@@ -172,7 +172,7 @@
 
 					<?php
 					// If logo is not centered.
-					if ( false === $header_center_logo ) {
+					if ( false === $header_center_logo && has_nav_menu( 'primary-menu' ) ) {
 						get_template_part( 'template-parts/header/header', 'search' );
 					}
 					?>
diff --git a/offline.php b/offline.php
index a1f5fd5f9..02e4d68e5 100644
--- a/offline.php
+++ b/offline.php
@@ -5,6 +5,16 @@
  * @package Newspack
  */
 
+// Prevent showing nav menus.
+add_filter( 'has_nav_menu', '__return_false' );
+
+// Prevent showing widgets.
+add_filter( 'is_active_sidebar', '__return_false' );
+
+// Disable WordAds in the header.
+// See: https://wordads.co/2018/02/07/how-to-control-jetpack-ad-placements-using-hooks/
+add_filter( 'wordads_header_disable', '__return_true' );
+
 get_header();
 ?>
 	<section id="primary" class="content-area">
diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss
index 4aaac395f..d3ccef1df 100755
--- a/sass/layout/_layout.scss
+++ b/sass/layout/_layout.scss
@@ -20,6 +20,7 @@
 }
 
 .site-content {
+	min-height: 30vh;
 	overflow: hidden;
 }