aboutsummaryrefslogtreecommitdiffstats
path: root/servo/templates/notes
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2016-03-21 20:37:11 +0200
committerFilipp Lepalaan <filipp@mac.com>2016-03-21 20:37:11 +0200
commitec867584ef2078492d70b555ca419ea9e01dca8e (patch)
tree104c93fa71c67b18ad8e4221f8f1f9325178e04e /servo/templates/notes
parent1b6e5ee722f76f594e3d95dfa8d77ac2b9f2173a (diff)
downloadServo-ec867584ef2078492d70b555ca419ea9e01dca8e.tar.gz
Servo-ec867584ef2078492d70b555ca419ea9e01dca8e.tar.bz2
Servo-ec867584ef2078492d70b555ca419ea9e01dca8e.zip
Fixed article flag marking
Diffstat (limited to 'servo/templates/notes')
-rwxr-xr-xservo/templates/notes/list_notes.html2
-rw-r--r--servo/templates/notes/view_article.html4
-rwxr-xr-xservo/templates/notes/view_note.html4
3 files changed, 5 insertions, 5 deletions
diff --git a/servo/templates/notes/list_notes.html b/servo/templates/notes/list_notes.html
index 30fdb3d..187d421 100755
--- a/servo/templates/notes/list_notes.html
+++ b/servo/templates/notes/list_notes.html
@@ -35,7 +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 "GSX" %}</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>//-->
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 %}
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 %}