Add notifications to site header

oscar/apps/customer/notification_views.py

@@ -19,28 +19,35 @@ class NotificationListView(generic.ListView):
     paginate_by = 20
 
     def get_context_data(self, **kwargs):
-        ctx = super(InboxView, self).get_context_data(**kwargs)
+        ctx = super(NotificationListView, self).get_context_data(**kwargs)
         ctx['title'] = self.title
+        ctx['list_type'] = self.list_type
         return ctx
 
 
 class InboxView(NotificationListView):
     title = _("Notifications inbox")
+    list_type = 'inbox'
 
     def get_queryset(self):
         qs = self.model._default_manager.filter(
             recipient=self.request.user,
             location=self.model.INBOX)
+        for obj in qs:
+            if not obj.is_read:
+                setattr(obj, 'is_new', True)
         self.mark_as_read(qs)
         return qs
 
     def mark_as_read(self, queryset):
         now = datetime.datetime.now()
-        queryset.update(date_read=now)
+        unread = queryset.filter(date_read=None)
+        unread.update(date_read=now)
 
 
 class ArchiveView(NotificationListView):
     title = _("Archived notifications")
+    list_type = 'archive'
 
     def get_queryset(self):
         return self.model._default_manager.filter(

oscar/apps/notifications/context_processors.py

@@ -0,0 +1,9 @@
+from django.db.models import get_model
+
+Notification = get_model('notifications', 'Notification')
+
+
+def notifications(request):
+    num_unread = Notification.objects.filter(
+        recipient=request.user, date_read=None).count()
+    return {'num_unread_notifications': num_unread}

oscar/apps/notifications/models.py

@@ -36,3 +36,7 @@ class Notification(models.Model):
     def archive(self):
         self.location = self.ARCHIVE
         self.save()
+
+    @property
+    def is_read(self):
+        return self.date_read is not None

oscar/templates/oscar/notifications/list.html

@@ -27,10 +27,10 @@
 
 {% block content %}
 
-<p>
-	<a class="btn" href="{% url customer:notifications-inbox %}">Inbox</a>
-	<a class="btn" href="{% url customer:notifications-archive %}">Archive</a>
-</p>
+<ul class="nav nav-tabs">
+	<li class="{% if list_type == 'inbox' %}active{% endif %}"><a href="{% url customer:notifications-inbox %}">Inbox</a></li>
+	<li class="{% if list_type == 'archive' %}active{% endif %}"><a href="{% url customer:notifications-archive %}">Archive</a></li>
+</ul>
 
 {% if notifications %}
 {% if page_obj %}
@@ -48,6 +48,7 @@
 				value="{{ notification.id }}"/>
 			</td>
 			<td>
+				{% if notification.is_new %}*NEW*{% endif %}
 				{{ notification.subject|safe }} <br/>
 				Send: {{ notification.date_sent }}<br/>
 				Read: {{ notification.date_read }}
@@ -56,6 +57,7 @@
 		{% endfor %}
 		</tbody>
 	</table>
+	With selected items: 
 	<button type="submit" class="btn" name="action" value="archive">Archive</button>
 	<button type="submit" class="btn" name="action" value="delete">Delete</button>
 </form>

oscar/templates/oscar/partials/nav_accounts.html

@@ -5,17 +5,26 @@
 			<ul class="nav pull-right">
 				{% if user.is_authenticated %}
 				    {% if user.get_full_name %}
-					<li><div>{% trans "Welcome" %} <em>{{ user.get_full_name }}</em></div></li>
+						<li><div>{% trans "Welcome" %} <em>{{ user.get_full_name }}</em></div></li>
 					{% endif %}
-					<li> <a href="{% url customer:summary %}" class="app-ico ico_profile">{% trans "Account" %}</a></li>
-					<li><a href="{% url customer:logout %}" class="app-ico ico_logout">{% trans "Logout" %}</a></li>
+					<li>
+						<a href="{% url customer:summary %}" class="app-ico ico_profile">{% trans "Account" %}</a>
+					</li>
+					<li>
+						<a class="app-ico ico_email" href="{% url customer:notifications-inbox %}">
+							{% trans "Notifications" %}
+							{% if num_unread_notifications > 0 %}
+								<span class="label label-important">{{ num_unread_notifications }}</span>
+							{% endif %}</a>
+					</li>
 					{% if user.is_staff %}
-					<li><a href="{% url dashboard:index %}" class="app-ico ico_settings">{% trans "Dashboard" %}</a></li>
+						<li><a href="{% url dashboard:index %}" class="app-ico ico_settings">{% trans "Dashboard" %}</a></li>
 					{% endif %}
+					<li><a href="{% url customer:logout %}" class="app-ico ico_logout">{% trans "Logout" %}</a></li>
 				{% else %}
 					<li><a href="{% url customer:login %}" class="app-ico ico_logout">{% trans "Login or register" %}</a></li>
 				{% endif %}
 			</ul>
 		</div>
-    </div><!-- /navbar-inner -->
-</div><!-- /navbar -->
+    </div>
+</div>

sites/sandbox/settings.py

@@ -108,6 +108,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'oscar.apps.promotions.context_processors.promotions',
     'oscar.apps.checkout.context_processors.checkout',
     'oscar.core.context_processors.metadata',
+    'oscar.apps.notifications.context_processors.notifications',
 )
 
 MIDDLEWARE_CLASSES = (