diff options
-rw-r--r-- | ishtar/locale/fr/LC_MESSAGES/django.po | 6 | ||||
-rw-r--r-- | ishtar/templates/registration/activate.html | 4 | ||||
-rw-r--r-- | ishtar/templates/registration/login.html | 1 | ||||
-rw-r--r-- | ishtar/templates/registration/logout.html | 2 | ||||
-rw-r--r-- | ishtar/templates/registration/password_change_done.html | 2 | ||||
-rw-r--r-- | ishtar/templates/registration/password_change_form.html | 8 | ||||
-rw-r--r-- | ishtar/templates/registration/password_reset_complete.html | 4 | ||||
-rw-r--r-- | ishtar/templates/registration/password_reset_confirm.html | 15 | ||||
-rw-r--r-- | ishtar/templates/registration/password_reset_done.html | 2 | ||||
-rw-r--r-- | ishtar/templates/registration/password_reset_form.html | 9 | ||||
-rw-r--r-- | ishtar/templates/registration/registration_complete.html | 2 | ||||
-rw-r--r-- | ishtar/templates/registration/registration_form.html | 10 | ||||
-rw-r--r-- | media/style.css | 15 |
13 files changed, 62 insertions, 18 deletions
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po index a5b4ec316..0511a59cd 100644 --- a/ishtar/locale/fr/LC_MESSAGES/django.po +++ b/ishtar/locale/fr/LC_MESSAGES/django.po @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" +msgid "username" +msgstr "identifiant" + +msgid "email address" +msgstr "courriel" + #: __init__.py:2 furnitures/__init__.py:2 msgid "Furnitures" msgstr "Mobilier" diff --git a/ishtar/templates/registration/activate.html b/ishtar/templates/registration/activate.html index e85121e05..0dcbccc00 100644 --- a/ishtar/templates/registration/activate.html +++ b/ishtar/templates/registration/activate.html @@ -2,7 +2,7 @@ {% load i18n %} {% block content %} - +<div class='info'> {% if account %} <p>{% trans "Account successfully activated" %}</p> @@ -14,5 +14,5 @@ <p>{% trans "Account activation failed" %}</p> {% endif %} - +</div> {% endblock %} diff --git a/ishtar/templates/registration/login.html b/ishtar/templates/registration/login.html index 8c5c51670..ada4f6aa9 100644 --- a/ishtar/templates/registration/login.html +++ b/ishtar/templates/registration/login.html @@ -5,6 +5,7 @@ <div class='form'> <form method="post" action=".">{% csrf_token %} <table id='login'> + <caption>{%trans "Log in"%}</caption> {{ form.as_table }} <tr class='submit'><td colspan='2'><input type="submit" value="{% trans 'Log in' %}" /></td></tr> <input type="hidden" name="next" value="{{ next }}" /> diff --git a/ishtar/templates/registration/logout.html b/ishtar/templates/registration/logout.html index f8da51fa0..399d8c343 100644 --- a/ishtar/templates/registration/logout.html +++ b/ishtar/templates/registration/logout.html @@ -2,5 +2,7 @@ {% load i18n %} {% block content %} +<div class='form'> <p>{% trans "Logged out" %}</p> +</div> {% endblock %} diff --git a/ishtar/templates/registration/password_change_done.html b/ishtar/templates/registration/password_change_done.html index 659be0a46..9d442360c 100644 --- a/ishtar/templates/registration/password_change_done.html +++ b/ishtar/templates/registration/password_change_done.html @@ -2,5 +2,7 @@ {% load i18n %} {% block content %} +<div class='info'> <p>{% trans "Password changed" %}</p> +</div> {% endblock %} diff --git a/ishtar/templates/registration/password_change_form.html b/ishtar/templates/registration/password_change_form.html index ec782424f..84d915eaa 100644 --- a/ishtar/templates/registration/password_change_form.html +++ b/ishtar/templates/registration/password_change_form.html @@ -2,9 +2,13 @@ {% load i18n %} {% block content %} +<div class='form'> <form method="post" action=".">{% csrf_token %} - {{ form.as_p }} + <table> + {{ form.as_table }} - <input type="submit" value="{% trans 'Submit' %}" /> + <tr><td colspan='2'><input type="submit" value="{% trans 'Submit' %}" /></td></tr> + </table> </form> +</p> {% endblock %} diff --git a/ishtar/templates/registration/password_reset_complete.html b/ishtar/templates/registration/password_reset_complete.html index ef3637c70..dfa3ce682 100644 --- a/ishtar/templates/registration/password_reset_complete.html +++ b/ishtar/templates/registration/password_reset_complete.html @@ -2,9 +2,9 @@ {% load i18n %} {% block content %} - +<div class='info'> <p>{% trans "Password reset successfully" %}</p> <p><a href="{% url auth_login %}">{% trans "Log in" %}</a></p> - +</div> {% endblock %} diff --git a/ishtar/templates/registration/password_reset_confirm.html b/ishtar/templates/registration/password_reset_confirm.html index 53e1f8359..b0e2cc142 100644 --- a/ishtar/templates/registration/password_reset_confirm.html +++ b/ishtar/templates/registration/password_reset_confirm.html @@ -4,17 +4,18 @@ {% block content %} {% if validlink %} - +<div class='form'> <form method="post" action=".">{% csrf_token %} - {{ form.as_p }} - - <input type="submit" value="{% trans 'Submit' %}" /> + <table> + {{ form.as_table }} + <tr><td colspan='2'><input type="submit" value="{% trans 'Submit' %}" /></td></tr> + </table> </form> - +</div> {% else %} - +<div class='info'> <p>{% trans "Password reset failed" %}</p> - +</div> {% endif %} {% endblock %} diff --git a/ishtar/templates/registration/password_reset_done.html b/ishtar/templates/registration/password_reset_done.html index 6057ccbe1..cc7d9b40e 100644 --- a/ishtar/templates/registration/password_reset_done.html +++ b/ishtar/templates/registration/password_reset_done.html @@ -2,5 +2,7 @@ {% load i18n %} {% block content %} +<div class='info'> <p>{% trans "Email with password reset instructions has been sent." %}</p> +</div> {% endblock %} diff --git a/ishtar/templates/registration/password_reset_form.html b/ishtar/templates/registration/password_reset_form.html index ec782424f..d6fad7a0a 100644 --- a/ishtar/templates/registration/password_reset_form.html +++ b/ishtar/templates/registration/password_reset_form.html @@ -2,9 +2,14 @@ {% load i18n %} {% block content %} +<div class='form'> <form method="post" action=".">{% csrf_token %} - {{ form.as_p }} + <caption>{% trans "Reset password" %}</caption> + <table> + {{ form.as_table }} - <input type="submit" value="{% trans 'Submit' %}" /> + <tr><td colspan='2'><input type="submit" value="{% trans 'Submit' %}" /></td></tr> + </table> </form> +</div> {% endblock %} diff --git a/ishtar/templates/registration/registration_complete.html b/ishtar/templates/registration/registration_complete.html index 3d3d9507b..e9f487444 100644 --- a/ishtar/templates/registration/registration_complete.html +++ b/ishtar/templates/registration/registration_complete.html @@ -2,5 +2,7 @@ {% load i18n %} {% block content %} +<div class='info'> <p>{% trans "You are now registered. Activation email sent." %}</p> +</div> {% endblock %} diff --git a/ishtar/templates/registration/registration_form.html b/ishtar/templates/registration/registration_form.html index ec782424f..b15f0e74b 100644 --- a/ishtar/templates/registration/registration_form.html +++ b/ishtar/templates/registration/registration_form.html @@ -2,9 +2,13 @@ {% load i18n %} {% block content %} +<div class='form'> <form method="post" action=".">{% csrf_token %} - {{ form.as_p }} - - <input type="submit" value="{% trans 'Submit' %}" /> + <table> + <caption>{% trans "Register" %}</caption> + {{ form.as_table }} + <tr><td colspan='2'><input type="submit" value="{% trans 'Submit' %}" /></td></tr> + </table> </form> +</div> {% endblock %} diff --git a/media/style.css b/media/style.css index fc2a87f1f..5aa9875a1 100644 --- a/media/style.css +++ b/media/style.css @@ -8,6 +8,21 @@ body{ background-position:right top; } +a { + text-decoration:none; + color:#D14; +} + +caption { + color:#922; + font-weight:bold; +} + +label{display:block} + +label:first-letter { + text-transform: uppercase; +} div#header{ width:100%; |