diff --git a/pinaxcon/apps.py b/pinaxcon/apps.py index 757e4e005d7d08626b088075deec507a78640ed0..ef1c5df5098e9e288041be419fd70b04ebfd52f1 100644 --- a/pinaxcon/apps.py +++ b/pinaxcon/apps.py @@ -6,6 +6,3 @@ from django.apps import AppConfig as BaseAppConfig class AppConfig(BaseAppConfig): name = "pinaxcon" - - def ready(self): - import_module("pinaxcon.receivers") diff --git a/pinaxcon/monkey_patch.py b/pinaxcon/monkey_patch.py index 8192348d5a49495817cd5f052067775860d7db9b..dba6fe65933857028267d28053704851430c92a1 100644 --- a/pinaxcon/monkey_patch.py +++ b/pinaxcon/monkey_patch.py @@ -12,7 +12,6 @@ class MonkeyPatchMiddleware(object): def do_monkey_patch(): patch_speaker_profile_form() fix_sitetree_check_access_500s() - never_cache_login_page() patch_stripe_payment_form() # Remove this function from existence @@ -51,12 +50,6 @@ def fix_sitetree_check_access_500s(): SiteTree.check_access = check_access -def never_cache_login_page(): - from django.views.decorators.cache import never_cache - from account.views import LoginView - LoginView.get = never_cache(LoginView.get) - - def patch_stripe_payment_form(): # noqa: C901 import inspect # Oh no. diff --git a/pinaxcon/receivers.py b/pinaxcon/receivers.py deleted file mode 100644 index 5aa22c9af96b4f06cc521511585e3ef54c948d22..0000000000000000000000000000000000000000 --- a/pinaxcon/receivers.py +++ /dev/null @@ -1,59 +0,0 @@ -from django.dispatch import receiver - -from account.signals import password_changed -from account.signals import user_sign_up_attempt, user_signed_up -from account.signals import user_login_attempt, user_logged_in - -from pinax.eventlog.models import log - - -@receiver(user_logged_in) -def handle_user_logged_in(sender, **kwargs): - log( - user=kwargs.get("user"), - action="USER_LOGGED_IN", - extra={} - ) - - -@receiver(password_changed) -def handle_password_changed(sender, **kwargs): - log( - user=kwargs.get("user"), - action="PASSWORD_CHANGED", - extra={} - ) - - -@receiver(user_login_attempt) -def handle_user_login_attempt(sender, **kwargs): - log( - user=None, - action="LOGIN_ATTEMPTED", - extra={ - "username": kwargs.get("username"), - "result": kwargs.get("result") - } - ) - - -@receiver(user_sign_up_attempt) -def handle_user_sign_up_attempt(sender, **kwargs): - log( - user=None, - action="SIGNUP_ATTEMPTED", - extra={ - "username": kwargs.get("username"), - "email": kwargs.get("email"), - "result": kwargs.get("result") - } - ) - - -@receiver(user_signed_up) -def handle_user_signed_up(sender, **kwargs): - log( - user=kwargs.get("user"), - action="USER_SIGNED_UP", - extra={} - ) diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 2587bdf2379d8b1fba4b664554c0e41a22a11f8a..5276d46f7b3f923881d4ffbf0277cca7d5c57919 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -68,7 +68,6 @@ TEMPLATES = [ "django.core.context_processors.tz", "django.core.context_processors.request", "django.contrib.messages.context_processors.messages", - "account.context_processors.account", "pinax_theme_bootstrap.context_processors.theme", "symposion.reviews.context_processors.reviews", ], @@ -112,7 +111,6 @@ INSTALLED_APPS = [ "pinax_theme_bootstrap", # external - "account", "easy_thumbnails", "taggit", "reversion", @@ -241,20 +239,10 @@ FIXTURE_DIRS = [ EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" -ACCOUNT_OPEN_SIGNUP = True -ACCOUNT_EMAIL_UNIQUE = True -ACCOUNT_EMAIL_CONFIRMATION_REQUIRED = False -ACCOUNT_LOGIN_REDIRECT_URL = "dashboard" -ACCOUNT_LOGOUT_REDIRECT_URL = "/" -ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 2 -ACCOUNT_USE_AUTH_AUTHENTICATE = True - THEME_CONTACT_EMAIL = "team@lca2018.org" AUTHENTICATION_BACKENDS = [ "symposion.teams.backends.TeamPermissionsBackend", - "account.auth_backends.UsernameAuthenticationBackend", - "account.auth_backends.EmailAuthenticationBackend", ] CONFERENCE_ID = 1 diff --git a/pinaxcon/templates/_account_bar.html b/pinaxcon/templates/_account_bar.html deleted file mode 100644 index f246f4025c4540fc7fe2bcb43a5c49fd07b11213..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/_account_bar.html +++ /dev/null @@ -1,29 +0,0 @@ -{% load i18n %} -{% load account_tags %} - - - - - diff --git a/pinaxcon/templates/account/_login_sidebar.html b/pinaxcon/templates/account/_login_sidebar.html deleted file mode 100644 index dcf7d21b23b4be5c8d35483f39df6ced82eb1c1a..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/_login_sidebar.html +++ /dev/null @@ -1 +0,0 @@ -{# provide log in sidebar here #} \ No newline at end of file diff --git a/pinaxcon/templates/account/_signup_sidebar.html b/pinaxcon/templates/account/_signup_sidebar.html deleted file mode 100644 index 660aca18be9e22652790decbeff02bdca622cea7..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/_signup_sidebar.html +++ /dev/null @@ -1 +0,0 @@ -{# provide sign up in sidebar here #} \ No newline at end of file diff --git a/pinaxcon/templates/account/base.html b/pinaxcon/templates/account/base.html deleted file mode 100644 index 8f15d1c305efa17ed0506922f0f4d36a6f861963..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/base.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} - -{% block body_class %}account{% endblock %} - -{% block utility_body %} - -
- - {% trans "Settings" %} - - - {% trans "Change password" %} - - - {% trans "Delete account" %} - -
-
- - {% block account_body %} - {% endblock %} - -{% endblock %} diff --git a/pinaxcon/templates/account/delete.html b/pinaxcon/templates/account/delete.html deleted file mode 100644 index c7041257315bac2548325920c161cc255be9f926..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/delete.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block body_class %}account account-delete{% endblock %} - -{% block head_title %}{% trans "Delete Account" %}{% endblock %} -{% block page_title %}{% trans "Delete Account" %}{% endblock %} -{% block btn-delete %}btn__active{% endblock %} - -{% block account_body %} - -

