Simpler feed settings

Now this might be a temporary change, but for now configuring feeds is
kept out of the database and placed in the `settings.py'. I am
thinking of adding a web-based interface though, which would also mean
I place everything back in a database.

2 files changed, 7 insertions, 20 deletions

diff --git a/aggregator/templates/aggregator/base.html b/aggregator/templates/aggregator/base.html
index 8f752bd..4a24135 100644
--- a/aggregator/templates/aggregator/base.html
+++ b/aggregator/templates/aggregator/base.html
@@ -19,10 +19,8 @@
         </h1>
         <h2 id="sitesubtitle">
           Will this ever really be my website?
-          {% for category in categories %}
-            <a class="category"
-               href="/{{ category.name|slugify }}/">{{ category.name }}</a>
-          {% endfor %}
+          <a class="category" href="/activity/">Activities</a>
+          <a class="category" href="/post/">Posts</a>
         </h2>
       </hgroup>
     </header>
diff --git a/aggregator/templates/aggregator/post_content.html b/aggregator/templates/aggregator/post_content.html
index e47de93..dc04741 100644
--- a/aggregator/templates/aggregator/post_content.html
+++ b/aggregator/templates/aggregator/post_content.html
@@ -1,34 +1,23 @@
-<article class="post {{ post.feed.name|slugify }}">
+<article class="post">
   <header>
     <hgroup>
       <h1>
         <a href="/post/{{ post.pk }}/">
-          <img src="{{ post.feed.get_favicon_url }}" />
+          <img src="/static/images/logos/{{ post.icon }}" />
         </a>
         <a href="/post/{{ post.pk }}/">
-          {% if post.feed.uses_title %}
-            {{ post.title }}
-          {% else %}
-            {{ post.updated }}
-          {% endif %}
+          {{ post.title }}
         </a>
       </h1>
       <h2 class="postsubtitle">
-        Via
-        <a href="{{ post.feed.base_url }}">{{ post.feed.name }}</a>
-        (<a href="{{ post.feed.get_profile_url }}">profile</a>,
-        <a href="{{ post.remote_url }}">origin</a>)
+        (<a href="{{ post.link }}">origin</a>)
       </h2>
     </hgroup>
   </header>
 
   <div class="postcontent">
     {% autoescape off %}
-      {% if post.feed.br2nl %}
-        {{ post.body|linebreaks }}
-      {% else %}
-        {{ post.body }}
-      {% endif %}
+      {{ post.content }}
     {% endautoescape %}
   </div>
 </article>