From 4facb63796aa14a0ed0a0dbe373b1fbba6361b09 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Wed, 13 Jan 2010 11:43:19 +0100 Subject: [PATCH] Add and link to /howto static page (no content yet). --- locale/nl/LC_MESSAGES/django.po | 30 +++++++++++++++++-------- templates/base/base.html | 1 + templates/influences/add_influence.html | 6 +++++ templates/influences/howto.html | 6 +++++ urls.py | 2 ++ 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 templates/influences/howto.html diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index c8258ee..1e4cf13 100644 --- 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" -"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 \n" "Language-Team: N/A\n" @@ -150,7 +150,7 @@ msgstr "Todo" 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" @@ -202,7 +202,7 @@ msgstr "" #: 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" @@ -216,16 +216,16 @@ 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" -#: templates/base/base.html:28 templates/base/login.html:12 +#: templates/base/base.html:31 templates/base/login.html:12 msgid "Logout" msgstr "Uitloggen" -#: templates/base/base.html:30 +#: templates/base/base.html:33 msgid "Please login" msgstr "Log alsjeblieft in" @@ -291,7 +291,19 @@ msgstr "" "wil bereiken\n" "en hoe 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 read the\n" +"manual for some hints and examples about when and how to create an\n" +"influence (and when it is not needed to do so)." +msgstr "" +"Vergeet niet de handleiding te lezen.\n" +"De handleiding bevat hints en voorbeelden over wanneer en hoe je\n" +"invloeden moet indienen (en wanneer het niet 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" @@ -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." -#: templates/influences/add_influence.html:24 +#: templates/influences/add_influence.html:30 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 -#: 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:" diff --git a/templates/base/base.html b/templates/base/base.html index ac838bb..c5405a9 100644 --- a/templates/base/base.html +++ b/templates/base/base.html @@ -51,6 +51,7 @@
diff --git a/templates/influences/add_influence.html b/templates/influences/add_influence.html index 1a3bb01..9f019c9 100644 --- a/templates/influences/add_influence.html +++ b/templates/influences/add_influence.html @@ -13,6 +13,12 @@ add a clear description of what your character wants to achieve and how he or she plans to achieve it.{% endblocktrans %}

+{% url influences_howto as howto_url %} +{% blocktrans %}Don't forget to read the +manual for some hints and examples about when and how to create an +influence (and when it is not needed to do so).{% 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 index 0000000..23b4583 --- /dev/null +++ b/templates/influences/howto.html @@ -0,0 +1,6 @@ +{% extends "base/base.html" %} +{% load i18n %} + +{% block content %} +

Hoe werkt Xerxes?

+{% endblock %} diff --git a/urls.py b/urls.py index bbc5468..d5d9c07 100644 --- a/urls.py +++ b/urls.py @@ -28,6 +28,8 @@ urlpatterns = patterns('', url(r'^influences/character/(?P\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'), ) -- 2.30.2