{% blocktrans %}If you go ahead and delete your account, your information will be expunged within {{ ACCOUNT_DELETION_EXPUNGE_HOURS }} hours.{% endblocktrans %}

- -
- {% csrf_token %} - -
- -{% endblock %} diff --git a/pinaxcon/templates/account/email/email_confirmation_message.txt b/pinaxcon/templates/account/email/email_confirmation_message.txt deleted file mode 100644 index c3b42445b2a393b9e4cca23fef13145e577cf83d..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/email_confirmation_message.txt +++ /dev/null @@ -1,6 +0,0 @@ -{% load i18n account_tags %}{% blocktrans with site_name=current_site.name %}A user on {{ site_name }} has created an account using this email address. - -To confirm this email address, go to {{ activate_url }} - -If you did not sign up for this site, you can ignore this message. -{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/email_confirmation_subject.txt b/pinaxcon/templates/account/email/email_confirmation_subject.txt deleted file mode 100644 index ad4cf943a2745bef0e6edde4be36e5706c445ed8..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/email_confirmation_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% blocktrans with site_name=current_site.name %}Confirm email address for {{ site_name }}{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/invite_user.txt b/pinaxcon/templates/account/email/invite_user.txt deleted file mode 100644 index a817337529e27bc33c468bfe9032b89b52d5ef2a..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/invite_user.txt +++ /dev/null @@ -1,4 +0,0 @@ -{% load i18n %}{% blocktrans with name=current_site.name %}You have been invited to sign up at {{ name }}. - -{{ signup_url }} -{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/invite_user_subject.txt b/pinaxcon/templates/account/email/invite_user_subject.txt deleted file mode 100644 index 86a4b06e85c31fb7f0844872388eaf8993d66a94..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/invite_user_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% blocktrans with name=current_site.name %}Create an account on {{ name }}{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/password_change.txt b/pinaxcon/templates/account/email/password_change.txt deleted file mode 100644 index 66f40e9b7e4f44f240037cbe49c61213b39ca062..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/password_change.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% blocktrans with now=user.account.now %}This is the email notification to confirm your password has been changed on {{ now }}.{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/password_change_subject.txt b/pinaxcon/templates/account/email/password_change_subject.txt deleted file mode 100644 index e722a8ae367da305d6fb708a122b9c8d7f35d16d..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/password_change_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% trans "Change password email notification" %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/password_reset.txt b/pinaxcon/templates/account/email/password_reset.txt deleted file mode 100644 index 55170c7bcae49c68f9d0bee09b10f9d6231bdbb3..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/password_reset.txt +++ /dev/null @@ -1,5 +0,0 @@ -{% load i18n %}{% blocktrans with site_name=current_site.name %}You're receiving this email because you or someone else has requested a password for your user account at {{ site_name }}. -It can be safely ignored if you did not request a password reset. Click the link below to reset your password. - -{{ password_reset_url }} -{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email/password_reset_subject.txt b/pinaxcon/templates/account/email/password_reset_subject.txt deleted file mode 100644 index 94020c9b602767c1bdb74f58d87d34c89a734dc7..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email/password_reset_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% blocktrans with site_name=current_site.name %}[{{ site_name }}] Password reset{% endblocktrans %} \ No newline at end of file diff --git a/pinaxcon/templates/account/email_confirm.html b/pinaxcon/templates/account/email_confirm.html deleted file mode 100644 index bbe42ad9fd4d614d9b52f188d9b0875581a70013..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email_confirm.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Confirm Email" %}{% endblock %} -{% block page_title %}{% trans "Confirm Email" %}{% endblock %} - -{% block utility_body %} -
-
- {% csrf_token %} -

{% blocktrans with email=confirmation.email_address.email %}Confirm email address {{ email }}?{% endblocktrans %}

- -
-
-{% endblock %} diff --git a/pinaxcon/templates/account/email_confirmation_sent.html b/pinaxcon/templates/account/email_confirmation_sent.html deleted file mode 100644 index b9f35a6df14f751c6834703d184c302a3648a0d6..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email_confirmation_sent.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Confirm your email address" %}{% endblock %} -{% block page_title %}{% trans "Confirm your email address" %}{% endblock %} - -{% block utility_body %} - -

{% blocktrans %}We have sent you an email to {{ email }} for verification. Follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at {{ THEME_CONTACT_EMAIL }}.{% endblocktrans %}

-

{% trans "Go back" %}

-{% endblock %} diff --git a/pinaxcon/templates/account/email_confirmed.html b/pinaxcon/templates/account/email_confirmed.html deleted file mode 100644 index 2b444a58ab3034b1b44f3685ba53935116decd6e..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/email_confirmed.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Email confirmed" %}{% endblock %} -{% block page_title %}{% trans "Email confirmed" %}{% endblock %} - -{% block utility_body %} -

{% blocktrans with email=confirmation.email_address.email %}You have confirmed {{ email }}{% endblocktrans %}

-{% endblock %} diff --git a/pinaxcon/templates/account/login.html b/pinaxcon/templates/account/login.html deleted file mode 100644 index 79e749c101b1426b0bc7eec384efb8e2d91539f9..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/login.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "utility_page.html" %} - -{% load account_tags %} -{% load i18n %} -{% load bootstrap %} - -{% block head_title %}{% trans "Log in" %}{% endblock %} -{% block page_title %}{% trans "Log in to an existing account" %}{% endblock %} - -{% block utility_body %} - - {% if ACCOUNT_OPEN_SIGNUP %} -

- {% trans "Don't have an account?" %} {% trans "Sign up" %} -

- {% endif %} -

- {% trans "Accounts from previous years have not been carried over to this site." %} - {% trans "You will need to create a new account for this year's site." %} -

- -
- {% csrf_token %} -
- {% include "_form_snippet.html" with form=form %} - - {% if redirect_field_value %} - - {% endif %} - - {% trans "Forgot your password?" %} -
-
-{% endblock %} - -{% block scripts %} - {{ block.super }} - -{% endblock %} diff --git a/pinaxcon/templates/account/logout.html b/pinaxcon/templates/account/logout.html deleted file mode 100644 index 031f854467c65570d795dbb6982c4324da5a6bbd..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/logout.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Log out" %}{% endblock %} -{% block page_title %}{% trans "Log out" %}{% endblock %} - -{% block utility_body %} -
- {% csrf_token %} -

{% trans "Are you sure you want to log out?" %}

- -
-{% endblock %} diff --git a/pinaxcon/templates/account/password_change.html b/pinaxcon/templates/account/password_change.html deleted file mode 100644 index 7f85c596bc1103818cd087c09a846f5da7a20208..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/password_change.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load bootstrap %} - -{% block body_class %}account account-password{% endblock %} - -{% block head_title %}{% trans "Change password" %}{% endblock %} -{% block page_title %}{% trans "Change password" %}{% endblock %} -{% block btn-password %}btn__active{% endblock %} - -{% block account_body %} -
-
- {% csrf_token %} - {% include "_form_snippet.html" with form=form %} - -
-
-{% endblock %} diff --git a/pinaxcon/templates/account/password_reset.html b/pinaxcon/templates/account/password_reset.html deleted file mode 100644 index d3e36565f13ee343bb997c105869477b3286ffde..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/password_reset.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} -{% load bootstrap %} -{% load account_tags %} - -{% block head_title %}{% trans "Password reset" %}{% endblock %} -{% block page_title %}{% trans "Password reset" %}{% endblock %} - -{% user_display request.user as user_display %} - -{% block utility_body %} -
-

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

