From 5b6eae76455e1b9f59a4c8d93fb3cf153b90afb9 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 23 Mar 2023 17:42:51 +0100
Subject: [PATCH] Cleanup

---
 app/admin/routes.py                     |  32 ++++---
 app/settings/forms.py                   |  55 ++++++++++--
 app/settings/routes.py                  | 100 +++++++++------------
 app/templates/admin/corpora.html.j2     |   9 +-
 app/templates/admin/user.html.j2        |  20 +++--
 app/templates/admin/users.html.j2       |   9 +-
 app/templates/settings/settings.html.j2 | 110 ++++++++++--------------
 7 files changed, 177 insertions(+), 158 deletions(-)

diff --git a/app/admin/routes.py b/app/admin/routes.py
index c1014250..0b4ac8fc 100644
--- a/app/admin/routes.py
+++ b/app/admin/routes.py
@@ -2,8 +2,8 @@ from flask import flash, redirect, render_template, request, url_for
 from flask_breadcrumbs import register_breadcrumb
 from app import db, hashids
 from app.models import Corpus, Role, User, UserSettingJobStatusMailNotificationLevel
-from app.settings.forms import EditNotificationSettingsForm
-from app.settings.forms import EditProfileSettingsForm
+from app.settings.forms import EditNotificationsForm
+from app.settings.forms import EditAccountForm
 from . import bp
 from .forms import AdminEditUserForm
 from app.users.utils import (
@@ -24,22 +24,22 @@ def admin():
 @bp.route('/corpora')
 @register_breadcrumb(bp, '.corpora', 'Corpora')
 def corpora():
-    corpora = [x.to_json_serializeable(backrefs=True) for x in Corpus.query.all()]
+    corpora = Corpus.query.all()
     return render_template(
         'admin/corpora.html.j2',
-        corpora=corpora,
-        title='Corpora'
+        title='Corpora',
+        corpora=corpora
     )
 
 
 @bp.route('/users')
 @register_breadcrumb(bp, '.users', '<i class="material-icons left">group</i>Users')
 def users():
-    users = [x.to_json_serializeable(backrefs=True) for x in User.query.all()]
+    users = User.query.all()
     return render_template(
         'admin/users.html.j2',
-        users=users,
-        title='Users'
+        title='Users',
+        users=users
     )
 
 
@@ -47,13 +47,11 @@ def users():
 @register_breadcrumb(bp, '.users.entity', '', dynamic_list_constructor=user_dlc)
 def user(user_id):
     user = User.query.get_or_404(user_id)
-    return render_template('admin/user.html.j2', title=user.username, user=user)
-
-
-@bp.route('/users/<hashid:user_id>/dashboard')
-@register_breadcrumb(bp, '.users.entity.dashboard', 'Dashboard', endpoint_arguments_constructor=user_eac)
-def user_dashboard(user_id):
-    return render_template('main/dashboard.html.j2', title='Dashboard')
+    return render_template(
+        'admin/user.html.j2',
+        title=user.username,
+        user=user
+    )
 
 
 @bp.route('/users/<hashid:user_id>/edit', methods=['GET', 'POST'])
@@ -64,12 +62,12 @@ def edit_user(user_id):
         data={'confirmed': user.confirmed, 'role': user.role.hashid},
         prefix='admin-edit-user-form'
     )
