diff --git a/settings.py b/settings.py index 061f8d0..345f76e 100644 --- a/settings.py +++ b/settings.py @@ -32,8 +32,6 @@ INSTALLED_APPS.extend([ 'image_cropping', ]) -AUTH_USER_MODEL = 'project.User' - MIDDLEWARE_CLASSES.extend([ # add your own middlewares here ]) diff --git a/src/project/admin.py b/src/project/admin.py index df430cd..f3c0021 100644 --- a/src/project/admin.py +++ b/src/project/admin.py @@ -3,35 +3,7 @@ from django.contrib import admin from cms.extensions import PageExtensionAdmin from parler.admin import TranslatableAdmin -from project.models import ImageExtension, SliderItemQualification, Notification, User - - -@admin.register(User) -class UserAdmin(CorporateMemberZoneUserAdmin): - readonly_fields = ['last_login', 'date_joined', 'company_name', 'is_approved'] - fieldsets = ( - (None, {'fields': ('email', 'password')}), - (_('Personal info'), {'fields': ( - ('company', 'company_name',), - 'gender', - 'title', - ('first_name', 'last_name',))}), - (_('Member info'), {'fields': ( - 'member_groups', - )}), - (_('Permissions'), {'fields': ( - ('is_active', 'is_approved'), - 'is_staff', - 'is_superuser', - 'groups', - 'user_permissions' - )}), - (_('Important dates'), {'fields': ( - 'last_login', - 'date_joined' - )}), - ) - list_display = ('email', 'company', 'first_name', 'last_name', 'is_staff') +from project.models import ImageExtension, SliderItemQualification, Notification @admin.register(ImageExtension) diff --git a/src/project/models.py b/src/project/models.py index 923d03d..6fa527d 100644 --- a/src/project/models.py +++ b/src/project/models.py @@ -15,9 +15,6 @@ from image_cropping import ImageRatioField from project.utils import AbstractClassWithoutFieldsNamed as without -class User(CorporateMemberZoneAbstractUser): - pass - class ImageExtension(PageExtension): image = CroppableFilerImageField(verbose_name='Bild', null=True, blank=True) cropping = ImageRatioField('image', '1000x1000', free_crop=True) diff --git a/src/project/templates/main.html b/src/project/templates/main.html index ebfee61..a08a470 100644 --- a/src/project/templates/main.html +++ b/src/project/templates/main.html @@ -7,8 +7,6 @@ - - {% block extra_meta %} {% endblock %} diff --git a/templates/admin/aldryn_forms/display/.aldryn-folder b/templates/admin/aldryn_forms/display/.aldryn-folder deleted file mode 100644 index e69de29..0000000 diff --git a/templates/admin/aldryn_forms/display/recipients.html b/templates/admin/aldryn_forms/display/recipients.html deleted file mode 100644 index 13cc2a8..0000000 --- a/templates/admin/aldryn_forms/display/recipients.html +++ /dev/null @@ -1,9 +0,0 @@ -{% spaceless %} - {% if people %} - - {% endif %} -{% endspaceless %} diff --git a/templates/admin/aldryn_forms/display/submission_data.html b/templates/admin/aldryn_forms/display/submission_data.html deleted file mode 100644 index 92587a1..0000000 --- a/templates/admin/aldryn_forms/display/submission_data.html +++ /dev/null @@ -1,7 +0,0 @@ -{% load i18n %} -{% filter linebreaksbr %}{% spaceless %}{% for field in data %} -{% trans "Field" %}: {{ field.name }} -{% trans "Label" %}: {{ field.label }} -{% trans "Value" %}: {{ field.value }} -{% endfor %}{% endspaceless %} -{% endfilter %} diff --git a/templates/admin/aldryn_forms/export.html b/templates/admin/aldryn_forms/export.html deleted file mode 100644 index aa3d957..0000000 --- a/templates/admin/aldryn_forms/export.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "admin/change_form.html" %} -{% load i18n %} - -{% block content %} -

{% trans "Export form submissions" %}

- {% if errors %} -

- {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} -

- {{ adminform.non_field_errors }} - {% endif %} -
- {% csrf_token %} - {% block aldryn_form_hidden %}{% endblock %} -
-
- {% for field in adminform %} -
- - {% if field.errors %}{{ field.errors }}{% endif %} - {{ field.label_tag }} - {{ field }} -
-
- {% endfor %} - - -
- {% block aldryn_form_buttons %} - - {% endblock %} -
-
-{% endblock %} diff --git a/templates/admin/aldryn_forms/export_wizard.html b/templates/admin/aldryn_forms/export_wizard.html deleted file mode 100644 index 412d3b4..0000000 --- a/templates/admin/aldryn_forms/export_wizard.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "admin/aldryn_forms/export.html" %} -{% load i18n %} - -{% block aldryn_form_hidden %} - {{ wizard.management_form }} - {{ form.non_field_errors }} -{% endblock %} - -{% block aldryn_form_buttons %} - {% if wizard.steps.current == wizard.steps.last %} - - {% else %} - - {% endif %} -{% endblock %} diff --git a/templates/admin/aldryn_forms/formsubmission/.aldryn-folder b/templates/admin/aldryn_forms/formsubmission/.aldryn-folder deleted file mode 100644 index e69de29..0000000 diff --git a/templates/admin/aldryn_forms/formsubmission/change_list.html b/templates/admin/aldryn_forms/formsubmission/change_list.html deleted file mode 100644 index 3e98862..0000000 --- a/templates/admin/aldryn_forms/formsubmission/change_list.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "admin/change_list.html" %} -{% load i18n admin_urls %} - -{% block object-tools %} - -{% endblock %} diff --git a/templates/admin/corporate_member_zone/membertask/.aldryn-folder b/templates/admin/corporate_member_zone/membertask/.aldryn-folder deleted file mode 100644 index e69de29..0000000 diff --git a/templates/admin/corporate_member_zone/membertask/change_form.html b/templates/admin/corporate_member_zone/membertask/change_form.html deleted file mode 100644 index 5bcf214..0000000 --- a/templates/admin/corporate_member_zone/membertask/change_form.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "admin/change_form.html" %} -{% load admin_urls %} -{% block object-tools-items %} - {% if original.fields.count > 0 %} -
  • - Teilnehmerliste Herunterladen (xls) -
  • - {% endif %} - {{ block.super }} -{% endblock %} \ No newline at end of file diff --git a/templates/admin/corporate_member_zone/user/.aldryn-folder b/templates/admin/corporate_member_zone/user/.aldryn-folder deleted file mode 100644 index e69de29..0000000 diff --git a/templates/admin/corporate_member_zone/user/change_form.html b/templates/admin/corporate_member_zone/user/change_form.html deleted file mode 100644 index 4d62f4a..0000000 --- a/templates/admin/corporate_member_zone/user/change_form.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "admin/change_form.html" %} -{% load admin_urls %} -{% block object-tools-items %} - {% if not original.is_approved %} -
  • - Benutzer Freigeben -
  • - {% endif %} - {{ block.super }} -{% endblock %} \ No newline at end of file