From 3ca42ce848d4d5a19dde34211733dc536698e8ba Mon Sep 17 00:00:00 2001
From: volpino <fox91@anche.no>
Date: Tue, 14 Aug 2012 14:19:57 +0200
Subject: [PATCH] euscanwww: user feed link is displayed on every page for
 registered users

Signed-off-by: volpino <fox91@anche.no>
---
 euscanwww/djeuscan/templates/_base.html                |  9 +++++++++
 .../djeuscan/templates/euscan/accounts/index.html      | 10 ----------
 .../templates/euscan/accounts/preferences.html         |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/euscanwww/djeuscan/templates/_base.html b/euscanwww/djeuscan/templates/_base.html
index f8a4cc0..efcc4d5 100644
--- a/euscanwww/djeuscan/templates/_base.html
+++ b/euscanwww/djeuscan/templates/_base.html
@@ -71,6 +71,15 @@
                         <img src="{{ STATIC_URL }}img/feed.png" alt="feed" />
                         <a title="Global Feed" href="{% url "global_feed" %}">Global Feed</a>
                       </li>
+
+                      {% if user.is_authenticated %}
+                        <li>
+                          <img src="{{ STATIC_URL }}/img/feed.png" alt="feed" />
+                          <a title="{{ user }} Feed" href="{% url "user_feed" %}">
+                            {{ user }}'s Feed
+                          </a>
+                        </li>
+                      {% endif %}
                     {% endblock %}
                     <li>---</li>
                     <li><a href="{% url "api" %}">API</a></li>
diff --git a/euscanwww/djeuscan/templates/euscan/accounts/index.html b/euscanwww/djeuscan/templates/euscan/accounts/index.html
index 51cbb0a..e9ac816 100644
--- a/euscanwww/djeuscan/templates/euscan/accounts/index.html
+++ b/euscanwww/djeuscan/templates/euscan/accounts/index.html
@@ -6,16 +6,6 @@
   {{ block.super }} - Welcome {{ user }}
 {% endblock %}
 
-{% block menu_feed %}
-{{ block.super }}
-<li>
-  <img src="{{ STATIC_URL }}/img/feed.png" alt="feed" />
-  <a title="{{ user }} Feed" href="{% url "user_feed" %}">
-    {{ user }}'s Feed
-  </a>
-</li>
-{% endblock %}
-
 {% block content %}
   <h2>
     Welcome {{ user }}
diff --git a/euscanwww/djeuscan/templates/euscan/accounts/preferences.html b/euscanwww/djeuscan/templates/euscan/accounts/preferences.html
index bde79af..db32f05 100644
--- a/euscanwww/djeuscan/templates/euscan/accounts/preferences.html
+++ b/euscanwww/djeuscan/templates/euscan/accounts/preferences.html
@@ -20,7 +20,7 @@
 {% block content %}
   {% if updated %}
     <div class="alert alert-success">
-      <strong>Saved!</strong> Your preferences has been saved
+      <strong>Saved!</strong> Your preferences have been saved
     </div>
   {% endif %}