-    edit_profile_settings_form = EditProfileSettingsForm(
+    edit_profile_settings_form = EditAccountForm(
         user,
         data=user.to_json_serializeable(),
         prefix='edit-profile-settings-form'
     )
-    edit_notification_settings_form = EditNotificationSettingsForm(
+    edit_notification_settings_form = EditNotificationsForm(
         data=user.to_json_serializeable(),
         prefix='edit-notification-settings-form'
     )
diff --git a/app/settings/forms.py b/app/settings/forms.py
index a814feee..7a38e074 100644
--- a/app/settings/forms.py
+++ b/app/settings/forms.py
@@ -1,3 +1,4 @@
+from flask_login import current_user
 from flask_wtf import FlaskForm
 from wtforms import (
     BooleanField,
@@ -20,7 +21,8 @@ from app.models import User, UserSettingJobStatusMailNotificationLevel
 from app.auth import USERNAME_REGEX
 from app.wtf_validators import FileSizeLimit
 
-class EditProfileSettingsForm(FlaskForm):
+
+class EditAccountForm(FlaskForm):
     email = StringField(
         'E-Mail',
         validators=[DataRequired(), Length(max=254), Email()]
@@ -41,7 +43,12 @@ class EditProfileSettingsForm(FlaskForm):
     )
     submit = SubmitField()
     
-    def __init__(self, user, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
+        user = kwargs.get('user', current_user._get_current_object())
+        if 'data' not in kwargs:
+            kwargs['data'] = user.to_json_serializeable()
+        if 'prefix' not in kwargs:
+            kwargs['prefix'] = 'edit-profile-settings-form'
         super().__init__(*args, **kwargs)
         self.user = user
 
@@ -55,7 +62,11 @@ class EditProfileSettingsForm(FlaskForm):
                 and User.query.filter_by(username=field.data).first()):
             raise ValidationError('Username already in use')
 
-class EditPublicProfileInformationForm(FlaskForm):
+    def validate_on_submit(self):
+        return self.submit.data and self.validate()
+
+
+class EditProfileForm(FlaskForm):
     show_email = BooleanField('Email')
     show_last_seen = BooleanField('Last seen')
     show_member_since = BooleanField('Member since')
@@ -67,13 +78,11 @@ class EditPublicProfileInformationForm(FlaskForm):
         'Full name',
         validators=[Length(max=128)]
     )
-    style={'style': 'overflow: auto;'}
     about_me = TextAreaField(
         'About me', 
         validators=[
             Length(max=254)
-        ],
-        render_kw=style
+        ]
     )
     website = StringField(
         'Website',
@@ -93,13 +102,24 @@ class EditPublicProfileInformationForm(FlaskForm):
             Length(max=128)
         ]
     )
-
     submit = SubmitField()
 
+    def __init__(self, *args, **kwargs):
+        if 'data' not in kwargs:
+            user = current_user._get_current_object()
+            kwargs['data'] = user.to_json_serializeable()
+        if 'prefix' not in kwargs:
+            kwargs['prefix'] = 'edit-public-profile-information-form'
+        super().__init__(*args, **kwargs)
+
     def validate_image_file(self, field):
         if not field.data.filename.lower().endswith('.jpg' or '.png' or '.jpeg'):
             raise ValidationError('only .jpg, .png and .jpeg!')
 
+    def validate_on_submit(self):
+        return self.submit.data and self.validate()
+
+
 class ChangePasswordForm(FlaskForm):
     password = PasswordField('Old password', validators=[DataRequired()])
     new_password = PasswordField(
@@ -118,7 +138,10 @@ class ChangePasswordForm(FlaskForm):
     )
     submit = SubmitField()
 
