From fca993213a2669605fdec91a54e34bd28f2b6259 Mon Sep 17 00:00:00 2001
From: ajurna <Wn$OtwL1u6Fl>
Date: Thu, 14 May 2020 14:16:21 +0100
Subject: [PATCH] fixed settings and user management.

---
 comic/forms.py                           | 31 +++++++++++-------------
 comic/templates/comic/settings_page.html | 12 ++++-----
 comic/templates/comic/users_page.html    |  6 ++---
 comic/urls.py                            |  4 +--
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/comic/forms.py b/comic/forms.py
index 8a76e51..c668f45 100644
--- a/comic/forms.py
+++ b/comic/forms.py
@@ -7,13 +7,13 @@ from comic.models import Setting
 
 
 class InitialSetupForm(forms.Form):
-    username = forms.CharField(help_text="Username", widget=forms.TextInput(attrs={"class": "form-control"}))
-    email = forms.CharField(help_text="Email Address", widget=forms.TextInput(attrs={"class": "form-control"}))
-    password = forms.CharField(help_text="New Password", widget=forms.PasswordInput(attrs={"class": "form-control"}))
+    username = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
+    email = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
+    password = forms.CharField(widget=forms.PasswordInput(attrs={"class": "form-control"}))
     password_confirm = forms.CharField(
-        help_text="New Password Confirmation", widget=forms.PasswordInput(attrs={"class": "form-control"})
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
-    base_dir = forms.CharField(help_text="Base Directory", widget=forms.TextInput(attrs={"class": "form-control"}))
+    base_dir = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
 
     def clean_base_dir(self):
         data = self.cleaned_data["base_dir"]
@@ -32,16 +32,14 @@ class InitialSetupForm(forms.Form):
 
 class AccountForm(forms.Form):
     username = forms.CharField(
-        help_text="Username",
         required=False,
         widget=forms.TextInput(attrs={"class": "form-control disabled", "readonly": True}),
     )
-    email = forms.CharField(help_text="Email Address", widget=forms.TextInput(attrs={"class": "form-control"}))
+    email = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
     password = forms.CharField(
-        help_text="New Password", required=False, widget=forms.PasswordInput(attrs={"class": "form-control"})
+        required=False, widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     password_confirm = forms.CharField(
-        help_text="New Password Confirmation",
         required=False,
         widget=forms.PasswordInput(attrs={"class": "form-control"}),
     )
@@ -65,11 +63,11 @@ class AccountForm(forms.Form):
 
 
 class AddUserForm(forms.Form):
-    username = forms.CharField(help_text="Username", widget=forms.TextInput(attrs={"class": "form-control"}))
-    email = forms.CharField(help_text="Email Address", widget=forms.TextInput(attrs={"class": "form-control"}))
-    password = forms.CharField(help_text="New Password", widget=forms.PasswordInput(attrs={"class": "form-control"}))
+    username = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
+    email = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
+    password = forms.CharField(widget=forms.PasswordInput(attrs={"class": "form-control"}))
     password_confirm = forms.CharField(
-        help_text="New Password Confirmation", widget=forms.PasswordInput(attrs={"class": "form-control"})
+        widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
 
     def clean_username(self):
@@ -95,13 +93,12 @@ class AddUserForm(forms.Form):
 
 class EditUserForm(forms.Form):
     username = forms.CharField(
-        help_text="Username",
         required=False,
         widget=forms.TextInput(attrs={"class": "form-control disabled", "readonly": True}),
     )
-    email = forms.CharField(help_text="Email Address", widget=forms.TextInput(attrs={"class": "form-control"}))
+    email = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
     password = forms.CharField(
-        help_text="New Password", required=False, widget=forms.PasswordInput(attrs={"class": "form-control"})
+        required=False, widget=forms.PasswordInput(attrs={"class": "form-control"})
     )
     # TODO: allow setting superuser on users
 
@@ -127,7 +124,7 @@ class EditUserForm(forms.Form):
 
 
 class SettingsForm(forms.Form):
-    base_dir = forms.CharField(help_text="Base Directory", widget=forms.TextInput(attrs={"class": "form-control"}))
+    base_dir = forms.CharField(widget=forms.TextInput(attrs={"class": "form-control"}))
 
     def clean_base_dir(self):
         data = self.cleaned_data["base_dir"]
diff --git a/comic/templates/comic/settings_page.html b/comic/templates/comic/settings_page.html
index f01050c..5640415 100644
--- a/comic/templates/comic/settings_page.html
+++ b/comic/templates/comic/settings_page.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load bootstrap4 %}
 
 {% block title %}{{ title }}{% endblock %}
 
@@ -13,13 +14,10 @@
     {% endif %}
     <form method="POST">
         {% csrf_token %}
-        {% for item in form %}
-            <div class="form-group">
-                <label for="{{ item.id_for_label }}">{{ item.help_text }}</label>
-                {{ item }}
-            </div>
-        {% endfor %}
-        <button type="submit" class="btn btn-default">Submit</button>
+        {% bootstrap_form form %}
+        {% buttons %}
+            <button type="submit" class="btn btn-secondary">Submit</button>
+        {% endbuttons %}
     </form>
     {% endblock %}
 
diff --git a/comic/templates/comic/users_page.html b/comic/templates/comic/users_page.html
index 65d4c54..8697472 100644
--- a/comic/templates/comic/users_page.html
+++ b/comic/templates/comic/users_page.html
@@ -16,15 +16,15 @@
         <tbody data-link="row" class="rowlink">
             {% for user in users %}
             <tr>
-                <td><a href="{{user.id}}/">{{user.id}}</a></td>
-                <td>{{user.username}}</td>
+                <td>{{user.id}}</td>
+                <td><a href="{% url 'user_details' user.id %}">{{user.username}}</a></td>
                 <td>{{user.email}}</td>
                 <td>{{user.is_superuser}}</td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
-    <a class="btn btn-default" href="/comic/settings/users/add/" role="button">Add User</a>
+    <a class="btn btn-secondary" href="{% url 'add_users' %}" role="button">Add User</a>
 </div>
 {% endblock %}
 {% block script %}
diff --git a/comic/urls.py b/comic/urls.py
index b11f613..cc6675c 100644
--- a/comic/urls.py
+++ b/comic/urls.py
@@ -6,8 +6,8 @@ urlpatterns = [
     url(r"^$", views.comic_list, name="index"),
     url(r"^settings/$", views.settings_page, name="settings"),
     url(r"^settings/users/$", views.users_page, name="users"),
-    url(r"^settings/users/(?P<user_id>[0-9]+)/$", views.user_config_page, name="users"),
-    url(r"^settings/users/add/$", views.user_add_page, name="users"),
+    url(r"^settings/users/(?P<user_id>[0-9]+)/$", views.user_config_page, name="user_details"),
+    url(r"^settings/users/add/$", views.user_add_page, name="add_users"),
     url(r"^account/$", views.account_page, name="account"),
     url(r"^read/(?P<comic_selector>[\w-]+)/(?P<page>[0-9]+)/$", views.read_comic, name="read_comic"),
     url(r"^read/(?P<comic_selector>[\w-]+)/(?P<page>[0-9]+)/img$", views.get_image, name="get_image"),