From f8f4586a209a433d3f6055049aa13dfa0587446a Mon Sep 17 00:00:00 2001
From: Lucas Cimon <lucas.cimon@gmail.com>
Date: Tue, 15 Aug 2017 18:21:41 +0200
Subject: [PATCH] Only displaying article category if CATEGORY_SAVE_AS is set

---
 templates/article.html | 6 +++++-
 templates/base.html    | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/article.html b/templates/article.html
index 671c512..cb683c5 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -64,7 +64,11 @@
 
     <article class="uk-article">
         <h1 class="uk-heading-large uk-article-title" itemprop="name">{{ article.title }}</h1>
-        <p class="uk-article-meta"><time datetime="{{ article.date.strftime('%Y-%m-%d') }}" itemprop="datePublished">{{ article.locale_date }}</time> in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% if DISQUS_SITENAME %}, <br class="uk-visible-small"><i class="uk-icon-comment"></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}</p>
+        <p class="uk-article-meta">
+            <time datetime="{{ article.date.strftime('%Y-%m-%d') }}" itemprop="datePublished">{{ article.locale_date }}</time>
+            {% if CATEGORY_SAVE_AS %}<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}
+            {% if DISQUS_SITENAME %}, <br class="uk-visible-small"><i class="uk-icon-comment"></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
+        </p>
 
         {% if SHARE %}
         <a href="https://www.facebook.com/sharer/sharer.php?u={{ SITEURL }}/{{ article.url }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600');return false;" taget="_blank" class="uk-button uk-visible-small"><i class="uk-icon-facebook-square"></i> Share</a>
diff --git a/templates/base.html b/templates/base.html
index b07ab22..5fbf67e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -142,12 +142,10 @@
             </div>
             {% endif %}
 
-            {% if FEED_ALL_ATOM %}
             <div class="uk-panel uk-panel-box">
                 <h3 class="uk-panel-title">Receive Updates</h3>
                 <a rel="alternate" type="application/atom+xml" href="{{ SITEURL }}/{{ FEED_ALL_ATOM }}" class="mg-feed"><i class="uk-icon-rss uk-icon-medium"></i> ATOM</a>
             </div>
-            {% endif %}
 
             {% if LINKS %}
             <div class="uk-panel uk-panel-box">