10 files changed, 108 insertions, 28 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 %}
diff --git a/servo/templates/stats/devices.html b/servo/templates/stats/devices.html
new file mode 100644
index 0000000..079530a
--- /dev/null
+++ b/servo/templates/stats/devices.html
@@ -0,0 +1,40 @@
+{% extends "stats/index.html" %}
+{% load i18n %}
+
+{% block tabs %}
+    <li><a href="{% url 'stats-index' %}">{% trans "Technicians" %}</a></li>
+    <li><a href="{% url 'stats-locations' %}">{% trans "Locations" %}</a></li>
+    <li><a href="{% url 'stats-queues' %}">{% trans "Queues" %}</a></li>
+    <li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
+    <li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
+    <li><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+    <li  class="active"><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
+{% endblock tabs %}
+
+{% block stats %}
+    <h2>{% trans "Device statistics" %}</h2>
+    <p>{% trans "Shows the number of orders and GSX repairs created for each device model within the given timeframe." %}</p>
+    <hr/>
+    <table class="table sortable">
+        <thead>
+            <tr>
+                <th>{% trans "Device" %}</th>
+                <th>{% trans "Service Orders" %}</th>
+                <th>{% trans "GSX Repairs" %}</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for r in results %}
+            <tr>
+                <td>{{ r.0 }}</td>
+                <td>{{ r.1 }}</td>
+                <td>{{ r.2 }}</td>
+            </tr>
+        {% empty %}
+            <tr>
+                <td colspan="3" class="empty muted">{% trans "No results found" %}</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+{% endblock stats %}
diff --git a/servo/templates/stats/index.html b/servo/templates/stats/index.html
index 2edc57d..90c0ed9 100755
--- a/servo/templates/stats/index.html
+++ b/servo/templates/stats/index.html
@@ -11,6 +11,7 @@
   <li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
   <li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
   <li><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+  <li><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
 {% endblock tabs %}
 </ul>
 
diff --git a/servo/templates/stats/locations.html b/servo/templates/stats/locations.html
index 576da8b..da4545e 100755
--- a/servo/templates/stats/locations.html
+++ b/servo/templates/stats/locations.html
@@ -8,6 +8,7 @@
     <li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
     <li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
     <li><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+    <li><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
 {% endblock tabs %}
 
 {% block stats %}
diff --git a/servo/templates/stats/newstats.html b/servo/templates/stats/newstats.html
index 1900efc..325ab10 100644
--- a/servo/templates/stats/newstats.html
+++ b/servo/templates/stats/newstats.html
@@ -11,6 +11,7 @@
   <li class="active"><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
   <li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
   <li><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+  <li><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
 {% endblock tabs %}
 </ul>
 
diff --git a/servo/templates/stats/queues.html b/servo/templates/stats/queues.html
index eefec46..f4f493d 100755
--- a/servo/templates/stats/queues.html
+++ b/servo/templates/stats/queues.html
@@ -8,6 +8,7 @@
     <li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
     <li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
     <li><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+    <li><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
 {% endblock tabs %}
 
 {% block stats %}
diff --git a/servo/templates/stats/sales.html b/servo/templates/stats/sales.html
index 186e897..e58b7b4 100755
--- a/servo/templates/stats/sales.html
+++ b/servo/templates/stats/sales.html
@@ -2,32 +2,33 @@
 {% load i18n %}
 
 {% block tabs %}
-<li><a href="{% url 'stats-index' %}">{% trans "Technicians" %}</a></li>
-<li><a href="{% url 'stats-locations' %}">{% trans "Locations" %}</a></li>
-<li><a href="{% url 'stats-queues' %}">{% trans "Queues" %}</a></li>
-<li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
-<li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
-<li class="active"><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+    <li><a href="{% url 'stats-index' %}">{% trans "Technicians" %}</a></li>
+    <li><a href="{% url 'stats-locations' %}">{% trans "Locations" %}</a></li>
+    <li><a href="{% url 'stats-queues' %}">{% trans "Queues" %}</a></li>
+    <li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
+    <li><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
+    <li class="active"><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+    <li><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
 {% endblock tabs %}
 
 {% block stats %}
-<h2>{% trans "Sales" %}</h2>
-<p>{% trans "Shows you invoice totals per queue within the selected time period." %}</p>
-{% include "stats/plot_snippet.html" with url="/stats/data/sales/invoices/" %}
-<hr/>
-<h2>{% trans "Purchases" %}</h2>
-<p>{% trans "Shows you Purchase Order totals per queue within the selected time period." %}</p>
-{% include "stats/plot_snippet.html" with url="/stats/data/sales/purchases/" %}
-<hr/>
-<h2>{% trans "Service Parts" %}</h2>
-<p>{% trans "Shows you how many parts have been ordered for each labour tier." %}</p>
-<div class="row-fluid">
-  <div class="span12">
-    <div class="span10">
-      <div class="plot plot-bar" data-source="/stats/data/sales/parts/"></div>
-      <div class="legend-container"></div>
+    <h2>{% trans "Sales" %}</h2>
+    <p>{% trans "Shows you invoice totals per queue within the selected time period." %}</p>
+    {% include "stats/plot_snippet.html" with url="/stats/data/sales/invoices/" %}
+    <hr/>
+    <h2>{% trans "Purchases" %}</h2>
+    <p>{% trans "Shows you Purchase Order totals per queue within the selected time period." %}</p>
+    {% include "stats/plot_snippet.html" with url="/stats/data/sales/purchases/" %}
+    <hr/>
+    <h2>{% trans "Service Parts" %}</h2>
+    <p>{% trans "Shows you how many parts have been ordered for each labour tier." %}</p>
+    <div class="row-fluid">
+      <div class="span12">
+        <div class="span10">
+          <div class="plot plot-bar" data-source="/stats/data/sales/parts/"></div>
+          <div class="legend-container"></div>
+        </div>
+        <div class="span2"></div>
+      </div>
     </div>
-    <div class="span2"></div>
-  </div>
-</div>
 {% endblock stats %}
diff --git a/servo/templates/stats/statuses.html b/servo/templates/stats/statuses.html
index f4fb427..bfcf73e 100755
--- a/servo/templates/stats/statuses.html
+++ b/servo/templates/stats/statuses.html
@@ -8,6 +8,7 @@
     <li><a href="{% url 'stats-repairs' %}">{% trans "Repairs" %}</a></li>
     <li class="active"><a href="{% url 'stats-statuses' %}">{% trans "Statuses" %}</a></li>
     <li><a href="{% url 'stats-sales' %}">{% trans "Sales" %}</a></li>
+    <li><a href="{% url 'stats-devices' %}">{% trans "Devices" %}</a></li>
 {% endblock tabs %}
 
 {% block stats %}