Permalink
Browse files

Merge branch 'master' into tk62

  • Loading branch information...
2 parents 7d6b6c0 + 8e1cc36 commit b689a66554efbb72b6638a2ad66d6ec6f8655539 @gustavofonseca committed Mar 6, 2013
@@ -95,7 +95,7 @@ <h3 style="text-align: center;">{% trans 'Library Collection' %}</h3>
- <small>
<em>{% trans 'Continued as' %}</em>
</small>
- <a href={% url 'catalog.journal' item.latter_journal.acronym %}>{{ item.latter_journal.title }}</a>
+ <a href="{{item.latter_journal.get_absolute_url}}">{{ item.latter_journal.title }}</a>
{% elif item.pub_status = 'deceased' %}
- <small>
<em>{% trans 'Deceased in ' %} - {{ item.last_date_history|date:"F d, Y" }}</em>
@@ -10,7 +10,16 @@
</center>
<div class="span12">
- <p><strong>{% trans 'Former Title' %}:</strong> {{ journal.title }} </p>
+ <p>
+ {% if journal.former_journal %}
+ <strong>{% trans 'Former Title:' %}</strong>
+ <a href="{{journal.former_journal.get_absolute_url}}"> {{ journal.former_journal.title }}</a>
+ {% endif %}
+ {% if journal.latter_journal %}
+ <strong>{% trans 'New Title:' %}</strong>
+ <a href="{{journal.latter_journal.get_absolute_url}}"> {{ journal.latter_journal.title }}</a>
+ {% endif %}
+ </p>
<small>{% trans 'Available issues' %}*</small>
</div>
@@ -69,11 +69,11 @@
<dd>
{% if journal.former_journal %}
<strong>{% trans 'Former Title:' %}</strong>
- <a href={% url 'catalog.journal' journal.former_journal.acronym %}> {{ journal.former_journal.title }}</a>
+ <a href="{{journal.former_journal.get_absolute_url}}"> {{ journal.former_journal.title }}</a>
{% endif %}
{% if journal.latter_journal %}
<strong>{% trans 'New Title:' %}</strong>
- <a href={% url 'catalog.journal' journal.latter_journal.acronym %}> {{ journal.latter_journal.title }}</a>
+ <a href="{{journal.latter_journal.get_absolute_url}}"}> {{ journal.latter_journal.title }}</a>
{% endif %}
</dd>
</dl>

0 comments on commit b689a66

Please sign in to comment.