-
- {% csrf_token %} - {% include "_form_snippet.html" with form=form %} - -
-
-

{% blocktrans %}If you have any trouble resetting your password, contact us at {{ THEME_CONTACT_EMAIL }}.{% endblocktrans %}

-{% endblock %} - -{% block extra_body %} - -{% endblock %} diff --git a/pinaxcon/templates/account/password_reset_sent.html b/pinaxcon/templates/account/password_reset_sent.html deleted file mode 100644 index c1b43edc3b88afddb2aa5aa7bb755d5bd83df29f..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/password_reset_sent.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} -{% load account_tags %} - -{% block head_title %}{% trans "Password reset sent" %}{% endblock %} -{% block page_title %}{% trans "Password reset sent" %}{% endblock %} - -{% block utility_body %} - {% if not resend %} -

{% blocktrans %}We have sent you an email. If you do not receive it within a few minutes, try resending or contact us at {{ THEME_CONTACT_EMAIL }}.{% endblocktrans %}

- -
- {% csrf_token %} - {% for field in form %} - {{ field.as_hidden }} - {% endfor %} - -
- {% else %} -

{% blocktrans %}We have resent the password email. If you do not receive it within a few minutes, contact us at {{ THEME_CONTACT_EMAIL }}.{% endblocktrans %}

