Minor changes for RSS pictures

static/css-include/pelican.css

@@ -7,6 +7,8 @@
 /************************************************/
 
 
+
+
 /************************************************/
 /* resets                                       */
 
@@ -144,13 +146,31 @@ box-shadow: 0 0 10px rgba(0,0,0,.5);
 /************************************************/
 /* Article/Entry Info                           */
 
+#content {
+    max-width:750px;
+}
+
 #entry-info {
-    margin: 0 0 2em 0;
+    margin: 0 0 1em 0;
-    border-bottom: solid 5px var(--style-colour);
+    /*border-bottom: solid 5px var(--style-colour); 
-    padding: 1em 0 0 0;
+    padding: 1em 0 0 0;*/
     position: relative;
 }
-VB 
+
+#entry-info p {
+    line-height: 1;
+}
+
+#post-info {
+    margin: 1em 0 1em 0;
+    border-bottom: solid 5px var(--style-colour); 
+    padding: 1em 0 2em 0;
+    position: relative;
+}
+#post-info p {
+    line-height: 1;
+}
+
 .pentry {
     margin: 0 0 0 0;
 }
@@ -194,3 +214,115 @@ VB
 #article-footer {
     margin-top: 5em;
 }
+
+/************************************************/
+
+/*  Comments */
+
+.comments {
+    margin: .1em;
+    max-width: 650px;
+}
+
+
+
+
+
+/* -- admonitions ----------------------------------------------------------- */
+
+div.admonition {
+    width: 80%;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-right: 10px;
+    padding: 7px;
+    background-color: var(--admonition-backgroud);
+    
+}
+
+div.admonition dt {
+    font-weight: bold;
+}
+
+p.admonition-title {
+    background-color: var(--admonition-header-backgroud);
+    margin: 0px 10px 5px 0px;
+    font-weight: bold;
+    font-size: 1em;
+
+}
+
+div.body p.centered {
+    text-align: center;
+    margin-top: 25px;
+}
+
+
+div.admonition > :last-child {
+    margin-bottom: 0;
+}
+
+div.admonition::after,
+blockquote::after {
+    display: block;
+    content: '';
+    clear: both;
+}
+
+/************************************************/
+
+/* Linktrees are a thing			*/
+/* used liberally from mollywhite.net from Sept 2, 2022 */
+
+.linktree {
+  width: 100%;
+  height: 100%;
+}
+.linktree * {
+  box-sizing: border-box;
+}
+.linktree body {
+  width: 100%;
+  height: 100%;
+  background-color: #96B78A;
+}
+.linktree .linktree-content {
+  max-width: 680px;
+  margin: 100px auto 0 auto;
+  width: 100%;
+  height: 100%;
+  padding: 24px 12px;
+}
+.linktree .linktree-content .wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.linktree .linktree-content .wrapper a.linktree-link {
+  display: block;
+  box-sizing: border-box;
+  width: 100%;
+  text-align: center;
+  text-decoration: none;
+  line-height: 40px;
+  background-color: #FFFFFF;
+  margin-bottom: 15px;
+  border: 2px solid #FFFFFF;
+  border-radius: 4px;
+  padding: 5px;
+}
+.linktree .linktree-content .wrapper a.linktree-link:hover {
+  background: rgba(255, 255, 255, 0.4);
+}
+.linktree .linktree-content .wrapper .social-links {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+}
+.linktree .linktree-content .wrapper .social-links a {
+  color: #FFFFFF;
+  text-decoration: none;
+  padding: 0 10px;
+  font-size: 120%;
+}

static/css/main.css

@@ -175,8 +175,8 @@ h1, h2, h3, h4, h5, h6 {
 
 h1 {
   font-size: 4em;
-  margin: 0 0 0.5em 0;
+  margin: 0 0 0.2em 0;
-  line-height: 1.3; }
+  line-height: 1.2; }
 
 h2 {
   font-size: 1.75em; }
@@ -2117,7 +2117,8 @@ button,
   display: flex;
   border-bottom: solid 5px var(--style-colour);
   padding: 6em 0 1em 0;
-  position: relative; }
+  position: relative; 
+  max-width:750px;}
   #header > * {
     -moz-flex: 1;
     -webkit-flex: 1;

templates/article.html

@@ -50,6 +50,12 @@
   {% endif %}  
   <meta property="og:description" content="{{ article.summary|striptags }}" />
 
+  {% if COMMENTS is sameas True %}
+  <link rel="stylesheet" type="text/css" href="/hashover/themes/default/comments.css"> 
+  {% endif %}
+
+  <link rel="canonical" href="{{ SITEURL }}/{{ article.url }}" /> 
+
 {% endblock %}
 
 {% block somemorehead %}
@@ -64,19 +70,11 @@
   <section id="content" class="body">
     <header>
       <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
