projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phpbb: Make the username case-insensitve on login again.
[matthijs/projects/xerxes.git]
/
templates
/
influences
/
influence_detail.html
diff --git
a/templates/influences/influence_detail.html
b/templates/influences/influence_detail.html
index 234b5d73b065e19f2a6ec6893deffddaf0a5fdcd..3de670a6e9eeed14c0ac0d2142acacc96e279916 100644
(file)
--- a/
templates/influences/influence_detail.html
+++ b/
templates/influences/influence_detail.html
@@
-2,7
+2,7
@@
{% load i18n %}
{% block content %}
{% load i18n %}
{% block content %}
-<h1>{{ object.summary }}</h1>
+<h1>{{ object.
get_type_display }}: {{ object.
summary }}</h1>
<table>
<tr><td>{% trans "Contact" %}:</td><td>{{ object.contact }}</td></tr>
<tr><td>{% trans "Character" %}:</td><td><a href="{% url influences_character_detail object.character.id %}">{{ object.character }}</a></td></tr>
<table>
<tr><td>{% trans "Contact" %}:</td><td>{{ object.contact }}</td></tr>
<tr><td>{% trans "Character" %}:</td><td><a href="{% url influences_character_detail object.character.id %}">{{ object.character }}</a></td></tr>
@@
-10,8
+10,13
@@
<tr><td>{% trans "Long term" %}:</td><td>{{ object.longterm|yesno|capfirst }}</td></tr>
{% endif %}
</table>
<tr><td>{% trans "Long term" %}:</td><td>{{ object.longterm|yesno|capfirst }}</td></tr>
{% endif %}
</table>
-<p>{{ object.description }}</p>
-
+<p>{{ object.description|linebreaks }}</p>
+{% if object.result %}
+<h2>{% trans "Result" %}</h2>
+<p>{{ object.result|linebreaks }}</p>
+{% endif %}
<h2>{% trans "Comments" %}</h2>
<h2>{% trans "Comments" %}</h2>
+{% block comments %}
{% include "influences/influence_comments_block.html" %}
{% endblock %}
{% include "influences/influence_comments_block.html" %}
{% endblock %}
+{% endblock %}