-    def __init__(self, user, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
+        user = kwargs.get('user', current_user._get_current_object())
+        if 'prefix' not in kwargs:
+            kwargs['prefix'] = 'change-password-form'
         super().__init__(*args, **kwargs)
         self.user = user
 
@@ -126,8 +149,11 @@ class ChangePasswordForm(FlaskForm):
         if not self.user.verify_password(field.data):
             raise ValidationError('Invalid password')
 
+    def validate_on_submit(self):
+        return self.submit.data and self.validate()
 
-class EditNotificationSettingsForm(FlaskForm):
+
+class EditNotificationsForm(FlaskForm):
     job_status_mail_notification_level = SelectField(
         'Job status mail notification level',
         choices=[
@@ -137,3 +163,14 @@ class EditNotificationSettingsForm(FlaskForm):
         validators=[DataRequired()]
     )
     submit = SubmitField()
+
+    def __init__(self, *args, **kwargs):
+        if 'data' not in kwargs:
+            user = current_user._get_current_object()
+            kwargs['data'] = user.to_json_serializeable()
+        if 'prefix' not in kwargs:
+            kwargs['prefix'] = 'edit-notification-settings-form'
+        super().__init__(*args, **kwargs)
+
+    def validate_on_submit(self):
+        return self.submit.data and self.validate()
diff --git a/app/settings/routes.py b/app/settings/routes.py
index a4e1e124..dba854b0 100644
--- a/app/settings/routes.py
+++ b/app/settings/routes.py
@@ -1,20 +1,14 @@
-from flask import (
-    abort,
-    flash, 
-    redirect, 
-    render_template,
-    url_for
-)
+from flask import abort, flash, redirect, render_template, url_for
 from flask_breadcrumbs import register_breadcrumb
 from flask_login import current_user, login_required
 from app import db
-from app.models import Avatar, ProfilePrivacySettings
+from app.models import Avatar
 from . import bp
 from .forms import (
   ChangePasswordForm,
-  EditNotificationSettingsForm,
-  EditProfileSettingsForm,
-  EditPublicProfileInformationForm
+  EditNotificationsForm,
+  EditAccountForm,
+  EditProfileForm
 )
 
 
@@ -22,81 +16,73 @@ from .forms import (
 @register_breadcrumb(bp, '.', '<i class="material-icons left">settings</i>Settings')
 @login_required
 def settings():
+    user = current_user._get_current_object()
     # region forms
-    edit_profile_settings_form = EditProfileSettingsForm(
-        current_user,
-        data=current_user.to_json_serializeable(),
-        prefix='edit-profile-settings-form'
-    )
-    edit_public_profile_information_form = EditPublicProfileInformationForm(
-        data=current_user.to_json_serializeable(),
-        prefix='edit-public-profile-information-form'
-    )
-    change_password_form = ChangePasswordForm(
-        current_user,
-        prefix='change-password-form'
-    )
-    edit_notification_settings_form = EditNotificationSettingsForm(
-        data=current_user.to_json_serializeable(),
-        prefix='edit-notification-settings-form'
-    )
+    edit_account_form = EditAccountForm()
+    edit_profile_form = EditProfileForm()
+    change_password_form = ChangePasswordForm()
+    edit_notifications_form = EditNotificationsForm()
     # endregion forms
     # region handle edit profile settings form
-    if edit_profile_settings_form.validate_on_submit():
-        current_user.email = edit_profile_settings_form.email.data
-        current_user.username = edit_profile_settings_form.username.data
+    if edit_account_form.validate_on_submit():
+        user.email = edit_account_form.email.data
+        user.username = edit_account_form.username.data
         db.session.commit()
         flash('Profile settings updated')
         return redirect(url_for('.settings'))
     # endregion handle edit profile settings forms
     # region handle edit public profile information form
-    if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate():
-        print(edit_public_profile_information_form.show_email.data)
-        if edit_public_profile_information_form.show_email.data:
-            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL)
+    if edit_profile_form.validate_on_submit():
+        if edit_profile_form.show_email.data:
+            user.add_profile_privacy_setting('SHOW_EMAIL')
         else:
-            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL)
-        if edit_public_profile_information_form.show_last_seen.data:
-            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN)
+            user.remove_profile_privacy_setting('SHOW_EMAIL')
+        if edit_profile_form.show_last_seen.data:
+            user.add_profile_privacy_setting('SHOW_LAST_SEEN')
         else:
-            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_LAST_SEEN)
-        if edit_public_profile_information_form.show_member_since.data:
-            current_user.add_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE)
+            user.remove_profile_privacy_setting('SHOW_LAST_SEEN')
+        if edit_profile_form.show_member_since.data:
+            user.add_profile_privacy_setting('SHOW_MEMBER_SINCE')
         else:
-            current_user.remove_profile_privacy_setting(ProfilePrivacySettings.SHOW_MEMBER_SINCE)
-        if edit_public_profile_information_form.avatar.data:
+            user.remove_profile_privacy_setting('SHOW_MEMBER_SINCE')
+        if edit_profile_form.avatar.data:
             try:
-                Avatar.create(edit_public_profile_information_form.avatar.data, user=current_user)
+                Avatar.create(
+                    edit_profile_form.avatar.data,
+                    user=user
+                )
             except (AttributeError, OSError):
                 abort(500)
