diff --git a/account_manager/forms.py b/account_manager/forms.py index f7c0388..74a9df1 100644 --- a/account_manager/forms.py +++ b/account_manager/forms.py @@ -35,9 +35,9 @@ class UserGroupListForm(forms.Form): class AddLDAPGroupForm(forms.Form): - name = forms.CharField(label='Name', max_length=400) + name = forms.CharField(label='Gruppenname', max_length=400) # TODO show only allowed user - members = forms.ModelMultipleChoiceField(label='Mitglieder', widget=forms.CheckboxSelectMultiple, + members = forms.ModelMultipleChoiceField(label='Nutzer hinzufügen', widget=forms.CheckboxSelectMultiple, queryset=LdapUser.objects.all(), ) diff --git a/account_manager/models.py b/account_manager/models.py index 9d224fb..125d066 100644 --- a/account_manager/models.py +++ b/account_manager/models.py @@ -84,6 +84,7 @@ class LdapUser(Model): query = Q(username=users.pop()) for user in users: query = query | Q(username=user) + LdapUser.base_dn = LdapUser.ROOT_DN return LdapUser.objects.filter(query) @staticmethod diff --git a/core/urls.py b/core/urls.py index 4291e9f..e10bcaf 100644 --- a/core/urls.py +++ b/core/urls.py @@ -17,6 +17,7 @@ from django.contrib import admin from django.urls import path, include from django.contrib.auth import views as auth_views from django.contrib.auth.decorators import user_passes_test +from .views import about login_forbidden = user_passes_test(lambda u: u.is_anonymous(), '/') @@ -24,6 +25,7 @@ urlpatterns = [ path('', include('account_manager.urls')), path('admin/', admin.site.urls), path('accounts/login/', auth_views.LoginView.as_view(redirect_authenticated_user=True), name='login'), + path('about/', about, name='about'), path('accounts/password_reset/', auth_views.PasswordResetView.as_view(html_email_template_name='registration/password_reset_email.html'), name='password_reset'), diff --git a/core/views.py b/core/views.py new file mode 100644 index 0000000..7111e82 --- /dev/null +++ b/core/views.py @@ -0,0 +1,9 @@ +import logging + +from django.shortcuts import render + +logger = logging.getLogger(__name__) + + +def about(request): + return render(request, 'about.jinja2', {}) diff --git a/static/css/floating_labels.css b/static/css/floating_labels.css index d41a231..c1b9799 100644 --- a/static/css/floating_labels.css +++ b/static/css/floating_labels.css @@ -71,8 +71,15 @@ } /*SIDEBAR*/ + +.sidebar-bottom { + position: fixed; + width: 15rem; + bottom: 0; +} + .sidebar-wrapper { - min-height: 100vh; + min-height: calc(100vh - 56px); margin-left: -15rem; -webkit-transition: margin .25s ease-out; -moz-transition: margin .25s ease-out; @@ -82,6 +89,7 @@ .sidebar-wrapper .sidebar-heading { padding: 0.875rem 1.25rem; + margin-bottom: 0; font-size: 1.2rem; } @@ -171,6 +179,10 @@ opacity: 0; } +.table th, .table td { + padding: 0.5rem; +} + /* ------------------------------------------------------------------------------------------------------------------ */ /* -- Realm delete -- */ /* ------------------------------------------------------------------------------------------------------------------ */ diff --git a/static/images/lama.svg b/static/images/lama.svg new file mode 100644 index 0000000..91ab52c --- /dev/null +++ b/static/images/lama.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/about.jinja2 b/templates/about.jinja2 new file mode 100644 index 0000000..66e6ee3 --- /dev/null +++ b/templates/about.jinja2 @@ -0,0 +1,16 @@ +{% extends 'base.jinja2' %} +{% block content %} +
+
+
+

Diese App wurde mit viel von Micheal Götz entwickelt.

+
+

Icons

+ Das App-Icon wurde von Freepik von www.flaticon.com erstellt. +

Alle anderen Icons stammen von www.fontawesome.com .

+ + Zurück zur Startseite +
+
+
+{% endblock %} \ No newline at end of file diff --git a/templates/base.jinja2 b/templates/base.jinja2 index 079b0f9..cf4054f 100644 --- a/templates/base.jinja2 +++ b/templates/base.jinja2 @@ -29,7 +29,7 @@