- {% endif %} -{% endblock %} diff --git a/pinaxcon/templates/account/password_reset_token.html b/pinaxcon/templates/account/password_reset_token.html deleted file mode 100644 index c91cfaffc2ba3c5bba8ae3b26fbbd1f0e7601bec..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/password_reset_token.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} -{% load bootstrap %} - -{% block head_title %}{% trans "Set your new password" %}{% endblock %} -{% block page_title %}{% trans "Set your new password" %}{% endblock %} - -{% block utility_body %} -
- {% trans "Set your new password" %} -
- {% csrf_token %} - {% include "_form_snippet.html" with form=form %} - -
-
-{% endblock %} diff --git a/pinaxcon/templates/account/password_reset_token_fail.html b/pinaxcon/templates/account/password_reset_token_fail.html deleted file mode 100644 index 043406f53836a77cbbca60c104f1584621163d57..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/password_reset_token_fail.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "utility_page.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Bad token" %}{% endblock %} -{% block page_title %}{% trans "Bad token" %}{% endblock %} - -{% block utility_body %} - {% url "account_password_reset" as url %} -

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

-{% endblock %} diff --git a/pinaxcon/templates/account/settings.html b/pinaxcon/templates/account/settings.html deleted file mode 100644 index e06d39c1a353124603cfdea5ba571ece097fd32c..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/settings.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load bootstrap %} - -{% block body_class %}account account-settings{% endblock %} - -{% block head_title %}{% trans "Account Settings" %}{% endblock %} -{% block page_title %}{% trans "Account Settings" %}{% endblock %} -{% block btn-settings %}btn__active{% endblock %} - -{% block account_body %} -
-
- {% csrf_token %} - {% include "_form_snippet.html" with form=form %} - -
-
-{% endblock %} diff --git a/pinaxcon/templates/account/signup.html b/pinaxcon/templates/account/signup.html deleted file mode 100644 index a5a3dbda72cfe3201ef12be2b0fe11e323bb1989..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/signup.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "utility_page.html" %} - -{% load account_tags %} -{% load i18n %} -{% load bootstrap %} - -{% block head_title %}{% trans "Sign up" %}{% endblock %} -{% block page_title %}{% trans "Sign up" %}{% endblock %} - -{% block utility_body %} -

