From 1b6e5ee722f76f594e3d95dfa8d77ac2b9f2173a Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Mon, 21 Mar 2016 19:14:37 +0200
Subject: Adding GSX articles

---
 servo/templates/notes/view_article.html | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 servo/templates/notes/view_article.html

(limited to 'servo/templates/notes/view_article.html')

diff --git a/servo/templates/notes/view_article.html b/servo/templates/notes/view_article.html
new file mode 100644
index 0000000..99fd486
--- /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' 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>
+        </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 %}
-- 
cgit v1.2.3


From ec867584ef2078492d70b555ca419ea9e01dca8e Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Mon, 21 Mar 2016 20:37:11 +0200
Subject: Fixed article flag marking

---
 servo/templates/notes/view_article.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'servo/templates/notes/view_article.html')

diff --git a/servo/templates/notes/view_article.html b/servo/templates/notes/view_article.html
index 99fd486..d0576eb 100644
--- a/servo/templates/notes/view_article.html
+++ b/servo/templates/notes/view_article.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' '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 %}
-- 
cgit v1.2.3