From 23761b3d257b9552b662ed03ed695df2d62de193 Mon Sep 17 00:00:00 2001 From: Llloooggg Date: Tue, 19 Apr 2022 23:46:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B0=D0=B5=D0=BC=D1=8B=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BA=20bootstrap-=D0=B2=D0=B8=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 + wheretogo/locale/ru/LC_MESSAGES/django.po | 386 ++++++++++++++++++ .../templates/account/account_inactive.html | 11 - wheretogo/templates/account/base.html | 40 -- wheretogo/templates/account/email.html | 74 ---- .../templates/account/email/base_message.txt | 7 - .../email/email_confirmation_message.txt | 7 - .../email_confirmation_signup_message.txt | 1 - .../email_confirmation_signup_subject.txt | 1 - .../email/email_confirmation_subject.txt | 4 - .../email/password_reset_key_message.txt | 9 - .../email/password_reset_key_subject.txt | 4 - .../account/email/unknown_account_message.txt | 12 - .../account/email/unknown_account_subject.txt | 4 - .../templates/account/email_confirm.html | 31 -- wheretogo/templates/account/login.html | 61 +-- wheretogo/templates/account/logout.html | 26 +- .../messages/cannot_delete_primary_email.txt | 2 - .../messages/email_confirmation_sent.txt | 2 - .../account/messages/email_confirmed.txt | 2 - .../account/messages/email_deleted.txt | 2 - .../templates/account/messages/logged_in.txt | 4 - .../templates/account/messages/logged_out.txt | 2 - .../account/messages/password_changed.txt | 2 - .../account/messages/password_set.txt | 2 - .../account/messages/primary_email_set.txt | 2 - .../messages/unverified_primary_email.txt | 2 - .../templates/account/password_change.html | 16 - .../templates/account/password_reset.html | 24 -- .../account/password_reset_done.html | 16 - .../account/password_reset_from_key.html | 19 - .../account/password_reset_from_key_done.html | 9 - wheretogo/templates/account/password_set.html | 15 - wheretogo/templates/account/signup.html | 29 +- .../templates/account/signup_closed.html | 11 - .../account/snippets/already_logged_in.html | 5 - .../templates/account/verification_sent.html | 12 - .../account/verified_email_required.html | 23 -- wheretogo/templates/common/base.html | 15 +- wheretogo/templates/common/index.html | 4 +- wheretogo/wheretogo/settings.py | 20 + 41 files changed, 491 insertions(+), 429 deletions(-) create mode 100644 wheretogo/locale/ru/LC_MESSAGES/django.po delete mode 100644 wheretogo/templates/account/account_inactive.html delete mode 100644 wheretogo/templates/account/base.html delete mode 100644 wheretogo/templates/account/email.html delete mode 100644 wheretogo/templates/account/email/base_message.txt delete mode 100644 wheretogo/templates/account/email/email_confirmation_message.txt delete mode 100644 wheretogo/templates/account/email/email_confirmation_signup_message.txt delete mode 100644 wheretogo/templates/account/email/email_confirmation_signup_subject.txt delete mode 100644 wheretogo/templates/account/email/email_confirmation_subject.txt delete mode 100644 wheretogo/templates/account/email/password_reset_key_message.txt delete mode 100644 wheretogo/templates/account/email/password_reset_key_subject.txt delete mode 100644 wheretogo/templates/account/email/unknown_account_message.txt delete mode 100644 wheretogo/templates/account/email/unknown_account_subject.txt delete mode 100644 wheretogo/templates/account/email_confirm.html delete mode 100644 wheretogo/templates/account/messages/cannot_delete_primary_email.txt delete mode 100644 wheretogo/templates/account/messages/email_confirmation_sent.txt delete mode 100644 wheretogo/templates/account/messages/email_confirmed.txt delete mode 100644 wheretogo/templates/account/messages/email_deleted.txt delete mode 100644 wheretogo/templates/account/messages/logged_in.txt delete mode 100644 wheretogo/templates/account/messages/logged_out.txt delete mode 100644 wheretogo/templates/account/messages/password_changed.txt delete mode 100644 wheretogo/templates/account/messages/password_set.txt delete mode 100644 wheretogo/templates/account/messages/primary_email_set.txt delete mode 100644 wheretogo/templates/account/messages/unverified_primary_email.txt delete mode 100644 wheretogo/templates/account/password_change.html delete mode 100644 wheretogo/templates/account/password_reset.html delete mode 100644 wheretogo/templates/account/password_reset_done.html delete mode 100644 wheretogo/templates/account/password_reset_from_key.html delete mode 100644 wheretogo/templates/account/password_reset_from_key_done.html delete mode 100644 wheretogo/templates/account/password_set.html delete mode 100644 wheretogo/templates/account/signup_closed.html delete mode 100644 wheretogo/templates/account/snippets/already_logged_in.html delete mode 100644 wheretogo/templates/account/verification_sent.html delete mode 100644 wheretogo/templates/account/verified_email_required.html diff --git a/requirements.txt b/requirements.txt index eda7f1d..25a705e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,12 @@ asgiref==3.5.0 certifi==2021.10.8 cffi==1.15.0 charset-normalizer==2.0.12 +crispy-bootstrap5==0.6 cryptography==36.0.2 defusedxml==0.7.1 Django==4.0.3 django-allauth==0.50.0 +django-crispy-forms==1.14.0 idna==3.3 oauthlib==3.2.0 pycparser==2.21 diff --git a/wheretogo/locale/ru/LC_MESSAGES/django.po b/wheretogo/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 0000000..5070582 --- /dev/null +++ b/wheretogo/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,386 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-04-19 22:02+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" +#: .\templates\account\account_inactive.html:5 +#: .\templates\account\account_inactive.html:8 +msgid "Account Inactive" +msgstr "" + +#: .\templates\account\account_inactive.html:10 +msgid "This account is inactive." +msgstr "" + +#: .\templates\account\email.html:5 .\templates\account\email.html:8 +msgid "E-mail Addresses" +msgstr "" + +#: .\templates\account\email.html:10 +msgid "The following e-mail addresses are associated with your account:" +msgstr "" + +#: .\templates\account\email.html:24 +msgid "Verified" +msgstr "" + +#: .\templates\account\email.html:26 +msgid "Unverified" +msgstr "" + +#: .\templates\account\email.html:28 +msgid "Primary" +msgstr "" + +#: .\templates\account\email.html:34 +msgid "Make Primary" +msgstr "" + +#: .\templates\account\email.html:35 +msgid "Re-send Verification" +msgstr "" + +#: .\templates\account\email.html:36 +msgid "Remove" +msgstr "" + +#: .\templates\account\email.html:43 +msgid "Warning:" +msgstr "" + +#: .\templates\account\email.html:43 +msgid "" +"You currently do not have any e-mail address set up. You should really add " +"an e-mail address so you can receive notifications, reset your password, etc." +msgstr "" + +#: .\templates\account\email.html:48 +msgid "Add E-mail Address" +msgstr "" + +#: .\templates\account\email.html:53 +msgid "Add E-mail" +msgstr "" + +#: .\templates\account\email.html:63 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "" + +#: .\templates\account\email\base_message.txt:1 +#, python-format +msgid "Hello from %(site_name)s!" +msgstr "" + +#: .\templates\account\email\base_message.txt:5 +#, python-format +msgid "" +"Thank you for using %(site_name)s!\n" +"%(site_domain)s" +msgstr "" + +#: .\templates\account\email\email_confirmation_message.txt:5 +#, python-format +msgid "" +"You're receiving this e-mail because user %(user_display)s has given your e-" +"mail address to register an account on %(site_domain)s.\n" +"\n" +"To confirm this is correct, go to %(activate_url)s" +msgstr "" + +#: .\templates\account\email\email_confirmation_subject.txt:3 +msgid "Please Confirm Your E-mail Address" +msgstr "" + +#: .\templates\account\email\password_reset_key_message.txt:4 +msgid "" +"You're receiving this e-mail because you or someone else has requested a " +"password for your user account.\n" +"It can be safely ignored if you did not request a password reset. Click the " +"link below to reset your password." +msgstr "" + +#: .\templates\account\email\password_reset_key_message.txt:9 +#, python-format +msgid "In case you forgot, your username is %(username)s." +msgstr "" + +#: .\templates\account\email\password_reset_key_subject.txt:3 +#: .\templates\account\email\unknown_account_subject.txt:3 +msgid "Password Reset E-mail" +msgstr "" + +#: .\templates\account\email\unknown_account_message.txt:4 +#, python-format +msgid "" +"You are receiving this e-mail because you or someone else has requested a\n" +"password for your user account. However, we do not have any record of a " +"user\n" +"with email %(email)s in our database.\n" +"\n" +"This mail can be safely ignored if you did not request a password reset.\n" +"\n" +"If it was you, you can sign up for an account using the link below." +msgstr "" + +#: .\templates\account\email_confirm.html:6 +#: .\templates\account\email_confirm.html:10 +msgid "Confirm E-mail Address" +msgstr "" + +#: .\templates\account\email_confirm.html:16 +#, python-format +msgid "" +"Please confirm that %(email)s is an e-mail " +"address for user %(user_display)s." +msgstr "" + +#: .\templates\account\email_confirm.html:20 +msgid "Confirm" +msgstr "" + +#: .\templates\account\email_confirm.html:27 +#, python-format +msgid "" +"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." +msgstr "" + +#: .\templates\account\login.html:8 .\templates\account\login.html:17 +#: .\templates\account\login.html:44 .\templates\common\base.html:38 +msgid "Sign In" +msgstr "" + +#: .\templates\account\login.html:19 +#, python-format +msgid "" +"Please sign in with one\n" +" of your existing third party accounts. Or, sign up\n" +" for a %(site_name)s account and sign in below:" +msgstr "" + +#: .\templates\account\login.html:29 +msgid "or" +msgstr "" + +#: .\templates\account\login.html:36 +#, python-format +msgid "" +"If you have not created an account yet, then please\n" +" sign up first." +msgstr "" +"Если у вас ещё нет учётной записи, пожалуйста, сначала " +"зарегистрируйтесь." + +#: .\templates\account\login.html:45 +#: .\templates\account\password_change.html:14 +msgid "Forgot Password?" +msgstr "" + +#: .\templates\account\logout.html:5 .\templates\account\logout.html:8 +#: .\templates\account\logout.html:17 .\templates\common\base.html:33 +msgid "Sign Out" +msgstr "" + +#: .\templates\account\logout.html:10 +msgid "Are you sure you want to sign out?" +msgstr "" + +#: .\templates\account\messages\cannot_delete_primary_email.txt:2 +#, python-format +msgid "You cannot remove your primary e-mail address (%(email)s)." +msgstr "" + +#: .\templates\account\messages\email_confirmation_sent.txt:2 +#, python-format +msgid "Confirmation e-mail sent to %(email)s." +msgstr "" + +#: .\templates\account\messages\email_confirmed.txt:2 +#, python-format +msgid "You have confirmed %(email)s." +msgstr "" + +#: .\templates\account\messages\email_deleted.txt:2 +#, python-format +msgid "Removed e-mail address %(email)s." +msgstr "" + +#: .\templates\account\messages\logged_in.txt:4 +#, python-format +msgid "Successfully signed in as %(name)s." +msgstr "" + +#: .\templates\account\messages\logged_out.txt:2 +msgid "You have signed out." +msgstr "" + +#: .\templates\account\messages\password_changed.txt:2 +msgid "Password successfully changed." +msgstr "" + +#: .\templates\account\messages\password_set.txt:2 +msgid "Password successfully set." +msgstr "" + +#: .\templates\account\messages\primary_email_set.txt:2 +msgid "Primary e-mail address set." +msgstr "" + +#: .\templates\account\messages\unverified_primary_email.txt:2 +msgid "Your primary e-mail address must be verified." +msgstr "" + +#: .\templates\account\password_change.html:5 +#: .\templates\account\password_change.html:8 +#: .\templates\account\password_change.html:13 +#: .\templates\account\password_reset_from_key.html:4 +#: .\templates\account\password_reset_from_key.html:7 +#: .\templates\account\password_reset_from_key_done.html:4 +#: .\templates\account\password_reset_from_key_done.html:7 +msgid "Change Password" +msgstr "" + +#: .\templates\account\password_reset.html:6 +#: .\templates\account\password_reset.html:10 +#: .\templates\account\password_reset_done.html:6 +#: .\templates\account\password_reset_done.html:9 +msgid "Password Reset" +msgstr "" + +#: .\templates\account\password_reset.html:15 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send you " +"an e-mail allowing you to reset it." +msgstr "" + +#: .\templates\account\password_reset.html:20 +msgid "Reset My Password" +msgstr "" + +#: .\templates\account\password_reset.html:23 +msgid "Please contact us if you have any trouble resetting your password." +msgstr "" + +#: .\templates\account\password_reset_done.html:15 +msgid "" +"We have sent you an e-mail. If you have not received it please check your " +"spam folder. Otherwise contact us if you do not receive it in a few minutes." +msgstr "" + +#: .\templates\account\password_reset_from_key.html:7 +msgid "Bad Token" +msgstr "" + +#: .\templates\account\password_reset_from_key.html:11 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: .\templates\account\password_reset_from_key.html:16 +msgid "change password" +msgstr "" + +#: .\templates\account\password_reset_from_key_done.html:8 +msgid "Your password is now changed." +msgstr "" + +#: .\templates\account\password_set.html:5 +#: .\templates\account\password_set.html:8 +#: .\templates\account\password_set.html:13 +msgid "Set Password" +msgstr "" + +#: .\templates\account\signup.html:5 +msgid "Signup" +msgstr "" + +#: .\templates\account\signup.html:8 .\templates\account\signup.html:18 +#: .\templates\common\base.html:41 +msgid "Sign Up" +msgstr "" + +#: .\templates\account\signup.html:10 +#, python-format +msgid "" +"Already have an account? Then please sign in." +msgstr "" + +#: .\templates\account\signup_closed.html:5 +#: .\templates\account\signup_closed.html:8 +msgid "Sign Up Closed" +msgstr "" + +#: .\templates\account\signup_closed.html:10 +msgid "We are sorry, but the sign up is currently closed." +msgstr "" + +#: .\templates\account\snippets\already_logged_in.html:5 +msgid "Note" +msgstr "" + +#: .\templates\account\snippets\already_logged_in.html:5 +#, python-format +msgid "you are already logged in as %(user_display)s." +msgstr "" + +#: .\templates\account\verification_sent.html:5 +#: .\templates\account\verification_sent.html:8 +#: .\templates\account\verified_email_required.html:5 +#: .\templates\account\verified_email_required.html:8 +msgid "Verify Your E-mail Address" +msgstr "" + +#: .\templates\account\verification_sent.html:10 +msgid "" +"We have sent an e-mail to you for verification. Follow the link provided to " +"finalize the signup process. If you do not see the verification e-mail in " +"your main inbox, check your spam folder. Please contact us if you do not " +"receive the verification e-mail within a few minutes." +msgstr "" + +#: .\templates\account\verified_email_required.html:12 +msgid "" +"This part of the site requires us to verify that\n" +"you are who you claim to be. For this purpose, we require that you\n" +"verify ownership of your e-mail address. " +msgstr "" + +#: .\templates\account\verified_email_required.html:16 +msgid "" +"We have sent an e-mail to you for\n" +"verification. Please click on the link inside that e-mail. If you do not see " +"the verification e-mail in your main inbox, check your spam folder. " +"Otherwise\n" +"contact us if you do not receive it within a few minutes." +msgstr "" + +#: .\templates\account\verified_email_required.html:20 +#, python-format +msgid "" +"Note: you can still change your e-" +"mail address." +msgstr "" + +#: .\templates\common\base.html:32 +msgid "Change E-mail" +msgstr "Сменить E-mail" diff --git a/wheretogo/templates/account/account_inactive.html b/wheretogo/templates/account/account_inactive.html deleted file mode 100644 index 3347f4f..0000000 --- a/wheretogo/templates/account/account_inactive.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Account Inactive" %}{% endblock %} - -{% block content %} -