- {% trans "Already have an account?" %} {% trans "Log in" %} -

-
- {% csrf_token %} -
- {% include "_form_snippet.html" with form=form %} -
- {% if redirect_field_value %} - - {% endif %} - -
-{% endblock %} - -{% block scripts %} - {{ block.super }} - -{% endblock %} diff --git a/pinaxcon/templates/account/signup_closed.html b/pinaxcon/templates/account/signup_closed.html deleted file mode 100644 index 270d869c87b81d71fe0b822a3aa73ccb428124b0..0000000000000000000000000000000000000000 --- a/pinaxcon/templates/account/signup_closed.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "site_base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Sign up" %}{% endblock %} - -{% block body %} -

{% trans "This site is in private beta" %}

-

{% blocktrans %}If you have signup code you can enter it below.{% endblocktrans %}

-
-
-
-
-{% endblock %} diff --git a/pinaxcon/templates/symposion/emails/proposal_new_message/message.html b/pinaxcon/templates/symposion/emails/proposal_new_message/message.html index b56af29633829ec4e0be09b99b48efd50f8f04b4..9d25e2a85c18e59f86882676158f3e910c6f54dc 100644 --- a/pinaxcon/templates/symposion/emails/proposal_new_message/message.html +++ b/pinaxcon/templates/symposion/emails/proposal_new_message/message.html @@ -1,8 +1,6 @@ -{% load account_tags %} {% load i18n %} -{% user_display message.user as user %}

- {% blocktrans with title=proposal.title %}{{ user }} has added a message on {{ title }}.{% endblocktrans %} + {% blocktrans with title=proposal.title user=message.user %}{{ user }} has added a message on {{ title }}.{% endblocktrans %}

