Rename main block.

registration_templates/locale/ca/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-23 14:18+0200\n"
+"POT-Creation-Date: 2013-07-15 12:00+0200\n"
 "PO-Revision-Date: 2013-05-14 09:32+0200\n"
 "Last-Translator: Joan <aseques@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -22,7 +22,7 @@ msgid "Account successfully activated"
 msgstr "Compte correctament activat"
 
 #: templates/registration/activate.html:11
-#: templates/registration/login.html:10
+#: templates/registration/login.html:11
 #: templates/registration/password_reset_complete.html:9
 msgid "Log in"
 msgstr "Entrar"
@@ -48,19 +48,23 @@ msgstr "L'enllaç és vàlid per %(expiration_days)s dies."
 msgid "Account activation on"
 msgstr "Activació del compte a"
 
-#: templates/registration/login.html:14
+#: templates/registration/login.html:6
+msgid "Login"
+msgstr "Entrar"
+
+#: templates/registration/login.html:16
 msgid "Forgot password"
 msgstr "Recuperar la contrasenya"
 
-#: templates/registration/login.html:14
+#: templates/registration/login.html:16
 msgid "Reset it"
 msgstr "Reiniciar-la"
 
-#: templates/registration/login.html:15
+#: templates/registration/login.html:17
 msgid "Not member"
 msgstr "Encara no sou membre"
 
-#: templates/registration/login.html:15
+#: templates/registration/login.html:17
 msgid "Register"
 msgstr "Registrar-se"
 
@@ -254,9 +258,6 @@ msgstr "Ja esteu registrat. S'ha enviat el correu d'activació."
 #~ msgid "Logout"
 #~ msgstr "Sortir"
 
-#~ msgid "Login"
-#~ msgstr "Entrar"
-
 #~ msgid "Nuages is brought to you by"
 #~ msgstr "Nuages ús ha arribat a través de"
 

registration_templates/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-23 14:19+0200\n"
+"POT-Creation-Date: 2013-07-15 12:00+0200\n"
 "PO-Revision-Date: 2010-10-24 22:27+0100\n"
 "Last-Translator: Christophe Siraut <chris@tobald.eu.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgid "Account successfully activated"
 msgstr "Le comte a été activé avec succès"
 
 #: templates/registration/activate.html:11
-#: templates/registration/login.html:10
+#: templates/registration/login.html:11
 #: templates/registration/password_reset_complete.html:9
 msgid "Log in"
 msgstr "S'authentifier"
@@ -47,19 +47,23 @@ msgstr ""
 msgid "Account activation on"
 msgstr ""
 
-#: templates/registration/login.html:14
+#: templates/registration/login.html:6
+msgid "Login"
+msgstr "S'authentifier"
+
+#: templates/registration/login.html:16
 msgid "Forgot password"
 msgstr "J'ai oublié mon mot-de-passe"
 
-#: templates/registration/login.html:14
+#: templates/registration/login.html:16
 msgid "Reset it"
 msgstr "Réinitialiser"
 
-#: templates/registration/login.html:15
+#: templates/registration/login.html:17
 msgid "Not member"
 msgstr "Pas encore membre"
 
-#: templates/registration/login.html:15
+#: templates/registration/login.html:17
 msgid "Register"
 msgstr "S'enregistrer"
 
@@ -251,9 +255,6 @@ msgstr "Vous êtes maintenant enregistré. Un email d'activation a été envoyé
 #~ msgid "Logout"
 #~ msgstr "Se déconnecter"
 
-#~ msgid "Login"
-#~ msgstr "S'authentifier"
-
 #~ msgid "Nuages is brought to you by"
 #~ msgstr "Un outil proposé par"
 

registration_templates/locale/nl/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-23 14:19+0200\n"
+"POT-Creation-Date: 2013-07-15 12:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid "Account successfully activated"
 msgstr ""
 
 #: templates/registration/activate.html:11
-#: templates/registration/login.html:10
+#: templates/registration/login.html:11
 #: templates/registration/password_reset_complete.html:9
 msgid "Log in"
 msgstr ""
@@ -48,20 +48,25 @@ msgstr ""
 msgid "Account activation on"
 msgstr ""
 
