projects
/
matthijs
/
projects
/
xerxes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
400ad61
)
* Let all the influences templates extend the base template.
author
Matthijs Kooijman
<matthijs@stdin.nl>
Wed, 23 Jan 2008 20:40:32 +0000
(21:40 +0100)
committer
Matthijs Kooijman
<matthijs@stdin.nl>
Wed, 23 Jan 2008 20:40:32 +0000
(21:40 +0100)
templates/influences/add.html
patch
|
blob
|
history
templates/influences/add_character.html
patch
|
blob
|
history
templates/influences/character_detail.html
patch
|
blob
|
history
templates/influences/character_list.html
patch
|
blob
|
history
templates/influences/index.html
patch
|
blob
|
history
diff --git
a/templates/influences/add.html
b/templates/influences/add.html
index db277e916aa326f49d673410eadcf46df080ee1b..3c6c866781810ff30eaebea6af53ae58384367af 100644
(file)
--- a/
templates/influences/add.html
+++ b/
templates/influences/add.html
@@
-1,4
+1,8
@@
{% load i18n %}
{% load i18n %}
+{% extends "base/base.html" %}
+
+{% block content %}
+
<h2>{% trans "Submit influence" %}</h2>
{% if message %}
{{ message }}
<h2>{% trans "Submit influence" %}</h2>
{% if message %}
{{ message }}
@@
-11,3
+15,5
@@
<input type="submit" value="{% trans "Submit" %}"/>
</form>
{% endif %}
<input type="submit" value="{% trans "Submit" %}"/>
</form>
{% endif %}
+
+{% endblock %}
diff --git
a/templates/influences/add_character.html
b/templates/influences/add_character.html
index 2691084d8d8342ccf9965f6df01a106a3e819861..1b229c2d54e18377bbad87880d879d6ef79be156 100644
(file)
--- a/
templates/influences/add_character.html
+++ b/
templates/influences/add_character.html
@@
-1,4
+1,7
@@
{% load i18n %}
{% load i18n %}
+{% extends "base/base.html" %}
+
+{% block content %}
<h2>{% trans "Add a character" %}</h2>
{% if message %}
{{ message }}
<h2>{% trans "Add a character" %}</h2>
{% if message %}
{{ message }}
@@
-11,3
+14,4
@@
<input type="submit" value="{% trans "Add" %}"/>
</form>
{% endif %}
<input type="submit" value="{% trans "Add" %}"/>
</form>
{% endif %}
+{% endblock %}
diff --git
a/templates/influences/character_detail.html
b/templates/influences/character_detail.html
index f6c1490270a7d255f2d5a4dc31c6026b8824f068..f5071c23b6532bf0d0a0b8ab03df094e280a528e 100644
(file)
--- a/
templates/influences/character_detail.html
+++ b/
templates/influences/character_detail.html
@@
-1,4
+1,8
@@
{% load i18n %}
{% load i18n %}
+{% extends "base/base.html" %}
+
+{% block content %}
+
<h2>{{ object.name }}</h2>
<h3>{% blocktrans with object.name as name %}Influences for {{ name }}{% endblocktrans %}</h3>
<ul>
<h2>{{ object.name }}</h2>
<h3>{% blocktrans with object.name as name %}Influences for {{ name }}{% endblocktrans %}</h3>
<ul>
@@
-8,3
+12,5
@@
</ul>
<a href="../../add/{{ object.id }}">{% trans "Submit influence" %}</a>
</ul>
<a href="../../add/{{ object.id }}">{% trans "Submit influence" %}</a>
+
+{% endblock %}
diff --git
a/templates/influences/character_list.html
b/templates/influences/character_list.html
index 6673138cc4f2416b18492b86080ca548f07fe2c7..0ca1f29f6131ccea95d3761581b4932f82436486 100644
(file)
--- a/
templates/influences/character_list.html
+++ b/
templates/influences/character_list.html
@@
-1,4
+1,8
@@
{% load i18n %}
{% load i18n %}
+{% extends "base/base.html" %}
+
+{% block content %}
+
<h2>{% trans "Your characters"%}</h2>
{% if object_list %}
<ul>
<h2>{% trans "Your characters"%}</h2>
{% if object_list %}
<ul>
@@
-11,3
+15,5
@@
{% endif %}
<p><a href="character/add">{% trans "Add character" %}</a></p>
{% endif %}
<p><a href="character/add">{% trans "Add character" %}</a></p>
+
+{% endblock %}
diff --git
a/templates/influences/index.html
b/templates/influences/index.html
index e95fd02e1f1aff6b00e8112e02d37847ccc7f598..2cfb5a1a4a2b4a11e47f4935310fed5f03c48313 100644
(file)
--- a/
templates/influences/index.html
+++ b/
templates/influences/index.html
@@
-1,4
+1,8
@@
{% load i18n %}
{% load i18n %}
+{% extends "base/base.html" %}
+
+{% block content %}
+
<h2>{% trans "Your characters"%}</h2>
{% if characters %}
<ul>
<h2>{% trans "Your characters"%}</h2>
{% if characters %}
<ul>
@@
-26,3
+30,5
@@
{% endif %}
<p><a href="add">{% trans "Submit influence" %}</a></p>
{% endif %}
<p><a href="add">{% trans "Submit influence" %}</a></p>
+
+{% endblock %}