{{ message.message|safe }} diff --git a/pinaxcon/templates/symposion/emails/proposal_new_message/subject.txt b/pinaxcon/templates/symposion/emails/proposal_new_message/subject.txt index d710715638fa355a89a6fe37c62878963e7ca220..32e9996054649017b717fe7caba06fe9d4bca766 100644 --- a/pinaxcon/templates/symposion/emails/proposal_new_message/subject.txt +++ b/pinaxcon/templates/symposion/emails/proposal_new_message/subject.txt @@ -1 +1 @@ -{% load account_tags i18n %}{% user_display message.user as user %}{% blocktrans with title=proposal.title %}New message on "{{ title }}" from {{ user }}{% endblocktrans %} +{% load i18n %}{% blocktrans with title=proposal.title user=message.user.username %}New message on "{{ title }}" from {{ user }}{% endblocktrans %} diff --git a/pinaxcon/templates/symposion/emails/proposal_updated/message.html b/pinaxcon/templates/symposion/emails/proposal_updated/message.html index 93a5a26cdcd14796d5df6df3f9552a028e319684..e95be15e0d67a2ff56795d5303ba3458822e08f7 100644 --- a/pinaxcon/templates/symposion/emails/proposal_updated/message.html +++ b/pinaxcon/templates/symposion/emails/proposal_updated/message.html @@ -1,8 +1,6 @@ -{% load account_tags %} {% load i18n %} -{% user_display user as username %}

- {% blocktrans with title=proposal.title %}{{ username }} has made changes to {{ title }} which you have previously reviewed or commented on.{% endblocktrans %} + {% blocktrans with title=proposal.title username=user.username %}{{ username }} has made changes to {{ title }} which you have previously reviewed or commented on.{% endblocktrans %}

{% url 'review_detail' proposal.pk as detail_url %} diff --git a/pinaxcon/templates/symposion/emails/proposal_updated/subject.txt b/pinaxcon/templates/symposion/emails/proposal_updated/subject.txt index 379a0711e297c659cf6c0f6d35b7eb992c07933c..8875c9ef16d83d2806e37f53d2c791e08b1b1d71 100644 --- a/pinaxcon/templates/symposion/emails/proposal_updated/subject.txt +++ b/pinaxcon/templates/symposion/emails/proposal_updated/subject.txt @@ -1 +1 @@ -{% load account_tags i18n %}{% user_display user as username %}{% blocktrans with title=proposal.title %}"{{ title }}" has been updated by {{ username }}{% endblocktrans %} +{% load i18n %}{% blocktrans with title=proposal.title username=user.username %}"{{ title }}" has been updated by {{ username }}{% endblocktrans %} diff --git a/pinaxcon/templates/symposion/emails/teams_user_applied/message.html b/pinaxcon/templates/symposion/emails/teams_user_applied/message.html index b05d6c8b6dc013c8c320cf655597ec7574d61e17..ae6e1a24a44993d55d65aba0e9ad5fe8756270c4 100644 --- a/pinaxcon/templates/symposion/emails/teams_user_applied/message.html +++ b/pinaxcon/templates/symposion/emails/teams_user_applied/message.html @@ -1,6 +1,5 @@ -{% load i18n account_tags %} -{% user_display user as username %} -{% blocktrans with team_name=team team_url=team.get_absolute_url site_name=current_site.name site_url=current_site %} +{% load i18n %} +{% blocktrans with team_name=team team_url=team.get_absolute_url site_name=current_site.name site_url=current_site username=user.username %}

User "{{ username }}" has applied to join {{ team_name }} on {{ site_name }}.