-      {% if article.photo_image %}
-      <a href="{{ SITEURL }}/{{ article.photo_image[1] }}"><img style="display: block; margin: 0px auto;" src="{{ SITEURL }}/{{ article.photo_image[1] }}" /></a>
-      {% endif %}
-
-
     </header>
     <div id="entry-info">
       {% import 'translations.html' as translations with context %}
       {{ translations.translations_for(article) }}
-      <p class="pentry">Published: <time class="published" datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time></p>
+
-      {% if article.modified %}
-      <p class="pentry">Updated: <time class="modified" datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></p>
-      {% endif %}
       {% if article.authors %}
       <p class="pentry"><address class="vcard author">By {% for author in article.authors %}
         <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> 
@@ -93,21 +91,23 @@
       {% endif %}
     </div>
     <div class="entry-content">
-    {{ article.content }}
-      {% if article.photo_gallery %}
-      <br /><br />
-      {% for title, gallery in article.photo_gallery %}
-      <h2>{{ title }}</h2>
-          <section class="photo_gallery"> 
-          <ol class="photo_gallery">
-          {% for name, photo, thumb, exif, caption in gallery %}
-            <li class="photo gallery-item"><a href="{{ SITEURL }}/{{ photo }}" target="_blank"  title="{{ name }}" exif="{{ exif }}" caption="{{ caption }}"><img src="{{ SITEURL }}/{{ thumb }}"></a></li>
-          {% endfor %}
-        </ol></section>
-      {% endfor %}
     
-      {% endif %}
+    {{ article.content }}
-      {% if article.series %}
+
+    {% if article.photo_gallery %}
+    <br /><br />
+    {% for title, gallery in article.photo_gallery %}
+    <h2>{{ title }}</h2>
+        <section class="photo_gallery"> 
+        <ol class="photo_gallery">
+        {% for name, photo, thumb, exif, caption in gallery %}
+          <li class="photo gallery-item"><a href="{{ SITEURL }}/{{ photo }}" target="_blank"  title="{{ name }}" exif="{{ exif }}" caption="{{ caption }}"><img src="{{ SITEURL }}/{{ thumb }}"></a></li>
+        {% endfor %}
+      </ol></section>
+    {% endfor %}
+    {% endif %}
+
+    {% if article.series %}
       <div class="post-series">
         <p>This post is part {{ article.series.index }} of the "{{ article.series.name }}" series:</p>
         <ol class="parts">
@@ -119,7 +119,12 @@
         </ol>      
       </div>
       {% endif %}
-      <footer class="post-info">
+
+      <footer id="post-info">
+        <p class="pentry">Published: <time class="published" datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time></p>
+        {% if article.modified %}
+        <p class="pentry">Updated: <time class="modified" datetime="{{ article.modified.isoformat() }}">{{ article.locale_modified }}</time></p>
+        {% endif %}
         {% if article.category %}
         <div class="category">
             Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
@@ -134,6 +139,17 @@
         </div>
         {% endif %}
       </footer><!-- /.post-info -->
+
+
+      {% if COMMENTS is sameas True %}
+      <div class="comments">
+      <h3>Comments?</h3>
+      <script type="text/javascript" src="/hashover/comments.php"></script>
+      <noscript>Please enable JavaScript to load the comments.</noscript>
+      <div id="hashover"></div> 
+      </div>
+      {% endif %}
+
       {% if MASTODON_COMMENTS is sameas True %}
       <div class="comments">
         <br />
@@ -141,20 +157,26 @@
         <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 %}
+
       {% if TWITTER_COMMENTS is sameas True %}
       <div class="comments">
         <br />
-        <p><strong>To join a conversation on Twitter <a href="https://twitter.com/search?q={{ SITEURL }}/{{ article.url }}">Click Here</a>, and to start a conversation <a class="" href="https://twitter.com/intent/tweet?text={{ article.title|striptags }}&url={{ SITEURL }}/{{ article.url }}{% if SOCIAL_TWITTER %}&via={{ SOCIAL_TWITTER }}{% endif %}" target="_blank" title="Share on Twitter">Click Here</a></p>
+        <p><strong>To join a conversation on Twitter <a href="https://twitter.com/search?q={{ SITEURL }}/{{ article.url }}">click here</a>.</p>
-        <p>In future versions of this theme there will be a bot that will keep track of the comments and display them here, but that is for the future.</p>
       </div>
       {% endif %}
 
-      {% if ARTICLE_FOOTER == true %}
+      
       <section id="article-footer">
+        {% if article.photo_image %}
+        <a href="{{ SITEURL }}/{{ article.photo_image[1] }}"><img style="display: block; margin: 0 auto 0 0;" src="{{ SITEURL }}/{{ article.photo_image[1] }}" /></a>
+        {% endif %}
+        {% if ARTICLE_FOOTER == true %}
           {% include 'include/article_footer.html' %}
+        {% endif %}
       </section>
-      {% endif %}
+      
 
     </div><!-- /.entry-content -->
+
   </section>
 {% endblock %}

templates/base.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock html_lang %}">
 <head>