-        current_user.about_me = edit_public_profile_information_form.about_me.data
-        current_user.location = edit_public_profile_information_form.location.data
-        current_user.organization = edit_public_profile_information_form.organization.data
-        current_user.website = edit_public_profile_information_form.website.data
-        current_user.full_name = edit_public_profile_information_form.full_name.data
+        user.about_me = edit_profile_form.about_me.data
+        user.location = edit_profile_form.location.data
+        user.organization = edit_profile_form.organization.data
+        user.website = edit_profile_form.website.data
+        user.full_name = edit_profile_form.full_name.data
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.settings'))
     # endregion handle edit public profile information form
     # region handle change_password_form POST
-    if change_password_form.submit.data and change_password_form.validate():
-        current_user.password = change_password_form.new_password.data
+    if change_password_form.validate_on_submit():
+        user.password = change_password_form.new_password.data
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.settings'))
     # endregion handle change_password_form POST
     # region handle edit_notification_settings_form POST
-    if edit_notification_settings_form.submit and edit_notification_settings_form.validate():
-        current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data
+    if edit_notifications_form.validate_on_submit():
+        user.setting_job_status_mail_notification_level = \
+            edit_notifications_form.job_status_mail_notification_level.data
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.settings'))
     # endregion handle edit_notification_settings_form POST
     return render_template(
         'settings/settings.html.j2',
-        edit_profile_settings_form=edit_profile_settings_form,
-        edit_public_profile_information_form=edit_public_profile_information_form,
+        title='Settings',
         change_password_form=change_password_form,
-        edit_notification_settings_form=edit_notification_settings_form,
-        title='Settings'
+        edit_account_form=edit_account_form,
+        edit_notifications_form=edit_notifications_form,
+        edit_profile_form=edit_profile_form,
+        user=user
     )
diff --git a/app/templates/admin/corpora.html.j2 b/app/templates/admin/corpora.html.j2
index 99fcc661..cc4a177c 100644
--- a/app/templates/admin/corpora.html.j2
+++ b/app/templates/admin/corpora.html.j2
@@ -18,6 +18,13 @@
 <script>
   let corpusListElement = document.querySelector('#corpus-list');
   let corpusList = new CorpusList(corpusListElement);
-  corpusList.add({{ corpora|tojson }});
+  corpusList.add(
+    [
+      {% for corpus in corpora %}
+      {{ corpus.to_json_serializeable(backrefs=True)|tojson }}
+      {% if not loop.last %},{% endif %}
+      {% endfor %}
+    ]
+  );
 </script>
 {% endblock scripts %}
diff --git a/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2
index f8943430..403828f2 100644
--- a/app/templates/admin/user.html.j2
+++ b/app/templates/admin/user.html.j2
@@ -9,12 +9,18 @@
     </div>
     <div class="col s12 l10">
       <h1 id="title">{{ title }}</h1>
-      <span class="chip hoverable tooltipped no-autoinit" id="user-role-chip">{{ user.role.name }}</span>
-      <span class="chip white-text" id="user-confirmed-chip" style="background-color: {{ '#4caf50' if user.confirmed else '#f44336' }};">{{ 'confirmed' if user.confirmed else 'unconfirmed' }}</span>
-      <p id="description">{{ user.about_me }}</p>
+      <p>
+        <span class="chip hoverable tooltipped no-autoinit" id="user-role-chip">{{ user.role.name }}</span>
+        {% if user.confirmed %}
+        <span class="chip white-text" id="user-confirmed-chip" style="background-color: #4caf50;">confirmed</span>
+        {% else %}
+        <span class="chip white-text" id="user-confirmed-chip" style="background-color: #f44336;">unconfirmed</span>
+        {% endif %}
+      </p>
+      <p>{{ user.about_me }}</p>
     </div>
 
-    <div class="col s12">&nbsp;</div>
+    <div class="col s12 hide-on-med-and-down">&nbsp;</div>
 
     <div class="col s12">
       <ul class="tabs tabs-fixed-width z-depth-1">
@@ -34,8 +40,8 @@
             <li>Email: {{ user.email }}</li>
             <li>Id: {{ user.id }}</li>
             <li>Hashid: {{ user.hashid }}</li>
-            <li>Member since: {{ user.member_since }}</li>
-            <li>Last seen: {{ user.last_seen }}</li>
+            <li>Member since: {{ user.member_since.strftime('%Y-%m-%d') }}</li>
+            <li>Last seen: {{ user.last_seen.strftime('%Y-%m-%d') }}</li>
           </ul>
         </div>
         <div class="card-action right-align">