{% trans "Account Inactive" %}

- -

{% trans "This account is inactive." %}

-{% endblock %} diff --git a/wheretogo/templates/account/base.html b/wheretogo/templates/account/base.html deleted file mode 100644 index 4e12516..0000000 --- a/wheretogo/templates/account/base.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - {% block head_title %}{% endblock %} - {% block extra_head %} - {% endblock %} - - - {% block body %} - - {% if messages %} -
- Messages: -
    - {% for message in messages %} -
  • {{message}}
    • - {% endfor %} -
-
- {% endif %} - -
- Menu: - -
- {% block content %} - {% endblock %} - {% endblock %} - {% block extra_body %} - {% endblock %} - - diff --git a/wheretogo/templates/account/email.html b/wheretogo/templates/account/email.html deleted file mode 100644 index b5c88e0..0000000 --- a/wheretogo/templates/account/email.html +++ /dev/null @@ -1,74 +0,0 @@ -{% extends "common/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "E-mail Addresses" %}{% endblock %} - -{% block content %} -

{% trans "E-mail Addresses" %}

-{% if user.emailaddress_set.all %} -

{% trans 'The following e-mail addresses are associated with your account:' %}

- - - -{% else %} -

{% trans 'Warning:'%} {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}

- -{% endif %} - - {% if can_add_email %} -

{% trans "Add E-mail Address" %}

- -
- {% csrf_token %} - {{ form.as_p }} - -
- {% endif %} - -{% endblock %} - - -{% block extra_body %} - -{% endblock %} diff --git a/wheretogo/templates/account/email/base_message.txt b/wheretogo/templates/account/email/base_message.txt deleted file mode 100644 index 46f04f3..0000000 --- a/wheretogo/templates/account/email/base_message.txt +++ /dev/null @@ -1,7 +0,0 @@ -{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name %}Hello from {{ site_name }}!{% endblocktrans %} - -{% block content %}{% endblock %} - -{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you for using {{ site_name }}! -{{ site_domain }}{% endblocktrans %} -{% endautoescape %} diff --git a/wheretogo/templates/account/email/email_confirmation_message.txt b/wheretogo/templates/account/email/email_confirmation_message.txt deleted file mode 100644 index 7f922d8..0000000 --- a/wheretogo/templates/account/email/email_confirmation_message.txt +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "account/email/base_message.txt" %} -{% load account %} -{% load i18n %} - -{% block content %}{% autoescape off %}{% user_display user as user_display %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}You're receiving this e-mail because user {{ user_display }} has given your e-mail address to register an account on {{ site_domain }}. - -To confirm this is correct, go to {{ activate_url }}{% endblocktrans %}{% endautoescape %}{% endblock %} diff --git a/wheretogo/templates/account/email/email_confirmation_signup_message.txt b/wheretogo/templates/account/email/email_confirmation_signup_message.txt deleted file mode 100644 index 9996f7e..0000000 --- a/wheretogo/templates/account/email/email_confirmation_signup_message.txt +++ /dev/null @@ -1 +0,0 @@ -{% include "account/email/email_confirmation_message.txt" %} diff --git a/wheretogo/templates/account/email/email_confirmation_signup_subject.txt b/wheretogo/templates/account/email/email_confirmation_signup_subject.txt deleted file mode 100644 index 4c85ebb..0000000 --- a/wheretogo/templates/account/email/email_confirmation_signup_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% include "account/email/email_confirmation_subject.txt" %} diff --git a/wheretogo/templates/account/email/email_confirmation_subject.txt b/wheretogo/templates/account/email/email_confirmation_subject.txt deleted file mode 100644 index b0a876f..0000000 --- a/wheretogo/templates/account/email/email_confirmation_subject.txt +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %} -{% autoescape off %} -{% blocktrans %}Please Confirm Your E-mail Address{% endblocktrans %} -{% endautoescape %} diff --git a/wheretogo/templates/account/email/password_reset_key_message.txt b/wheretogo/templates/account/email/password_reset_key_message.txt deleted file mode 100644 index 5871c1e..0000000 --- a/wheretogo/templates/account/email/password_reset_key_message.txt +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "account/email/base_message.txt" %} -{% load i18n %} - -{% block content %}{% autoescape off %}{% blocktrans %}You're receiving this e-mail because you or someone else has requested a password for your user account. -It can be safely ignored if you did not request a password reset. Click the link below to reset your password.{% endblocktrans %} - -{{ password_reset_url }}{% if username %} - -{% blocktrans %}In case you forgot, your username is {{ username }}.{% endblocktrans %}{% endif %}{% endautoescape %}{% endblock %} diff --git a/wheretogo/templates/account/email/password_reset_key_subject.txt b/wheretogo/templates/account/email/password_reset_key_subject.txt deleted file mode 100644 index 6840c40..0000000 --- a/wheretogo/templates/account/email/password_reset_key_subject.txt +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %} -{% autoescape off %} -{% blocktrans %}Password Reset E-mail{% endblocktrans %} -{% endautoescape %} diff --git a/wheretogo/templates/account/email/unknown_account_message.txt b/wheretogo/templates/account/email/unknown_account_message.txt deleted file mode 100644 index e4e89d0..0000000 --- a/wheretogo/templates/account/email/unknown_account_message.txt +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "account/email/base_message.txt" %} -{% load i18n %} - -{% block content %}{% autoescape off %}{% blocktrans %}You are receiving this e-mail because you or someone else has requested a -password for your user account. However, we do not have any record of a user -with email {{ email }} in our database. - -This mail can be safely ignored if you did not request a password reset. - -If it was you, you can sign up for an account using the link below.{% endblocktrans %} - -{{ signup_url }}{% endautoescape %}{% endblock %} diff --git a/wheretogo/templates/account/email/unknown_account_subject.txt b/wheretogo/templates/account/email/unknown_account_subject.txt deleted file mode 100644 index 6840c40..0000000 --- a/wheretogo/templates/account/email/unknown_account_subject.txt +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %} -{% autoescape off %} -{% blocktrans %}Password Reset E-mail{% endblocktrans %} -{% endautoescape %} diff --git a/wheretogo/templates/account/email_confirm.html b/wheretogo/templates/account/email_confirm.html deleted file mode 100644 index ac0891b..0000000 --- a/wheretogo/templates/account/email_confirm.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %} - - -{% block content %} -

