Move influence_detail_block into influence_detail.

The influence_detail_block template is only used in the influence_detail
template, so having it separate is not really needed. Additionally, it
turns out that overriding a block in an included template is not
possible, so moving it back in allows us to override the comments block
(which we will introduce in the next commmit).

diff --git a/templates/influences/influence_detail.html b/templates/influences/influence_detail.html
index b06ed889d46c82d81c9a52547628d9091d7c437e..234b5d73b065e19f2a6ec6893deffddaf0a5fdcd 100644 (file)
--- a/templates/influences/influence_detail.html
+++ b/templates/influences/influence_detail.html
@@ -2,5 +2,16 @@
 {% load i18n %}
 
 {% block content %}
-{% include "influences/influence_detail_block.html" %}
+<h1>{{ 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>
+{% if object.longterm %}
+<tr><td>{% trans "Long term" %}:</td><td>{{ object.longterm|yesno|capfirst }}</td></tr>
+{% endif %}
+</table>
+<p>{{ object.description }}</p>
+               
+<h2>{% trans "Comments" %}</h2>
+{% include "influences/influence_comments_block.html" %}
 {% endblock %}

diff --git a/templates/influences/influence_detail_block.html b/templates/influences/influence_detail_block.html
deleted file mode 100644 (file)
index 0037d09..0000000
--- a/templates/influences/influence_detail_block.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load i18n %}
-{% load threadedcommentstags %}
-
-<h1>{{ 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>
-{% if object.longterm %}
-<tr><td>{% trans "Long term" %}:</td><td>{{ object.longterm|yesno|capfirst }}</td></tr>
-{% endif %}
-</table>
-<p>{{ object.description }}</p>
-               
-<h2>{% trans "Comments" %}</h2>
-{% include "influences/influence_comments_block.html" %}