@@ -89,7 +95,7 @@
     <p>Do you really want to delete the user {{ user.username }}? All associated data will be permanently deleted!</p>
   </div>
   <div class="modal-footer">
-    <a href="#!" class="btn modal-close waves-effect waves-light">Cancel</a>
+    <a class="btn modal-close waves-effect waves-light">Cancel</a>
     <a href="{{ url_for('.delete_user', user_id=user.id) }}" class="btn red modal-close waves-effect waves-light"><i class="material-icons left">delete</i>Delete</a>
   </div>
 </div>
diff --git a/app/templates/admin/users.html.j2 b/app/templates/admin/users.html.j2
index 25b27c95..a71c8f59 100644
--- a/app/templates/admin/users.html.j2
+++ b/app/templates/admin/users.html.j2
@@ -23,6 +23,13 @@
 <script>
   let adminUserListElement = document.querySelector('#admin-user-list');
   let adminUserList = new AdminUserList(adminUserListElement);
-  adminUserList.add({{ users|tojson }});
+  adminUserList.add(
+    [
+      {% for user in users %}
+      {{ user.to_json_serializeable(backrefs=True)|tojson }}
+      {% if not loop.last %},{% endif %}
+      {% endfor %}
+    ]
+  );
 </script>
 {% endblock scripts %}
diff --git a/app/templates/settings/settings.html.j2 b/app/templates/settings/settings.html.j2
index 282d4185..b219d3e6 100644
--- a/app/templates/settings/settings.html.j2
+++ b/app/templates/settings/settings.html.j2
@@ -18,7 +18,7 @@
     </div>
     <div class="col s8">
       <br>
-      <ul class="collapsible">
+      <ul class="collapsible no-autoinit settings-collapsible">
         <li>
           <div class="collapsible-header" style="justify-content: space-between;">
             <span>User Settings</span>
@@ -28,48 +28,26 @@
             <form method="POST" enctype="multipart/form-data">
                 <div class="row">
                   <div class="col s6">
-                    {{ edit_profile_settings_form.hidden_tag() }}
-                    {{ wtf.render_field(edit_profile_settings_form.username, material_icon='person') }}
-                    {{ wtf.render_field(edit_profile_settings_form.email, material_icon='email') }}
+                    {{ edit_account_form.hidden_tag() }}
+                    {{ wtf.render_field(edit_account_form.username, material_icon='person') }}
+                    {{ wtf.render_field(edit_account_form.email, material_icon='email') }}
                   </div>
                 </div>
               <div class="right-align">
-                {{ wtf.render_field(edit_profile_settings_form.submit, material_icon='send') }}
+                {{ wtf.render_field(edit_account_form.submit, material_icon='send') }}
               </div>
             </form>
           </div>
         </li>