{% trans "Confirm E-mail Address" %}

- -{% if confirmation %} - -{% user_display confirmation.email_address.user as user_display %} - -

{% blocktrans with confirmation.email_address.email as email %}Please confirm that {{ email }} is an e-mail address for user {{ user_display }}.{% endblocktrans %}

- -
-{% csrf_token %} - -
- -{% else %} - -{% url 'account_email' as email_url %} - -

{% blocktrans %}This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request.{% endblocktrans %}

- -{% endif %} - -{% endblock %} diff --git a/wheretogo/templates/account/login.html b/wheretogo/templates/account/login.html index 5fa8ca2..24a8960 100644 --- a/wheretogo/templates/account/login.html +++ b/wheretogo/templates/account/login.html @@ -1,5 +1,7 @@ {% extends "common/base.html" %} +{% load crispy_forms_tags %} + {% load i18n %} {% load account socialaccount %} @@ -7,40 +9,43 @@ {% block content %} -

{% trans "Sign In" %}

+
+
+
+
+ {% csrf_token %} +

{% trans "Sign In" %}

+ {% if socialaccount_providers %} +

{% blocktrans with site.name as site_name %}Please sign in with one + of your existing third party accounts. Or, sign up + for a {{ site_name }} account and sign in below:{% endblocktrans %}

