From 08466016ef84dbf84e54099682fc5c8873d0e959 Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Mon, 25 May 2020 22:06:18 -0500
Subject: [PATCH 1/2] Fixed bug that was blocking content from showing

---
 screen/store.xml                | 2 +-
 template/store/content.html.ftl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 template/store/content.html.ftl

diff --git a/screen/store.xml b/screen/store.xml
index 64fb908b..be5a963e 100644
--- a/screen/store.xml
+++ b/screen/store.xml
@@ -90,7 +90,7 @@ var storeInfo = ${storeInfoJson};
         <set field="template_server_home" from="storeInfo.settings.template_server_home" default-value="component://PopRestStore/template/store/home.html.ftl"/>
         <set field="template_server_category" from="storeInfo.settings.template_server_category" default-value="component://PopRestStore/template/store/category.html.ftl"/>
         <set field="template_server_product" from="storeInfo.settings.template_server_product" default-value="component://PopRestStore/template/store/product.html.ftl"/>
-        <set field="template_server_content" from="storeInfo.settings.template_server_content" default-value="component://PopRestStore/template/store/help.html.ftl"/>
+        <set field="template_server_content" from="storeInfo.settings.template_server_content" default-value="component://PopRestStore/template/store/content.html.ftl"/>
         <set field="template_server_search" from="storeInfo.settings.template_server_search" default-value="component://PopRestStore/template/store/search.html.ftl"/>
     </pre-actions>
 
diff --git a/template/store/content.html.ftl b/template/store/content.html.ftl
new file mode 100644
index 00000000..45ff7ff4
--- /dev/null
+++ b/template/store/content.html.ftl
@@ -0,0 +1,3 @@
+<div class="container">
+    ${pageText}
+</div>

From a16030cb4d7bd1de5d51da8881228a5b13aee215 Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Fri, 29 May 2020 14:42:28 -0500
Subject: [PATCH 2/2] Added error page from config

---
 screen/store.xml         | 1 +
 screen/store/content.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/screen/store.xml b/screen/store.xml
index be5a963e..cb0580b4 100644
--- a/screen/store.xml
+++ b/screen/store.xml
@@ -92,6 +92,7 @@ var storeInfo = ${storeInfoJson};
         <set field="template_server_product" from="storeInfo.settings.template_server_product" default-value="component://PopRestStore/template/store/product.html.ftl"/>
         <set field="template_server_content" from="storeInfo.settings.template_server_content" default-value="component://PopRestStore/template/store/content.html.ftl"/>
         <set field="template_server_search" from="storeInfo.settings.template_server_search" default-value="component://PopRestStore/template/store/search.html.ftl"/>
+        <set field="template_server_error" from="storeInfo.settings.template_server_error" default-value="component://PopRestStore/template/store/error.html.ftl"/>
     </pre-actions>
 
     <widgets>
diff --git a/screen/store/content.xml b/screen/store/content.xml
index 9f195630..2c72ae9e 100755
--- a/screen/store/content.xml
+++ b/screen/store/content.xml
@@ -97,7 +97,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <render-mode><text type="html" location="${template_server_content}"/></render-mode>
             </widgets> 
             <fail-widgets>
-                <render-mode><text type="html" location="component://PopRestStore/template/store/error.html.ftl"/></render-mode>
+                <render-mode><text type="html" location="${template_server_error}"/></render-mode>
             </fail-widgets>
         </section>
         <render-mode><text type="html" location="${template_server_footer}"/></render-mode>