diff --git a/pinaxcon/templates/symposion/emails/teams_user_applied/subject.txt b/pinaxcon/templates/symposion/emails/teams_user_applied/subject.txt index 84b2938404d35334dca879e1bdfda3596ec258a2..bc5e48b786daaa8932199ccdb5e4bb795aa49291 100644 --- a/pinaxcon/templates/symposion/emails/teams_user_applied/subject.txt +++ b/pinaxcon/templates/symposion/emails/teams_user_applied/subject.txt @@ -1 +1 @@ -{% load i18n account_tags %}{% user_display user as username %}{% blocktrans %}{{ username}} has applied to to join "{{ team }}"{% endblocktrans %} \ No newline at end of file +{% load i18n %}{% blocktrans with username=user.username %}{{ username }} has applied to to join "{{ team }}"{% endblocktrans %} diff --git a/pinaxcon/templates/symposion/emails/teams_user_invited/message.html b/pinaxcon/templates/symposion/emails/teams_user_invited/message.html index b498d247a2299b6c544fa87da2c09f4b4836de66..33efe1c76feede6f236f18925ede1bd272363b38 100644 --- a/pinaxcon/templates/symposion/emails/teams_user_invited/message.html +++ b/pinaxcon/templates/symposion/emails/teams_user_invited/message.html @@ -1,4 +1,4 @@ -{% load i18n account_tags %} +{% load i18n %} {% blocktrans with team_name=team team_url=team.get_absolute_url site_name=current_site.name site_url=current_site %}

@@ -9,4 +9,4 @@ To accept this invitation, visit the following url: http://{{ site_url }}{{ team_url }}

-{% endblocktrans %} \ No newline at end of file +{% endblocktrans %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html index 4548f6e65e6312de59c11e2e33b05a089cc4f678..ac70c584d58762c9f3bd23aca558fcf339b92141 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_detail.html +++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html @@ -1,7 +1,6 @@ {% extends "symposion/proposals/base.html" %} {% load i18n %} -{% load account_tags %} {% load bootstrap %} {% block head_title %}{{ proposal.title }}{% endblock %} @@ -65,7 +64,7 @@ {% for message in proposal.messages.all %}
{{ message.message|safe }}
- +

{% endfor %} diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html index 3d8a0d873b2877f4fd70b1e39aa9680d8ff5d208..4930c3125122bb15cb550516c5a98af85232b8d2 100644 --- a/pinaxcon/templates/symposion/reviews/review_detail.html +++ b/pinaxcon/templates/symposion/reviews/review_detail.html @@ -2,7 +2,6 @@ {% load i18n %} {% load bootstrap %} -{% load account_tags %} {% block body %} @@ -137,7 +136,7 @@ {% if review.user.speaker_profile %} {{ review.user.speaker_profile.name }} {% else %} - {% user_display review.user %} + {{ review.user.username }} {% endif %} {{ review.submitted_at|timesince }} ago
@@ -153,7 +152,7 @@ {% for message in review_messages %}
- {% user_display message.user %} + {{ message.user.username }} {{ message.submitted_at|timesince }} ago
{{ message.message|safe }}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 49dbc3428a0a0c920d151c9144b2d21be1b122b0..03b27c00463888655e894a55b82abce2a2fcdc41 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -14,8 +14,6 @@ import symposion.views urlpatterns = [ url(r"^admin/", include(admin.site.urls)), - url(r"^account/", include("account.urls")), - url(r"^dashboard/", symposion.views.dashboard, name="dashboard"), url(r"^speaker/", include("symposion.speakers.urls")), diff --git a/requirements.txt b/requirements.txt index 809207ec14b73ea598345126e0850bc696627a54..1af42c462a4cc86e7bc087eb9edf1b532095c0ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ # Should use latest 1.9 for security Django==1.9.7 pinax-theme-bootstrap==7.3.0 -django-user-accounts==1.3.1 metron==1.3.7 pinax-eventlog==1.1.1 django-formset-js==0.5.0 @@ -19,6 +18,6 @@ mysqlclient>=1.3.3 django-nose==1.4.3 coverage==4.0.3 --e git+https://github.com/lca2017/symposion.git@lca2017#egg=symposion +-e git+https://gitlab.com/lca2018/symposion.git@lca2018#egg=symposion -e git+https://github.com/chrisjrn/registrasion.git@master#egg=registrasion -e git+https://github.com/chrisjrn/registrasion-stripe.git@master#egg=registrasion-stripe