3 files changed, 38 insertions, 4 deletions
diff --git a/servo/templates/notes/list_notes.html b/servo/templates/notes/list_notes.html
index fdbc853..187d421 100755
--- a/servo/templates/notes/list_notes.html
+++ b/servo/templates/notes/list_notes.html
@@ -35,6 +35,7 @@
     <ul class="nav nav-list">
       <li class="nav-header">{% trans "Messages" %}</li>
       <li class="{% active request "inbox" %}"><a href="{% url 'notes-list_notes' kind="inbox" %}">{% trans "Inbox" %} <span class="badge pull-right">{{ inbox_count|safe }}</span></a></li>
+      <li class="{% active request "articles" %}"><a href="{% url 'notes-list_notes' kind="articles" %}">{% trans "Articles" %}</a></li>
       <li class="{% active request "flagged" %}"><a href="{% url 'notes-list_notes' kind="flagged" %}">{% trans "Flagged" %}</a></li>
       <li class="{% active request "sent" %}"><a href="{% url 'notes-list_notes' kind="sent" %}">{% trans "Sent" %}</a></li>
       <!--<li class="{% active request "escalations" %}"><a href="{% url 'notes-list_notes' kind="escalations" %}">{% trans "Escalations" %}</a></li>//-->
@@ -48,9 +49,9 @@
       {% for note in notes %}
       <li class="{% active request 'notes' kind note.pk 'view' %}">
         <a href="{% url 'notes-view_note' kind note.pk %}">
-          <strong>{{ note.sender }}</strong><span class="pull-right">{{ note.created_at|date:"SHORT_DATE_FORMAT" }}</span>
+          <strong>{{ note.get_sender }}</strong><span class="pull-right">{{ note.get_creation_date|date:"SHORT_DATE_FORMAT" }}</span>
           <br/>
-          <small>{{ note.body|truncatechars:30 }}</small>
+          <small>{{ note.get_body|truncatechars:30 }}</small>
         </a>
       </li>
     {% empty %}
diff --git a/servo/templates/notes/view_article.html b/servo/templates/notes/view_article.html
new file mode 100644
index 0000000..d0576eb
--- /dev/null
+++ b/servo/templates/notes/view_article.html
@@ -0,0 +1,33 @@
+{% extends "notes/list_notes.html" %}
+{% load servo_tags %}
+{% load i18n %}
+
+{% block note_buttons %}
+    <div class="btn-group">
+        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+            <i class="icon-flag"></i> <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu">
+            <li><a href="{% url 'notes-toggle_flag' 'articles' note.pk 'read' %}" class="nofollow">{{ read_title }}</a></li>
+            <li><a href="{% url 'notes-toggle_flag' 'articles' note.pk 'flagged' %}" class="nofollow">{{ flagged_title }}</a></li>
+        </ul>
+    </div>
+{% endblock note_buttons %}
+
+{% block view_message %}
+    <div class="message-header">
+        <p>{% trans "From" %}: {{ note.get_sender }}</p>
+        <p>{% trans "Priority" %}: {{ note.priority }}</p>
+        <p>{% trans "Created" %}: {{ note.date_created }}</p>
+        <p>{% trans "Subject" %}: {{ note.get_title }}</p>
+    </div>
+    <hr/>
+    {{ note.summary|markdown }}
+    {{ note.content|markdown }}
+    <div class="form-actions">
+        <div class="pull-right">
+            <a href="#" class="btn btn-default">{% trans "Reload" %}</a>
+            <a href="#" class="btn btn-default">{% trans "Acknowledge" %}</a>
+        </div>
+    </div>
+{% endblock view_message %}
diff --git a/servo/templates/notes/view_note.html b/servo/templates/notes/view_note.html
index 05000f6..8f51406 100755
--- a/servo/templates/notes/view_note.html
+++ b/servo/templates/notes/view_note.html
@@ -8,8 +8,8 @@
             <i class="icon-flag"></i> <span class="caret"></span>
         </a>
         <ul class="dropdown-menu">
-            <li><a href="{% url 'notes-toggle_flag' note.pk 'read' %}" class="nofollow">{{ note.get_read_title }}</a></li>
-            <li><a href="{% url 'notes-toggle_flag' note.pk 'flagged' %}" class="nofollow">{{ note.get_flagged_title }}</a></li>
+            <li><a href="{% url 'notes-toggle_flag' 'inbox' note.pk 'read' %}" class="nofollow">{{ note.get_read_title }}</a></li>
+            <li><a href="{% url 'notes-toggle_flag' 'inbox' note.pk 'flagged' %}" class="nofollow">{{ note.get_flagged_title }}</a></li>
         </ul>
     </div>
 {% endblock note_buttons %}