-{% block head %}
+  {% block head %}
-  <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
+  <title>{% if NASHOSTED %}NAS Hosted - {% endif %}{% block title %}{{ SITENAME }}{% endblock title %}</title>
   {% if FAVICON %}
   <link rel="icon" type="image/x-icon" href="{{ SITEURL }}/{{ FAVICON }}">
   {% endif %}
@@ -15,53 +15,48 @@
   {% endif %}
   {% if (article and article.photo_gallery) or (articles_page and articles_page.object_list[0].photo_gallery) %}
 	<link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/magnific-popup.css">
-{% endif %}  
+  {% endif %}  
   <meta name="generator" content="Pelican" />
-{% if FEED_ALL_ATOM %}
+  {% if FEED_ALL_ATOM %}
   <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
-{% endif %}
+  {% endif %}
-{% if FEED_ALL_RSS %}
+  {% if FEED_ALL_RSS %}
   <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_RSS_URL %}{{ FEED_ALL_RSS_URL }}{% else %}{{ FEED_ALL_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
-{% endif %}
+  {% endif %}
-{% if FEED_ATOM %}
+  {% if FEED_ATOM %}
   <link href="{{ FEED_DOMAIN }}/{%if FEED_ATOM_URL %}{{ FEED_ATOM_URL }}{% else %}{{ FEED_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
-{% endif %}
+  {% endif %}
-{% if FEED_RSS %}
+  {% if FEED_RSS %}
   <link href="{{ FEED_DOMAIN }}/{% if FEED_RSS_URL %}{{ FEED_RSS_URL }}{% else %}{{ FEED_RSS }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
-{% endif %}
+  {% endif %}
-{% if CATEGORY_FEED_ATOM and category %}
+  {% if CATEGORY_FEED_ATOM and category %}
   <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_ATOM_URL %}{{ CATEGORY_FEED_ATOM_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_ATOM.format(slug=category.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories Atom Feed" />
-{% endif %}
+  {% endif %}
-{% if CATEGORY_FEED_RSS and category %}
+  {% if CATEGORY_FEED_RSS and category %}
   <link href="{{ FEED_DOMAIN }}/{% if CATEGORY_FEED_RSS_URL %}{{ CATEGORY_FEED_RSS_URL.format(slug=category.slug) }}{% else %}{{ CATEGORY_FEED_RSS.format(slug=category.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
-{% endif %}
+  {% endif %}
-{% if TAG_FEED_ATOM and tag %}
+  {% if TAG_FEED_ATOM and tag %}
   <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_ATOM_URL %}{{ TAG_FEED_ATOM_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_ATOM.format(slug=tag.slug) }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
-{% endif %}
+  {% endif %}
-{% if TAG_FEED_RSS and tag %}
+  {% if TAG_FEED_RSS and tag %}
   <link href="{{ FEED_DOMAIN }}/{% if TAG_FEED_RSS_URL %}{{ TAG_FEED_RSS_URL.format(slug=tag.slug) }}{% else %}{{ TAG_FEED_RSS.format(slug=tag.slug) }}{% endif %}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
-{% endif %}
+  {% endif %}
 
-{% if TRACKING == True %}
+  {% if TRACKING == True %}
-{% include 'include/trackingcode.html' %}
+  {% include 'include/trackingcode.html' %}
-{% endif %}
+  {% endif %}
-
-
-{% endblock head %}
-{% block somemorehead %}
-{% endblock somemorehead %}
 
+  {% endblock head %}
+  {% block somemorehead %}
+  {% endblock somemorehead %}
 </head>
-
 <body class="is-preload">
   <div id="wrapper">
     <div id="main">
       <div class="inner">
-
         <!-- Header -->
         <header id="header">
           <strong><a href="{{ SITEURL }}/" class="logo">{{ SITENAME }}{% if SITESUBTITLE %} {{ SITESUBTITLE }}{% endif %}</a></strong>
-
           <ul class="icons">
             {% if SOCIAL_TWITTER %}
               <li><a href="https://twitter.com/{{ SOCIAL_TWITTER }}" class="icon brands fa-twitter" target="_blank" rel="noopener noreferrer"><span class="label">Twitter</span></a></li>
@@ -69,7 +64,6 @@
             {% if SOCIAL_MASTODON %}
             <li><a href="{{ SOCIAL_MASTODON }}" class="icon brands fa-mastodon" target="_blank" rel="noopener noreferrer"><span class="label">Mastodon</span></a></li>
             {% endif %}
-
             {% if SOCIAL_FLICKR %}
               <li><a href="https://www.flickr.com/photos/{{ SOCIAL_FLICKR }}" class="icon brands fa-flickr" target="_blank" rel="noopener noreferrer"><span class="label">Flickr</span></a></li>
             {% endif %}

templates/page.html

@@ -37,8 +37,7 @@
     {{ page.content }}
 
     {% if page.modified %}
-    <footer>    
+    <footer id="post-info">    
-      <br /><br />
       <p>Last updated: {{ page.locale_modified }}</p>
     </footer>
     {% endif %}