Add and link to /howto static page (no content yet).

diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po
index c8258eecd6605f4401870fad4370a5ee7693d68b..1e4cf13dd3ad765af5e76feaa9fabba6f91b820a 100644 (file)
--- a/locale/nl/LC_MESSAGES/django.po
+++ b/locale/nl/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-11-16 18:00+0100\n"
+"POT-Creation-Date: 2010-01-13 12:23+0100\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Matthijs Kooijman <matthijs@stdin.nl>\n"
 "Language-Team: N/A\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Matthijs Kooijman <matthijs@stdin.nl>\n"
 "Language-Team: N/A\n"


@@ -150,7 +150,7 @@ msgstr "Todo"
 msgid "Long term"
 msgstr "Lange termijn"
 
 msgid "Long term"
 msgstr "Lange termijn"
 

-#: influences/models.py:49
+#: influences/models.py:49 templates/influences/influence_detail.html:15

 #: templates/influences/email/influence_changed.html:39
 msgid "Result"
 msgstr "Resultaat"
 #: templates/influences/email/influence_changed.html:39
 msgid "Result"
 msgstr "Resultaat"


@@ -202,7 +202,7 @@ msgstr ""
 
 #: templates/admin/influences/influence/change_form.html:7
 #: templates/admin/influences/influence/comments.html:14
 
 #: templates/admin/influences/influence/change_form.html:7
 #: templates/admin/influences/influence/comments.html:14

-#: templates/influences/influence_detail.html:15
+#: templates/influences/influence_detail.html:18

 msgid "Comments"
 msgstr "Commentaar"
 
 msgid "Comments"
 msgstr "Commentaar"
 


@@ -216,16 +216,16 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: templates/base/base.html:27 templates/base/login.html:11
+#: templates/base/base.html:30 templates/base/login.html:11

 #, python-format
 msgid "You are currently logged in as %(username)s"
 msgstr "Je bent nu ingelogd als %(username)s"
 
 #, python-format
 msgid "You are currently logged in as %(username)s"
 msgstr "Je bent nu ingelogd als %(username)s"
 

-#: templates/base/base.html:28 templates/base/login.html:12
+#: templates/base/base.html:31 templates/base/login.html:12

 msgid "Logout"
 msgstr "Uitloggen"
 
 msgid "Logout"
 msgstr "Uitloggen"
 

-#: templates/base/base.html:30
+#: templates/base/base.html:33

 msgid "Please login"
 msgstr "Log alsjeblieft in"
 
 msgid "Please login"
 msgstr "Log alsjeblieft in"
 


@@ -291,7 +291,19 @@ msgstr ""
 "wil bereiken\n"
 "en <em>hoe</em> hij of zij dat denkt te gaan doen."
 
 "wil bereiken\n"
 "en <em>hoe</em> hij of zij dat denkt te gaan doen."
 

-#: templates/influences/add_influence.html:16
+#: templates/influences/add_influence.html:17
+#, python-format
+msgid ""
+"Don't forget to <a href=\"%(howto_url)s\">read the\n"
+"manual</a> for some hints and examples about when and how to create an\n"
+"influence (and when it is <i>not</i> needed to do so)."
+msgstr ""
+"Vergeet niet <a href=\"%(howto_url)s\">de handleiding te lezen</a>.\n"
+"De handleiding bevat hints en voorbeelden over wanneer en hoe je\n"
+"invloeden moet indienen (en wanneer het <i>niet</i> nodig is om dat\n"
+"te doen)."
+
+#: templates/influences/add_influence.html:22

 msgid ""
 "After you have submitted the influence, you will receive\n"
 "a summary by email. When the SLs change something about the influence,\n"
 msgid ""
 "After you have submitted the influence, you will receive\n"
 "a summary by email. When the SLs change something about the influence,\n"


@@ -301,7 +313,7 @@ msgstr ""
 "per e-mail. Zodra de SLs iets veranderen aan de invloed, of afhandelen,\n"
 "ontvang je weer een e-mail."
 
 "per e-mail. Zodra de SLs iets veranderen aan de invloed, of afhandelen,\n"
 "ontvang je weer een e-mail."
 

