clean up
This commit is contained in:
@@ -32,8 +32,6 @@ INSTALLED_APPS.extend([
|
||||
'image_cropping',
|
||||
])
|
||||
|
||||
AUTH_USER_MODEL = 'project.User'
|
||||
|
||||
MIDDLEWARE_CLASSES.extend([
|
||||
# add your own middlewares here
|
||||
])
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
<meta name="description" content="{% block description %}{% page_attribute 'meta_description' %}{% endblock %}">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<meta name="robots" content="noindex, nofollow"/>
|
||||
|
||||
{% block extra_meta %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{% spaceless %}
|
||||
{% if people %}
|
||||
<ul>
|
||||
{% for person in people %}
|
||||
<li>{{ person|escape }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endspaceless %}
|
||||
@@ -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 %}
|
||||
@@ -1,34 +0,0 @@
|
||||
{% extends "admin/change_form.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Export form submissions" %}</h1>
|
||||
{% if errors %}
|
||||
<p class="errornote">
|
||||
{% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
|
||||
</p>
|
||||
{{ adminform.non_field_errors }}
|
||||
{% endif %}
|
||||
<form action="." method="post">
|
||||
{% csrf_token %}
|
||||
{% block aldryn_form_hidden %}{% endblock %}
|
||||
<div>
|
||||
<fieldset class="module aligned">
|
||||
{% for field in adminform %}
|
||||
<div class="form-row">
|
||||
<div{% if field.errors %} class="errors"{% endif %}>
|
||||
{% if field.errors %}{{ field.errors }}{% endif %}
|
||||
{{ field.label_tag }}
|
||||
{{ field }}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="submit-row">
|
||||
{% block aldryn_form_buttons %}
|
||||
<input type="submit" value="{% trans "Export" %}" class="default" name="export">
|
||||
{% endblock %}
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
@@ -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 %}
|
||||
<input type="submit" class="default" value="{% trans 'Export' %}" />
|
||||
{% else %}
|
||||
<input type="submit" class="default" value="{% trans 'Continue' %}" />
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,16 +0,0 @@
|
||||
{% extends "admin/change_list.html" %}
|
||||
{% load i18n admin_urls %}
|
||||
|
||||
{% block object-tools %}
|
||||
<ul class="object-tools">
|
||||
{% block object-tools-items %}
|
||||
<li>
|
||||
{% url cl.opts|admin_urlname:'export' as export_url %}
|
||||
<a href="{{ export_url }}" class="addlink">{% trans "Export Form Entries" %}</a>
|
||||
</li>
|
||||
{% if has_add_permission %}
|
||||
{{ block.super }}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
</ul>
|
||||
{% endblock %}
|
||||
@@ -1,10 +0,0 @@
|
||||
{% extends "admin/change_form.html" %}
|
||||
{% load admin_urls %}
|
||||
{% block object-tools-items %}
|
||||
{% if original.fields.count > 0 %}
|
||||
<li>
|
||||
<a href="{% url opts|admin_urlname:'participants_export' original.pk %}">Teilnehmerliste Herunterladen (xls)</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{{ block.super }}
|
||||
{% endblock %}
|
||||
@@ -1,10 +0,0 @@
|
||||
{% extends "admin/change_form.html" %}
|
||||
{% load admin_urls %}
|
||||
{% block object-tools-items %}
|
||||
{% if not original.is_approved %}
|
||||
<li>
|
||||
<a href="{% url opts|admin_urlname:'approve' original.pk %}">Benutzer Freigeben</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{{ block.super }}
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user