-{% get_providers as socialaccount_providers %} +
-{% if socialaccount_providers %} -

{% blocktrans with site.name as site_name %}Please sign in with one -of your existing third party accounts. Or, sign up -for a {{ site_name }} account and sign in below:{% endblocktrans %}

+
    + {% include "socialaccount/snippets/provider_list.html" with process="login" %} +
-
+ -
    - {% include "socialaccount/snippets/provider_list.html" with process="login" %} -
+
- + {% include "socialaccount/snippets/login_extra.html" %} + {% else %} +

{% blocktrans %}If you have not created an account yet, then please + sign up first.{% endblocktrans %}

+ {% endif %} + {{ form|crispy }} + {% get_providers as socialaccount_providers %} + {% if redirect_field_value %} + + {% endif %} +
+ {% trans "Forgot Password?" %} + +
+
-{% include "socialaccount/snippets/login_extra.html" %} - -{% else %} -

{% blocktrans %}If you have not created an account yet, then please -sign up first.{% endblocktrans %}

-{% endif %} - - - {% endblock %} diff --git a/wheretogo/templates/account/logout.html b/wheretogo/templates/account/logout.html index 8b256d7..61dd1fd 100644 --- a/wheretogo/templates/account/logout.html +++ b/wheretogo/templates/account/logout.html @@ -5,17 +5,21 @@ {% block head_title %}{% trans "Sign Out" %}{% endblock %} {% block content %} -

