* Split off the detail and list templates into a normal one that generates a full...

 * Make the index template use the character_block and influence_block templates, to reduce duplicate template code.

diff --git a/templates/influences/character_detail.html b/templates/influences/character_detail.html
index 09afc68bc32aae774684635619f107e26ad36ddf..1f31ec9c61402b72e356158695481bc6ad096c1c 100644 (file)
--- a/templates/influences/character_detail.html
+++ b/templates/influences/character_detail.html
@@ -1,21 +1,5 @@
 {% extends "base/base.html" %}
-{% load i18n %}
 
 {% block content %}
-
-<h1>{{ object.name }}</h1>
-{% ifequal object.status "N" %}
-<em>{% trans "This character was not yet approved by the SLs" %}</em>
-{% else %}
-<em>{% trans "This character is approved by the SLs" %}</em>
-{% endifequal %}
-<h2>{% blocktrans with object.name as name %}Influences for {{ name }}{% endblocktrans %}</h2>
-<ul>
-{% for influence in object.influence_set.all %}
-       <li><a href="{% url influences_influence_detail influence.pk %}">{{ influence }}</a></li>
-{% endfor %}
-</ul>
-
-<a href="{% url influences_add_influence_for_character object.id %}">{% trans "Submit influence" %}</a>
-
+{% include "influences/character_detail_block.html" %}
 {% endblock %}

diff --git a/templates/influences/character_detail_block.html b/templates/influences/character_detail_block.html
new file mode 100644 (file)
index 0000000..6c0a67b
--- /dev/null
+++ b/templates/influences/character_detail_block.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+<h1>{{ object.name }}</h1>
+{% ifequal object.status "N" %}
+<em>{% trans "This character was not yet approved by the SLs" %}</em>
+{% else %}
+<em>{% trans "This character is approved by the SLs" %}</em>
+{% endifequal %}
+<h2>{% blocktrans with object.name as name %}Influences for {{ name }}{% endblocktrans %}</h2>
+<ul>
+{% for influence in object.influence_set.all %}
+       <li><a href="{% url influences_influence_detail influence.pk %}">{{ influence }}</a></li>
+{% endfor %}
+</ul>
+
+<a href="{% url influences_add_influence_for_character object.id %}">{% trans "Submit influence" %}</a>

diff --git a/templates/influences/character_list.html b/templates/influences/character_list.html
index 8b2c3d33fe9e0ad11bda163a46fba849caea626c..d089d0954b9102387ad99f55c9b97383690b8189 100644 (file)
--- a/templates/influences/character_list.html
+++ b/templates/influences/character_list.html
@@ -1,19 +1,5 @@
 {% extends "base/base.html" %}
-{% load i18n %}
 
 {% block content %}
-
-<h1>{% trans "Your characters"%}</h1>
-{% if object_list %}
-       <ul>
-       {% for character in object_list %}
-               <li><a href="{% url influences_character_detail character.id %}">{{ character.name }}</a></li>
-       {% endfor %}
-       </ul>
-{% else %}
-       <p>{% trans "No characters. Add a character first, so you can submit your influences." %}</p>
-{% endif %}
-
-<p><a href="{% url influences_add_character %}">{% trans "Add character" %}</a></p>
-
+{% include "influences/character_list_block.html" %}
 {% endblock %}

diff --git a/templates/influences/character_list_block.html b/templates/influences/character_list_block.html
new file mode 100644 (file)
index 0000000..27ca771
--- /dev/null
+++ b/templates/influences/character_list_block.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+
+<h1>{% trans "Your characters"%}</h1>
+{% if object_list %}
+       <ul>
+       {% for character in object_list %}
+               <li><a href="{% url influences_character_detail character.id %}">{{ character.name }}</a></li>
+       {% endfor %}
+       </ul>
+{% else %}
+       <p>{% trans "No characters. Add a character first, so you can submit your influences." %}</p>
+{% endif %}
+
+<p><a href="{% url influences_add_character %}">{% trans "Add character" %}</a></p>
+

diff --git a/templates/influences/index.html b/templates/influences/index.html
index ccd2da9d670e14cd9a94b731db078011279b0028..02596e1550cdc9801760bcaedb4354159b051cc3 100644 (file)
--- a/templates/influences/index.html
+++ b/templates/influences/index.html
@@ -1,33 +1,15 @@
 {% extends "base/base.html" %}
-{% load i18n %}
 
 {% block content %}
 
-<h1>{% trans "Your characters"%}</h1>
-{% if characters %}
-       <ul>
-       {% for character in characters %}
-               <li><a href="{% url influences_character_detail character.id %}">{{ character.name }}</a></li>
-       {% endfor %}
-       </ul>
-{% else %}
-       <p>{% trans "No characters. Add a character first, so you can submit your influences." %}</p>
-{% endif %}
-
-<p><a href="{% url influences_add_character %}">{% trans "Add character" %}</a></p>
+{% with characters as object_list %}
+{% include "influences/character_list_block.html" %}
+{% endwith %}
 
 {% if characters %}
-<h1>{% trans "Your influences" %}</h1>
-{% if influences %}
-       <ul>
-       {% for influence in influences %}
-        <li><a href="{% url influences_influence_detail influence.id %}">{{influence.contact }} -- {{ influence.summary }}</a></li>
-       {% endfor %}
-       </ul>
-{% else %}
-       <p>{% trans "No influences yet." %}</p>
+{% with influences as object_list %}
+{% include "influences/influence_list_block.html" %}
+{% endwith %}
 {% endif %}
 
-<p><a href="{% url influences_add_influence %}">{% trans "Submit influence" %}</a></p>
-{% endif %}
 {% endblock %}

diff --git a/templates/influences/influence_detail.html b/templates/influences/influence_detail.html
index 17945793318f5acccf814ef54eae480be417e40f..b06ed889d46c82d81c9a52547628d9091d7c437e 100644 (file)
--- a/templates/influences/influence_detail.html
+++ b/templates/influences/influence_detail.html
@@ -2,14 +2,5 @@
 {% load i18n %}
 
 {% block content %}
-
-<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>
+{% include "influences/influence_detail_block.html" %}
 {% endblock %}

diff --git a/templates/influences/influence_detail_block.html b/templates/influences/influence_detail_block.html
new file mode 100644 (file)
index 0000000..d2c1c3a
--- /dev/null
+++ b/templates/influences/influence_detail_block.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+
+<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>

diff --git a/templates/influences/influence_list.html b/templates/influences/influence_list.html
new file mode 100644 (file)
index 0000000..3f50a1f
--- /dev/null
+++ b/templates/influences/influence_list.html
@@ -0,0 +1,5 @@
+{% extends "base/base.html" %}
+
+{% block content %}
+{% include "influences/influence_list_block.html" %}
+{% endblock %}

diff --git a/templates/influences/influence_list_block.html b/templates/influences/influence_list_block.html
new file mode 100644 (file)
index 0000000..e59216f
--- /dev/null
+++ b/templates/influences/influence_list_block.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+
+<h1>{% trans "Your influences" %}</h1>
+{% if object_list %}
+       <ul>
+       {% for influence in object_list %}
+        <li><a href="{% url influences_influence_detail influence.id %}">{{influence.contact }} -- {{ influence.summary }}</a></li>
+       {% endfor %}
+       </ul>
+{% else %}
+       <p>{% trans "No influences yet." %}</p>
+{% endif %}
+
+<p><a href="{% url influences_add_influence %}">{% trans "Submit influence" %}</a></p>