-#: templates/registration/login.html:14
+#: templates/registration/login.html:6
+#, fuzzy
+msgid "Login"
+msgstr "Login"
+
+#: templates/registration/login.html:16
 #, fuzzy
 msgid "Forgot password"
 msgstr "Oude wachtwoord"
 
-#: templates/registration/login.html:14
+#: templates/registration/login.html:16
 msgid "Reset it"
 msgstr ""
 
-#: templates/registration/login.html:15
+#: templates/registration/login.html:17
 msgid "Not member"
 msgstr ""
 
-#: templates/registration/login.html:15
+#: templates/registration/login.html:17
 #, fuzzy
 msgid "Register"
 msgstr "registreer"
@@ -190,10 +195,6 @@ msgstr ""
 #~ msgid "Logout"
 #~ msgstr "Logout"
 
-#, fuzzy
-#~ msgid "Login"
-#~ msgstr "Login"
-
 #~ msgid "Nuages is brought to you by"
 #~ msgstr "Nuages is gemaakt door"
 

registration_templates/templates/registration/activate.html

@@ -2,7 +2,7 @@
 {% load url from future %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 
 {% if account %}
 

registration_templates/templates/registration/activation_complete.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load url from future %}
 
-{% block content %}
+{% block main %}
 
   <h2>Success</h2>
   <p class="filet">{% trans 'Your account has been created. You may now login.' %}</p>

registration_templates/templates/registration/login.html

@@ -2,13 +2,17 @@
 {% load url from future %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
+<h1>{% trans "Authentication" %}</h1>
+<p class="lead">{% trans "Fill in the form with your credentials." %}</p>
 <form method="post" action=".">
-  {% csrf_token %}
-  {{ form.as_p }}
+    {% csrf_token %}
+    <table>
+        {{ form }}
 
-  <input type="submit" value="{% trans 'Log in' %}" />
-  <input type="hidden" name="next" value="{{ next }}" />
+        <tr><th><label class="hide">&nbsp;</label></th><td><input type="submit" value="{% trans 'Log in' %}" class="btn" /></td></tr>
+        <input type="hidden" name="next" value="{{ next }}" />
+    </table>
 </form>
 <br />
 <p>{% trans "Forgot password" %}? <a href="{% url 'auth_password_reset' %}">{% trans "Reset it" %}</a>!</p>

registration_templates/templates/registration/logout.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 <p>{% trans "Logged out" %}</p>
 {% endblock %}

registration_templates/templates/registration/password_change_done.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 <p>{% trans "Password changed" %}</p>
 {% endblock %}

registration_templates/templates/registration/password_change_form.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 <form method="post" action=".">
   {% csrf_token %}
   {{ form.as_p }}

registration_templates/templates/registration/password_reset_complete.html

@@ -2,7 +2,7 @@
 {% load url from future %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 
 <p>{% trans "Password reset successfully" %}</p>
 

registration_templates/templates/registration/password_reset_confirm.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 
 {% if validlink %}
 

registration_templates/templates/registration/password_reset_done.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 <p>{% trans "Email with password reset instructions has been sent." %}</p>
 {% endblock %}

registration_templates/templates/registration/password_reset_form.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 <form method="post" action=".">
   {% csrf_token %}
   {{ form.as_p }}

registration_templates/templates/registration/registration_complete.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block main %}
 <p>{% trans "You are now registered. Activation email sent." %}</p>
 {% endblock %}

registration_templates/templates/registration/registration_form.html

 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
-<form method="post" action=".">
-  {% csrf_token %}
-  {{ form.as_p }}
+{% block title %}Nuages - Create an account{% endblock %}
 
-  <input type="submit" value="{% trans 'Submit' %}" />
+{% block main %}
+<h1>{% trans "Account creation" %}</h1>
+<p class="lead">{% trans "Fill in the form to create an account." %}</p>
+
+<form action="" method="post"> {% csrf_token %}
+    <table>
+        {{ form }}
+
+        <tr><th><label class="hide">&nbsp;</label></th><td><input type="submit" value="Create the account" class="btn"></td></tr>
+    </table>
 </form>
 {% endblock %}
+