From 0e4ef1b75f2f34dad163094d77b5616172ac85b0 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Sat, 30 Oct 2021 15:49:48 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20widget=5Ftweaks=20and?=
 =?UTF-8?q?=20bootstrapform=20use?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbssite/settings.py                     | 2 --
 templates/deposit.html                  | 7 +++----
 templates/inventory_add.html            | 6 ++----
 templates/registration/create_user.html | 7 +++----
 templates/registration/login_form.html  | 5 ++---
 templates/report.html                   | 3 +--
 6 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/bbssite/settings.py b/bbssite/settings.py
index 7038c67..49aff88 100755
--- a/bbssite/settings.py
+++ b/bbssite/settings.py
@@ -81,8 +81,6 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.admin",
-    "widget_tweaks",
-    "bootstrapform",
     "django_extensions",
     "rest_framework",
     "easy_thumbnails",
diff --git a/templates/deposit.html b/templates/deposit.html
index e954358..ec77ced 100644
--- a/templates/deposit.html
+++ b/templates/deposit.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load widget_tweaks %}
 {% block active_deposit %}active{% endblock %}
 
 {% block content %}
@@ -28,7 +27,7 @@
 
     {% else %}
     <form id="order" method="post" class="form-stacked" autocomplete="off">
-        {% csrf_token %}
+        {% csrf_token %}
         <section id="customer">
             <div class="row">
                 <div class="col-md-12">
@@ -66,7 +65,7 @@
             </div>
             <div class="row">
                 <div class="col-md-4">
-                    {{form.amount|add_class:"form-control"}}
+                    {{form.amount }}
                     {{form.amount.errors}}<br />
                 </div>
             </div>
@@ -74,7 +73,7 @@
         <div class="row">
             <div class="col-md-12">
                 <button type="submit" class="btn btn-lg btn-primary" name="submit_order">Sett inn</button>
-                <a href="{% url 'register' %}" class="btn btn-default">Avbryt</a>
+               <a href="{% url 'register' %}" class="btn btn-default">Avbryt</a>
             </div>
         </div>
     </form>
diff --git a/templates/inventory_add.html b/templates/inventory_add.html
index 92a81d6..8ab9a03 100644
--- a/templates/inventory_add.html
+++ b/templates/inventory_add.html
@@ -1,10 +1,8 @@
 {% extends "base.html" %}
-{% load widget_tweaks %}
-{% load bootstrap %}
 
 {% block title %}Legg til nye varer {% endblock %}
 
-{% block active_inventory_add" %}active{% endblock %}
+{% block active_inventory_add %}active{% endblock %}
 
 {% block content %}
     {% if perms.auth.can_add_inventory_transaction %}
@@ -24,7 +22,7 @@
 
                 <form method="post" role="form">
                     {% csrf_token %}
-                    {{ form|bootstrap }}
+                    {{ form }}
 
                     <input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
                     <a href="{% url 'inventory' %}" class="btn btn-default" />Tilbake</a>
diff --git a/templates/registration/create_user.html b/templates/registration/create_user.html
index 0710129..68c16fd 100644
--- a/templates/registration/create_user.html
+++ b/templates/registration/create_user.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load widget_tweaks %}
 
 {% block title %}Lag ny bruker {% endblock %}
 
@@ -25,11 +24,11 @@
                     {% csrf_token %}
 
                     <div class="form-group">
-                        <label for="id_first_name">{{ form.first_name.label }}</label>{{ form.first_name|add_class:"form-control"}}{{ form.first_name.errors }}
-                        <label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name|add_class:"form-control"}}{{ form.last_name.errors }}
+                        <label for="id_first_name">{{ form.first_name.label }}</label>{{ form.first_name}}{{ form.first_name.errors }}
+                        <label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name}}{{ form.last_name.errors }}
                     </div>
                     <div class="form-group">
-                        <label for="id_email">{{ form.email.label }}</label>{{ form.email|add_class:"form-control"}}{{ form.email.errors }}
+                        <label for="id_email">{{ form.email.label }}</label>{{ form.email}}{{ form.email.errors }}
                     </div>
                     <input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
                     <a href="{% url 'register' %}" class="btn btn-default">Tilbake</a>
diff --git a/templates/registration/login_form.html b/templates/registration/login_form.html
index 68be45a..ae54dd5 100644
--- a/templates/registration/login_form.html
+++ b/templates/registration/login_form.html
@@ -1,4 +1,3 @@
-{% load widget_tweaks %}
 <div class="form-login">
     {% if form.errors %}
     <p class="alert alert-danger">Brukernavn og passord stemmer ikke overens. Prøv igjen.</p>
@@ -7,9 +6,9 @@
     <form method="post" action="{% url 'django.contrib.auth.views.login' %}" class="">
         {% csrf_token %}
         <label for="id_username">Brukernavn:</label>
-        {{ form.username|add_class:"form-control" }}
+        {{ form.username }}
         <label for="id_password">Passord: </label>
-        {{ form.password|add_class:"form-control" }}<br/>
+        {{ form.password }}<br/>
         <input type="submit" value="Logg inn" class="btn btn-primary btn-lg"/>
         <input type="hidden" name="next" value="{{ next }}" />
     </form>
diff --git a/templates/report.html b/templates/report.html
index 2a6cb56..78e4295 100644
--- a/templates/report.html
+++ b/templates/report.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load bootstrap %}
 {% block active_report %}active{% endblock %}
 
 {% block content %}
@@ -7,7 +6,7 @@
     <div class="col-md-7">
         <h2>Varerapport</h2>
         <form class="inventory-report-form">
-            {{ form|bootstrap_horizontal }} ({{ start_time|timesince:end_time}})
+            {{ form }} ({{ start_time|timesince:end_time}})
             <button type="submit" class="btn btn-default">Oppdater</button>
         </form>
         <h2>Beholdning</h2>