{% trans "Sign Out" %}

- -

{% trans 'Are you sure you want to sign out?' %}

- -
- {% csrf_token %} - {% if redirect_field_value %} - - {% endif %} - -
+
+
+
+
+ {% csrf_token %} +

{% trans "Sign Out" %}

+

{% trans 'Are you sure you want to sign out?' %}

+ {% if redirect_field_value %} + + {% endif %} + +
+
+
+
{% endblock %} diff --git a/wheretogo/templates/account/messages/cannot_delete_primary_email.txt b/wheretogo/templates/account/messages/cannot_delete_primary_email.txt deleted file mode 100644 index de55571..0000000 --- a/wheretogo/templates/account/messages/cannot_delete_primary_email.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}You cannot remove your primary e-mail address ({{email}}).{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/email_confirmation_sent.txt b/wheretogo/templates/account/messages/email_confirmation_sent.txt deleted file mode 100644 index 7a526f8..0000000 --- a/wheretogo/templates/account/messages/email_confirmation_sent.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}Confirmation e-mail sent to {{email}}.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/email_confirmed.txt b/wheretogo/templates/account/messages/email_confirmed.txt deleted file mode 100644 index 3427a4d..0000000 --- a/wheretogo/templates/account/messages/email_confirmed.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}You have confirmed {{email}}.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/email_deleted.txt b/wheretogo/templates/account/messages/email_deleted.txt deleted file mode 100644 index 5cf7cf9..0000000 --- a/wheretogo/templates/account/messages/email_deleted.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}Removed e-mail address {{email}}.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/logged_in.txt b/wheretogo/templates/account/messages/logged_in.txt deleted file mode 100644 index f49248a..0000000 --- a/wheretogo/templates/account/messages/logged_in.txt +++ /dev/null @@ -1,4 +0,0 @@ -{% load account %} -{% load i18n %} -{% user_display user as name %} -{% blocktrans %}Successfully signed in as {{name}}.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/logged_out.txt b/wheretogo/templates/account/messages/logged_out.txt deleted file mode 100644 index 2cd4627..0000000 --- a/wheretogo/templates/account/messages/logged_out.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}You have signed out.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/password_changed.txt b/wheretogo/templates/account/messages/password_changed.txt deleted file mode 100644 index bd5801c..0000000 --- a/wheretogo/templates/account/messages/password_changed.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}Password successfully changed.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/password_set.txt b/wheretogo/templates/account/messages/password_set.txt deleted file mode 100644 index 9d224ee..0000000 --- a/wheretogo/templates/account/messages/password_set.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}Password successfully set.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/primary_email_set.txt b/wheretogo/templates/account/messages/primary_email_set.txt deleted file mode 100644 index b6a70dd..0000000 --- a/wheretogo/templates/account/messages/primary_email_set.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}Primary e-mail address set.{% endblocktrans %} diff --git a/wheretogo/templates/account/messages/unverified_primary_email.txt b/wheretogo/templates/account/messages/unverified_primary_email.txt deleted file mode 100644 index 9c9d0d8..0000000 --- a/wheretogo/templates/account/messages/unverified_primary_email.txt +++ /dev/null @@ -1,2 +0,0 @@ -{% load i18n %} -{% blocktrans %}Your primary e-mail address must be verified.{% endblocktrans %} diff --git a/wheretogo/templates/account/password_change.html b/wheretogo/templates/account/password_change.html deleted file mode 100644 index bf6b94c..0000000 --- a/wheretogo/templates/account/password_change.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "common/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -

