🔥 Remove widget_tweaks and bootstrapform use

This commit is contained in:
nikolark committed 2021-10-30 15:50:42 +02:00
1 parent 49870595b0
commit 0e4ef1b75f
6 files changed
+11 -19

No files matched your search

-2
View File
@@ -81,8 +81,6 @@ INSTALLED_APPS = [
"django.contrib.messages", "django.contrib.messages",
"django.contrib.staticfiles", "django.contrib.staticfiles",
"django.contrib.admin", "django.contrib.admin",
"widget_tweaks",
"bootstrapform",
"django_extensions", "django_extensions",
"rest_framework", "rest_framework",
"easy_thumbnails", "easy_thumbnails",
+3 -4
View File
@@ -1,5 +1,4 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load widget_tweaks %}
{% block active_deposit %}active{% endblock %} {% block active_deposit %}active{% endblock %}
{% block content %} {% block content %}
@@ -28,7 +27,7 @@
{% else %} {% else %}
<form id="order" method="post" class="form-stacked" autocomplete="off"> <form id="order" method="post" class="form-stacked" autocomplete="off">
{% csrf_token %} {% csrf_token %}
<section id="customer"> <section id="customer">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@@ -66,7 +65,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
{{form.amount|add_class:"form-control"}} {{form.amount }}
{{form.amount.errors}}<br /> {{form.amount.errors}}<br />
</div> </div>
</div> </div>
@@ -74,7 +73,7 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button type="submit" class="btn btn-lg btn-primary" name="submit_order">Sett inn</button> <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>
</div> </div>
</form> </form>
+2 -4
View File
@@ -1,10 +1,8 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load widget_tweaks %}
{% load bootstrap %}
{% block title %}Legg til nye varer {% endblock %} {% block title %}Legg til nye varer {% endblock %}
{% block active_inventory_add" %}active{% endblock %} {% block active_inventory_add %}active{% endblock %}
{% block content %} {% block content %}
{% if perms.auth.can_add_inventory_transaction %} {% if perms.auth.can_add_inventory_transaction %}
@@ -24,7 +22,7 @@
<form method="post" role="form"> <form method="post" role="form">
{% csrf_token %} {% csrf_token %}
{{ form|bootstrap }} {{ form }}
<input type="submit" value="Legg til" class="btn btn-primary btn-lg" /> <input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
<a href="{% url 'inventory' %}" class="btn btn-default" />Tilbake</a> <a href="{% url 'inventory' %}" class="btn btn-default" />Tilbake</a>
+3 -4
View File
@@ -1,5 +1,4 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load widget_tweaks %}
{% block title %}Lag ny bruker {% endblock %} {% block title %}Lag ny bruker {% endblock %}
@@ -25,11 +24,11 @@
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <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_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|add_class:"form-control"}}{{ form.last_name.errors }} <label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name}}{{ form.last_name.errors }}
</div> </div>
<div class="form-group"> <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> </div>
<input type="submit" value="Legg til" class="btn btn-primary btn-lg" /> <input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
<a href="{% url 'register' %}" class="btn btn-default">Tilbake</a> <a href="{% url 'register' %}" class="btn btn-default">Tilbake</a>
+2 -3
View File
@@ -1,4 +1,3 @@
{% load widget_tweaks %}
<div class="form-login"> <div class="form-login">
{% if form.errors %} {% if form.errors %}
<p class="alert alert-danger">Brukernavn og passord stemmer ikke overens. Prøv igjen.</p> <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=""> <form method="post" action="{% url 'django.contrib.auth.views.login' %}" class="">
{% csrf_token %} {% csrf_token %}
<label for="id_username">Brukernavn:</label> <label for="id_username">Brukernavn:</label>
{{ form.username|add_class:"form-control" }} {{ form.username }}
<label for="id_password">Passord: </label> <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="submit" value="Logg inn" class="btn btn-primary btn-lg"/>
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
</form> </form>
+1 -2
View File
@@ -1,5 +1,4 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load bootstrap %}
{% block active_report %}active{% endblock %} {% block active_report %}active{% endblock %}
{% block content %} {% block content %}
@@ -7,7 +6,7 @@
<div class="col-md-7"> <div class="col-md-7">
<h2>Varerapport</h2> <h2>Varerapport</h2>
<form class="inventory-report-form"> <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> <button type="submit" class="btn btn-default">Oppdater</button>
</form> </form>
<h2>Beholdning</h2> <h2>Beholdning</h2>