From 885ff9987f5e99cabc2fe15fa016029a8a5e1de2 Mon Sep 17 00:00:00 2001
From: Jeff MacKinnon <jeff@jeffmackinnon.com>
Date: Tue, 12 Jul 2022 11:16:26 -0300
Subject: [PATCH] Almost a new release

---
 static/css-include/pelican.css        |  8 +++++++-
 templates/article.html                | 10 ++++++++-
 templates/base.html                   |  2 +-
 templates/include/article_footer.html | 15 ++++++++++++++
 templates/include/cornerstone.html    | 29 ++++++++++++++++++++++-----
 templates/{ => include}/sidebar.html  |  5 +++--
 6 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 templates/include/article_footer.html
 rename templates/{ => include}/sidebar.html (98%)

diff --git a/static/css-include/pelican.css b/static/css-include/pelican.css
index a9c87b4..abd3c9b 100644
--- a/static/css-include/pelican.css
+++ b/static/css-include/pelican.css
@@ -187,4 +187,10 @@ VB
     padding-left: 40px;
 }
 
-/************************************************/
\ No newline at end of file
+/************************************************/
+
+/* Article footer */
+
+#article-footer {
+    margin-top: 5em;
+}
\ No newline at end of file
diff --git a/templates/article.html b/templates/article.html
index 3f860f4..a816624 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -132,7 +132,15 @@
         <p><strong><a href="{{ SITEURL }}/mastodon-comments/bot.php?title={{ article.title|striptags }}&url={{ SITEURL }}/{{ article.url }}{% if article.photo_image %}&image=../{{ article.photo_image[1] }}{% endif %}">Click Here to Comment on Mastodon.</a></strong></p>
         <p>If its your first time commenting, <a href="https://jeffmackinnon.com/commenting-on-blog-with-mastodon.html">click here</a> to figure it out.</p>
       </div>
-        {% endif %}
+      {% endif %}
+
+      {% if ARTICLE_FOOTER == true %}
+      <!-- Cornerstone Pages -->
+      <section id="article-footer">
+          {% include 'include/article_footer.html' %}
+      </section>
+      {% endif %}
+
     </div><!-- /.entry-content -->
   </section>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 75fdb82..96f5988 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -100,7 +100,7 @@
       </div>
 
     </div>
-    {% include 'sidebar.html' %}
+    {% include 'include/sidebar.html' %}
   </div>
 
 
diff --git a/templates/include/article_footer.html b/templates/include/article_footer.html
new file mode 100644
index 0000000..eb43c09
--- /dev/null
+++ b/templates/include/article_footer.html
@@ -0,0 +1,15 @@
+<section id="banner">
+    <div class="content">
+        <header class="major">
+            <h2>Our Newsletter</h2>
+        </header>
+        <p>We also have a weekly-ish newsletter where I keep you up to date with my thoughts on the industry, practical tutorials and more.</p>
+        <ul class="actions">
+            <li><a href="nl/" class="button big">Learn More</a></li>
+        </ul>
+    </div>
+    <span class="image object">
+        <script async data-uid="c20eb8a248" src="https://jeffmackinnon.ck.page/c20eb8a248/index.js"></script>
+    </span>
+</section>
+        
\ No newline at end of file
diff --git a/templates/include/cornerstone.html b/templates/include/cornerstone.html
index 80e0404..b7628b7 100644
--- a/templates/include/cornerstone.html
+++ b/templates/include/cornerstone.html
@@ -14,19 +14,38 @@
         </ul>
         <br />
     </article> 
+    <!--
     <article>
         <header> 
-            <h2 id="indexheader"><a href="https://jmkengineering.com/smart-grid/" rel="bookmark" title="Smart Grid">Smart Grid</a></h2> 
+            <h2 id="indexheader"><a href="https://jmkengineering.com/power-system-studies/" rel="bookmark" title="Power System Studies">Power System Studies</a></h2> 
         </header>
-        <a href="https://jmkengineering.com/smart-grid/" class="image"><img src="https://jmkengineering.com/images/adobestock21717426a.jpg" style="max-width: 100%; display: inline; float: center;" /></a>
-        <div class="entry-content">An electricity supply network that uses digital communications technology to detect and react to local changes in usage. – Oxford English Dictionary Smart Grid is a concept describing the evolution of the power system. Among the desired future power.</div>
+        <a href="https://jmkengineering.com/power-system-studies/" class="image"><img src="images/mcc-room.jpg" style="max-width: 100%; display: inline; float: center;" /></a>
+        <div class="entry-content">Power System Studies are important.</div>
         <br />
         <ul class="actions">
-            <li><a href="https://jmkengineering.com/smart-grid/" class="button">Learn More</a></li>
+            <li><a href="https://jmkengineering.com/power-system-studies/" class="button">Learn More</a></li>
         </ul>
         <br />
-
     </article> 
+    <article>
+        <header> 
+            <h2 id="indexheader"><a href="https://jmkengineering.com/solar-design/" rel="bookmark" title="olar Design">Solar Design</a></h2> 
+        </header>
+        <a href="https://jmkengineering.com/solar-design/" class="image"><img src="images/pv-solar-array.jpg" style="max-width: 100%; display: inline; float: center;" /></a>
+        <div class="entry-content">I need to talk about what we do wrt PC Solar Design</div>
+        <br />
+        <ul class="actions">
+            <li><a href="https://jmkengineering.com/solar-design/" class="button">Learn More</a></li>
+        </ul>
+        <br />
+    </article> -->
+
+
+
+
+
+
+    
 </div>
 
 
diff --git a/templates/sidebar.html b/templates/include/sidebar.html
similarity index 98%
rename from templates/sidebar.html
rename to templates/include/sidebar.html
index 31c5bd3..1d6f4cf 100644
--- a/templates/sidebar.html
+++ b/templates/include/sidebar.html
@@ -28,6 +28,7 @@
               {% endfor %}
             {% endif %}
           </ul>
+          {% if DISPLAY_CATEGORIES_ON_MENU %}
           <br />
           <br />
           <header class="major">
@@ -35,12 +36,12 @@
           </header>
           
           <ul>
-            {% if DISPLAY_CATEGORIES_ON_MENU %}
+            
               {% for cat, null in categories %}
                 <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
               {% endfor %}
-            {% endif %}
           </ul>
+          {% endif %}
       </nav>
 
        <!-- Section --> <!-- No mini posts for now