{% trans "Change Password" %}

- -
- {% csrf_token %} - {{ form.as_p }} - - {% trans "Forgot Password?" %} -
-{% endblock %} diff --git a/wheretogo/templates/account/password_reset.html b/wheretogo/templates/account/password_reset.html deleted file mode 100644 index 1aeb0e1..0000000 --- a/wheretogo/templates/account/password_reset.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "common/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Password Reset" %}{% endblock %} - -{% block content %} - -

{% trans "Password Reset" %}

- {% if user.is_authenticated %} - {% include "account/snippets/already_logged_in.html" %} - {% endif %} - -

{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}

- -
- {% csrf_token %} - {{ form.as_p }} - -
- -

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}

-{% endblock %} diff --git a/wheretogo/templates/account/password_reset_done.html b/wheretogo/templates/account/password_reset_done.html deleted file mode 100644 index d947d79..0000000 --- a/wheretogo/templates/account/password_reset_done.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Password Reset" %}{% endblock %} - -{% block content %} -

{% trans "Password Reset" %}

- - {% if user.is_authenticated %} - {% include "account/snippets/already_logged_in.html" %} - {% endif %} - -

{% blocktrans %}We have sent you an e-mail. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes.{% endblocktrans %}

-{% endblock %} diff --git a/wheretogo/templates/account/password_reset_from_key.html b/wheretogo/templates/account/password_reset_from_key.html deleted file mode 100644 index 7da153b..0000000 --- a/wheretogo/templates/account/password_reset_from_key.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -

{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}

- - {% if token_fail %} - {% url 'account_reset_password' as passwd_reset_url %} -

{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new password reset.{% endblocktrans %}

- {% else %} -
- {% csrf_token %} - {{ form.as_p }} - -
- {% endif %} -{% endblock %} diff --git a/wheretogo/templates/account/password_reset_from_key_done.html b/wheretogo/templates/account/password_reset_from_key_done.html deleted file mode 100644 index 85641c2..0000000 --- a/wheretogo/templates/account/password_reset_from_key_done.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -

{% trans "Change Password" %}

-

{% trans 'Your password is now changed.' %}

-{% endblock %} diff --git a/wheretogo/templates/account/password_set.html b/wheretogo/templates/account/password_set.html deleted file mode 100644 index f561572..0000000 --- a/wheretogo/templates/account/password_set.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Set Password" %}{% endblock %} - -{% block content %} -

{% trans "Set Password" %}

- -
- {% csrf_token %} - {{ form.as_p }} - -
-{% endblock %} diff --git a/wheretogo/templates/account/signup.html b/wheretogo/templates/account/signup.html index d65b28d..b010c73 100644 --- a/wheretogo/templates/account/signup.html +++ b/wheretogo/templates/account/signup.html @@ -1,21 +1,28 @@ {% extends "common/base.html" %} +{% load crispy_forms_tags %} + {% load i18n %} {% block head_title %}{% trans "Signup" %}{% endblock %} {% block content %} -

{% trans "Sign Up" %}

-

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

- - +
+
+
+
+ {% csrf_token %} +

{% trans "Sign Up" %}

+

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

+ {{ form|crispy }} + {% if redirect_field_value %} + + {% endif %} + +
+
+
+
{% endblock %} diff --git a/wheretogo/templates/account/signup_closed.html b/wheretogo/templates/account/signup_closed.html deleted file mode 100644 index bc83950..0000000 --- a/wheretogo/templates/account/signup_closed.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %} - -{% block content %} -

