diff --git a/requirements/base.txt b/requirements/base.txt index 2c55f0f..e04f50b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -17,5 +17,3 @@ PyJWT pytz requests requests-oauthlib -social-auth-app-django -social-auth-core diff --git a/src/kasu/settings.py b/src/kasu/settings.py index 9af87a5..3f3f30f 100644 --- a/src/kasu/settings.py +++ b/src/kasu/settings.py @@ -49,7 +49,6 @@ PREREQ_APPS = [ 'ckeditor', 'ckeditor_uploader', 'easy_thumbnails', - 'social_django', ] PROJECT_APPS = [ 'kasu', @@ -103,8 +102,6 @@ TEMPLATES = [ 'django.contrib.messages.context_processors.messages', 'django.contrib.messages.context_processors.messages', 'events.context_processors.events_overview', - 'social_django.context_processors.backends', - 'social_django.context_processors.login_redirect' ], 'loaders': [ ('django.template.loaders.cached.Loader', [ @@ -132,24 +129,10 @@ DEFAULT_FROM_EMAIL = "" # Login Settings ACCOUNT_ACTIVATION_DAYS = 5 AUTH_USER_MODEL = 'membership.Membership' -AUTHENTICATION_BACKENDS = ('social_core.backends.facebook.FacebookOAuth2', - 'social_core.backends.google.GoogleOAuth2', - 'social_core.backends.twitter.TwitterOAuth', - 'django.contrib.auth.backends.ModelBackend',) +AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) LOGIN_URL = '/membership/login/' LOGIN_ERROR_URL = '/membership/login/error/' LOGIN_REDIRECT_URL = '/users/' -SOCIAL_AUTH_CHANGE_SIGNAL_ONLY = False -SOCIAL_AUTH_ENABLED_BACKENDS = ('facebook-oauth2', 'google-oauth2', 'twitter') -SOCIAL_AUTH_NEW_USER_REDIRECT_URL = '/users/' -SOCIAL_AUTH_SLUGIFY_USERNAMES = True -SOCIAL_AUTH_FACEBOOK_KEY = '' -SOCIAL_AUTH_FACEBOOK_SECRET = '' -SOCIAL_AUTH_FACEBOOK_SCOPE = ['user_about_me', 'email'] -SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = '' -SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = '' -SOCIAL_AUTH_TWITTER_KEY = '' -SOCIAL_AUTH_TWITTER_SECRET = '' # Localization USE_I18N = True diff --git a/src/kasu/templates/base.html b/src/kasu/templates/base.html index bb6a392..14e5dff 100644 --- a/src/kasu/templates/base.html +++ b/src/kasu/templates/base.html @@ -185,12 +185,6 @@ {% trans "no user logged in" %} - {% trans "register" %} {% trans "login" %} - - - {% endif %} diff --git a/src/kasu/urls.py b/src/kasu/urls.py index 05be4a4..44de711 100644 --- a/src/kasu/urls.py +++ b/src/kasu/urls.py @@ -62,7 +62,6 @@ urlpatterns = [ # Ignore PyLintBear (C0103) url(r'^(?P[\-\d\w\/]+)\.html$', views.PageHtml.as_view(), name='view-page'), url(r'^(?P[\-\d\w\/]+)\.pdf$', views.PagePdf.as_view()), - url('', include('social_django.urls', namespace='social')) ] if settings.DEBUG: diff --git a/src/membership/templates/membership/membership_detail.html b/src/membership/templates/membership/membership_detail.html index 009de68..ca1e764 100644 --- a/src/membership/templates/membership/membership_detail.html +++ b/src/membership/templates/membership/membership_detail.html @@ -17,7 +17,7 @@ {% trans 'Profile Image' %}{% else %}
Noch kein Foto hoch geladen
{% endif %} -
+
{% if kyu_dan_ranking %}

Mahjong

    @@ -36,41 +36,28 @@
{% endif %} - +
{% if membership == user or perms.membership.change_membership%} - +

{% trans 'private data' %}

{% blocktrans %}This data can only be seen by yourself and members of the board.{% endblocktrans %}

    -
  • {% trans "name" %}: {{membership.first_name}} {{membership.last_name}}
    • -
  • {% trans "birthday" %}: {{membership.birthday}}
    • -
  • {% trans "Address" %}:
    {{ membership.street_name }}
    {{ membership.post_code }} {{ membership.city }}
    • - -
  • {% trans "Email" %}: {{membership.email}}
    • -
  • {% trans "Telephone" %}: {{membership.telephone}}
    • - + {% if membership.first_name %}
  • {% trans "name" %}: {{membership.first_name}} {{membership.last_name}}
    • {% endif %} + {% if membership.birthday %}
  • {% trans "birthday" %}: {{membership.birthday}}
    • {% endif %} + {% if membership.street_name %}
  • {% trans "Address" %}:
    {{ membership.street_name }}
    {{ membership.post_code }} {{ membership.city }}
    • {% endif %} + {% if membership.email %}
  • {% trans "Email" %}: {{membership.email}}
    • {% endif %} + {% if membership.telephone %}
  • {% trans "Telephone" %}: {{membership.telephone}}
    • {% endif %}
  • {% trans "Member Since" %}: {{membership.date_joined}}
  • {% trans "Last Login" %}: {{membership.last_login}}
    • - {% if website %} -
  • Homepage: {{website}}
    • - {% endif %}
+ {% ifequal membership user %} + {% trans "Edit Profile" %} + {% trans 'Change Password' %} + {% endifequal %} +
{% endif %} -
-{% ifequal membership user %} -
- {% trans "Edit Profile" %} - {% trans 'Change Password' %} - - {% blocktrans with 'Facebook' as name %}Associate with {{ name }}{% endblocktrans %} - - {% blocktrans with 'Twitter' as name %}Associate with {{ name }}{% endblocktrans %} - - {% blocktrans with 'Google' as name %}Associate with {{ name }}{% endblocktrans %} - -
{% endifequal %} {% block score_list %} {% endblock %}{% endblock %} diff --git a/src/membership/templates/registration/login.html b/src/membership/templates/registration/login.html index a542834..f09c442 100755 --- a/src/membership/templates/registration/login.html +++ b/src/membership/templates/registration/login.html @@ -9,9 +9,12 @@ {% block maincontent %}
{% csrf_token %} -
+
+ {{ current_page.content }} +
+
-   + {% trans 'login' %} {% csrf_token %} {% include 'form.html' %} {% if form.errors %}

{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

{% endif %} @@ -25,19 +28,6 @@
-
-

{% trans 'or' %}

-
-
- - {% trans 'Login with Facebook' %}
- - {% trans 'Login with Twitter' %}
- - {% trans 'Login with Google' %} -
-
- {{ current_page.content }} -
{% endblock %} +{% endblock %}