-#: templates/influences/add_influence.html:24
+#: templates/influences/add_influence.html:30

 msgid "Submit"
 msgstr "Indienen"
 
 msgid "Submit"
 msgstr "Indienen"
 


@@ -500,7 +512,7 @@ msgid "The influence has been modified. The current status is"
 msgstr "De invloed is veranderd. De status is nu"
 
 #: templates/influences/email/influence_changed.html:46
 msgstr "De invloed is veranderd. De status is nu"
 
 #: templates/influences/email/influence_changed.html:46

-#: templates/influences/email/influence_comment_added.html:26
+#: templates/influences/email/influence_comment_added.html:25

 msgid "View the influence and comments here:"
 msgstr "Bekijk de invloed en het commentaar hier:"
 
 msgid "View the influence and comments here:"
 msgstr "Bekijk de invloed en het commentaar hier:"
 

diff --git a/templates/base/base.html b/templates/base/base.html
index ac838bb56184c645ad02f47ef69b1f58847723ae..c5405a9255971c49ff2501c76d47401f3bf0144e 100644 (file)
--- a/templates/base/base.html
+++ b/templates/base/base.html
@@ -51,6 +51,7 @@
                <div class="navleftbox">
                <ul>
                        <li><a href="/influences/">Home</a></li>
                <div class="navleftbox">
                <ul>
                        <li><a href="/influences/">Home</a></li>

+                       <li><a href="/influences/howto">Hoe werkt Xerxes?</a></li>

                        <li><a href="/accounts/logout/">Logout</a></li>
                </ul>
                </div>
                        <li><a href="/accounts/logout/">Logout</a></li>
                </ul>
                </div>

diff --git a/templates/influences/add_influence.html b/templates/influences/add_influence.html
index 1a3bb01ba7ca75d9fb738fe5205116e48a02dadb..9f019c96673e6e2fc58217adeb2c5b74b13d3b14 100644 (file)
--- a/templates/influences/add_influence.html
+++ b/templates/influences/add_influence.html
@@ -13,6 +13,12 @@ add a clear description of <em>what</em> your character wants to achieve
 and <em>how</em> he or she plans to achieve it.{% endblocktrans %}
 </p>
 <p>
 and <em>how</em> he or she plans to achieve it.{% endblocktrans %}
 </p>
 <p>

+{% url influences_howto as howto_url %}
+{% blocktrans %}Don't forget to <a href="{{ howto_url }}">read the
+manual</a> for some hints and examples about when and how to create an
+influence (and when it is <i>not</i> needed to do so).{% endblocktrans %}
+</p>
+<p>

 {% blocktrans %}After you have submitted the influence, you will receive
 a summary by email. When the SLs change something about the influence,
 or add a resolution, you will again be notified by email.{% endblocktrans %}
 {% blocktrans %}After you have submitted the influence, you will receive
 a summary by email. When the SLs change something about the influence,
 or add a resolution, you will again be notified by email.{% endblocktrans %}

diff --git a/templates/influences/howto.html b/templates/influences/howto.html
new file mode 100644 (file)
index 0000000..23b4583
--- /dev/null
+++ b/templates/influences/howto.html
@@ -0,0 +1,6 @@
+{% extends "base/base.html" %}
+{% load i18n %}
+
+{% block content %}
+<h1>Hoe werkt Xerxes?</h1>
+{% endblock %}

diff --git a/urls.py b/urls.py
index bbc54680e93a86707869989232a109c8d8349b3e..d5d9c078f6cd9fdcf7948ef5a9859a3c5523bbba 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -28,6 +28,8 @@ urlpatterns = patterns('',
     url(r'^influences/character/(?P<object_id>\d+)/$', 'xerxes.influences.views.character_detail', name='influences_character_detail'),
     url(r'^influences/character/add/$', 'xerxes.influences.views.add_character', name='influences_add_character'),
 
     url(r'^influences/character/(?P<object_id>\d+)/$', 'xerxes.influences.views.character_detail', name='influences_character_detail'),
     url(r'^influences/character/add/$', 'xerxes.influences.views.add_character', name='influences_add_character'),
 

+    url(r'^influences/howto$', 'django.views.generic.simple.direct_to_template', {'template': 'influences/howto.html'}, name='influences_howto'),
+

     url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'),
     url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
 )
     url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'),
     url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
 )