{% trans "Sign Up Closed" %}

- -

{% trans "We are sorry, but the sign up is currently closed." %}

-{% endblock %} diff --git a/wheretogo/templates/account/snippets/already_logged_in.html b/wheretogo/templates/account/snippets/already_logged_in.html deleted file mode 100644 index 00799f0..0000000 --- a/wheretogo/templates/account/snippets/already_logged_in.html +++ /dev/null @@ -1,5 +0,0 @@ -{% load i18n %} -{% load account %} - -{% user_display user as user_display %} -

{% trans "Note" %}: {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}

diff --git a/wheretogo/templates/account/verification_sent.html b/wheretogo/templates/account/verification_sent.html deleted file mode 100644 index 3b2d7e5..0000000 --- a/wheretogo/templates/account/verification_sent.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} - -{% block content %} -

{% trans "Verify Your E-mail Address" %}

- -

{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification e-mail in your main inbox, check your spam folder. Please contact us if you do not receive the verification e-mail within a few minutes.{% endblocktrans %}

- -{% endblock %} diff --git a/wheretogo/templates/account/verified_email_required.html b/wheretogo/templates/account/verified_email_required.html deleted file mode 100644 index d8e5378..0000000 --- a/wheretogo/templates/account/verified_email_required.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} - -{% block content %} -

{% trans "Verify Your E-mail Address" %}

- -{% url 'account_email' as email_url %} - -

{% blocktrans %}This part of the site requires us to verify that -you are who you claim to be. For this purpose, we require that you -verify ownership of your e-mail address. {% endblocktrans %}

- -

{% blocktrans %}We have sent an e-mail to you for -verification. Please click on the link inside that e-mail. If you do not see the verification e-mail in your main inbox, check your spam folder. Otherwise -contact us if you do not receive it within a few minutes.{% endblocktrans %}

- -

{% blocktrans %}Note: you can still change your e-mail address.{% endblocktrans %}

- - -{% endblock %} diff --git a/wheretogo/templates/common/base.html b/wheretogo/templates/common/base.html index ac3d128..1e740a9 100644 --- a/wheretogo/templates/common/base.html +++ b/wheretogo/templates/common/base.html @@ -6,11 +6,13 @@ - WhereToGo + {% block head_title %}{% endblock %} {% csrf_token %} + {% block extra_head %} + {% endblock %}