-        {# <li>
-          <div class="collapsible-header" style="justify-content: space-between;"><span>Privacy Settings</span><i class="material-icons caret right">keyboard_arrow_right</i></div>
-          <div class="collapsible-body">
-            <form method="POST">
-              {{ edit_privacy_settings_form.hidden_tag() }}
-              <br>
-              {{ wtf.render_field(edit_privacy_settings_form.is_public, id='public-profile') }}
-              <br>
-              <hr>
-              <br>
-              {{ wtf.render_field(edit_privacy_settings_form.show_email, data_action='disable', disabled=true) }}
-              <br>
-              {{ wtf.render_field(edit_privacy_settings_form.show_last_seen, data_action='disable', disabled=true) }}
-              <br>
-              {{ wtf.render_field(edit_privacy_settings_form.show_member_since, data_action='disable', disabled=true) }}
-              <br>
-              <div class="right-align">
-                {{ wtf.render_field(edit_privacy_settings_form.submit, material_icon='send') }}
-              </div>
-            </form>
-          </div>
-        </li> #}
         <li>
           <div class="collapsible-header" style="justify-content: space-between;"><span>Public Profile</span><i class="material-icons caret right">keyboard_arrow_right</i></div>
           <div class="collapsible-body">
             <form method="POST" enctype="multipart/form-data">
-              {{ edit_public_profile_information_form.hidden_tag() }}
+              {{ edit_profile_form.hidden_tag() }}
               <div class="switch">
                 <label>
                   private
-                  <input {% if current_user.is_public %}checked{% endif %} id="profile-is-public-switch" type="checkbox">
+                  <input {% if user.is_public %}checked{% endif %} id="profile-is-public-switch" type="checkbox">
                   <span class="lever"></span>
                   public
                 </label>
@@ -82,42 +60,42 @@
                 <div class="col s3">
                   <p>
                     <label>
-                      {{ edit_public_profile_information_form.show_email() }}
-                      <span>{{ edit_public_profile_information_form.show_email.label.text }}</span>
+                      {{ edit_profile_form.show_email() }}
+                      <span>{{ edit_profile_form.show_email.label.text }}</span>
                     </label>
                   </p>
                 </div>
                 <div class="col s3">
                   <p>
                     <label>
-                      {{ edit_public_profile_information_form.show_last_seen() }}
-                      <span>{{ edit_public_profile_information_form.show_last_seen.label.text }}</span>
+                      {{ edit_profile_form.show_last_seen() }}
+                      <span>{{ edit_profile_form.show_last_seen.label.text }}</span>
                     </label>
                   </p>
                 </div>
                 <div class="col s4">
                   <p>
                     <label>
-                      {{ edit_public_profile_information_form.show_member_since() }}
-                      <span>{{ edit_public_profile_information_form.show_member_since.label.text }}</span>
+                      {{ edit_profile_form.show_member_since() }}
+                      <span>{{ edit_profile_form.show_member_since.label.text }}</span>
                     </label>
                   </p>
                 </div>
               </div>
               <p></p>
               <br>
-              {{ wtf.render_field(edit_public_profile_information_form.full_name, material_icon='badge') }}
-              {{ wtf.render_field(edit_public_profile_information_form.about_me, material_icon='description', id='about-me-textfield') }}
-              {{ wtf.render_field(edit_public_profile_information_form.website, material_icon='laptop') }}
-              {{ wtf.render_field(edit_public_profile_information_form.organization, material_icon='business') }}
-              {{ wtf.render_field(edit_public_profile_information_form.location, material_icon='location_on') }}
+              {{ wtf.render_field(edit_profile_form.full_name, material_icon='badge') }}
+              {{ wtf.render_field(edit_profile_form.about_me, material_icon='description', id='about-me-textfield') }}
+              {{ wtf.render_field(edit_profile_form.website, material_icon='laptop') }}
+              {{ wtf.render_field(edit_profile_form.organization, material_icon='business') }}
+              {{ wtf.render_field(edit_profile_form.location, material_icon='location_on') }}
               <p></p>
               <div class="row">
                 <div class="col s12 m2">
-                  <img src="{{ url_for('users.user_avatar', user_id=current_user.id) }}" alt="user-image" class="circle responsive-img" id="avatar">
+                  <img src="{{ url_for('users.user_avatar', user_id=user.id) }}" alt="user-image" class="circle responsive-img" id="avatar">
                 </div>
                 <div class="col s12 m6">
-                  {{ wtf.render_field(edit_public_profile_information_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }}
+                  {{ wtf.render_field(edit_profile_form.avatar, accept='image/jpeg, image/png, image/gif', placeholder='Choose an image file', id='avatar-upload') }}
                 </div>
                 <div class="col s12 m1">
                   <a class="btn-floating red waves-effect waves-light modal-trigger" style="margin-top:15px;" href="#delete-avatar-modal"><i class="material-icons">delete</i></a>
@@ -126,7 +104,7 @@
               <br>
               <p></p>
               <div class="right-align">
-                {{ wtf.render_field(edit_public_profile_information_form.submit, material_icon='send') }}
+                {{ wtf.render_field(edit_profile_form.submit, material_icon='send') }}
               </div>              
             </form>
           </div>
@@ -144,7 +122,7 @@
     </div>
     <div class="col s8">
       <br>
-      <ul class="collapsible">
+      <ul class="collapsible no-autoinit settings-collapsible">
         <li>
           <div class="collapsible-header" style="justify-content: space-between;">
             <span>Notification Settings</span>
@@ -152,10 +130,10 @@
           </div>
           <div class="collapsible-body">
             <form method="POST">
-              {{ edit_notification_settings_form.hidden_tag() }}
-              {{ wtf.render_field(edit_notification_settings_form.job_status_mail_notification_level, material_icon='notifications') }}
+              {{ edit_notifications_form.hidden_tag() }}
+              {{ wtf.render_field(edit_notifications_form.job_status_mail_notification_level, material_icon='notifications') }}
               <div class="right-align">
-                {{ wtf.render_field(edit_notification_settings_form.submit, material_icon='send') }}
+                {{ wtf.render_field(edit_notifications_form.submit, material_icon='send') }}
               </div>
             </form>
           </div>
@@ -204,7 +182,7 @@
 <div class="modal" id="delete-avatar-modal">
   <div class="modal-content">
     <h4>Confirm Avatar deletion</h4>
-    <p>Do you really want to delete your Avatar?</p>
+    <p>Do you really want to delete <b>{{ user.username }}</b>’s avatar?</p>
   </div>
   <div class="modal-footer">
     <a class="btn modal-close waves-effect waves-light">Cancel</a>
@@ -214,7 +192,7 @@
 <div class="modal" id="delete-user">
   <div class="modal-content">
     <h4>Confirm User deletion</h4>
-    <p>Do you really want to delete the User <b>{{ current_user.username }}</b>? All files will be permanently deleted!</p>
+    <p>Do you really want to delete the User <b>{{ user.username }}</b>? All files will be permanently deleted!</p>
   </div>
   <div class="modal-footer">
     <a class="btn modal-close waves-effect waves-light">Cancel</a>
@@ -226,20 +204,20 @@
 {% block scripts %}
 {{ super() }}
 <script>
-let deleteButton = document.querySelector('#delete-avatar');
-let avatar = document.querySelector('#avatar');
-let avatarUpload = document.querySelector('#avatar-upload');
+let deleteButtonElement = document.querySelector('#delete-avatar');
+let avatarElement = document.querySelector('#avatar');
+let avatarUploadElement = document.querySelector('#avatar-upload');
 
-avatarUpload.addEventListener('change', function() {
-  let file = this.files[0];
-  avatar.src = URL.createObjectURL(file);
+avatarUploadElement.addEventListener('change', () => {
+  let file = avatarUploadElement.files[0];
+  avatarElement.src = URL.createObjectURL(file);
 });
 
-deleteButton.addEventListener('click', () => {
+deleteButtonElement.addEventListener('click', () => {
   Requests.settings.entity.deleteAvatar(currentUserId)
     .then(
       (response) => {
-        avatar.src = "{{ url_for('static', filename='images/user_avatar.png') }}";
+        avatarElement.src = {{ url_for('static', filename='images/user_avatar.png')|tojson }};
       }
     );
 });
@@ -249,20 +227,21 @@ document.querySelector('#delete-user-button').addEventListener('click', (event)
     .then((response) => {window.location.href = '/';});
 });
 
-document.querySelectorAll('.collapsible').forEach((collapsible) => {
+for (let collapsibleElement of document.querySelectorAll('.collapsible.no-autoinit.settings-collapsible')) {
   M.Collapsible.init(
-    collapsible, 
+    collapsibleElement,
     {
-      onOpenStart: (event) => {
-        let caret = event.querySelector('.caret');
+      onOpenStart: (collapsibleItemElement) => {
+        let caret = collapsibleItemElement.querySelector('.caret');
         caret.innerHTML = 'keyboard_arrow_down';
       },
-      onCloseStart: (event) => {
-        let caret = event.querySelector('.caret');
+      onCloseStart: (collapsibleItemElement) => {
+        let caret = collapsibleItemElement.querySelector('.caret');
         caret.innerHTML = 'keyboard_arrow_right';
       }
-    });
-});
+    }
+  );
+}
 
 // #region Public Switch
 let profileIsPublicSwitchElement = document.querySelector('#profile-is-public-switch');
@@ -274,6 +253,5 @@ profileIsPublicSwitchElement.addEventListener('change', (event) => {
     });
 });
 // #endregion Public Switch
-
 </script>
 {% endblock scripts %}