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 %}
- {% csrf_token %} + {% csrf_token %}
@@ -66,7 +65,7 @@
- {{form.amount|add_class:"form-control"}} + {{form.amount }} {{form.amount.errors}}
@@ -74,7 +73,7 @@
-   Avbryt + Avbryt
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 @@
{% csrf_token %} - {{ form|bootstrap }} + {{ form }} Tilbake 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 %}
- {{ form.first_name|add_class:"form-control"}}{{ form.first_name.errors }} - {{ form.last_name|add_class:"form-control"}}{{ form.last_name.errors }} + {{ form.first_name}}{{ form.first_name.errors }} + {{ form.last_name}}{{ form.last_name.errors }}
- {{ form.email|add_class:"form-control"}}{{ form.email.errors }} + {{ form.email}}{{ form.email.errors }}
Tilbake 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 %}