Adds create user view, minor fixes
This commit is contained in:
nikolark committed
1 parent
7f84c936ab
commit
b7b0238871
13 files changed
+2354
-2251
No files matched your search
+52
-31
@@ -1,4 +1,5 @@
|
||||
{% extends "base.html" %}
|
||||
{% load widget_tweaks %}
|
||||
{% block header %}
|
||||
{% include "nav.html" with active="deposit" %}
|
||||
{% endblock %}
|
||||
@@ -16,37 +17,57 @@
|
||||
{% endif %}
|
||||
<form id="order" method="post" class="form-stacked" autocomplete="off">
|
||||
{% csrf_token %}
|
||||
<fieldset>
|
||||
<section id="customer" class="row">
|
||||
<h2>Hvem skal sette inn penger?</h2>
|
||||
<!-- Typeahead customer field -->
|
||||
<input name="customer_name" id="id_customer_typeahead" type="text" value="" data-provide="typeahead" data-source="{{users_js}}" />
|
||||
<!-- Actual customer select field (hidden) -->
|
||||
<div style="display:none;">{{form.user }}</div>
|
||||
<ul class="well">
|
||||
{% for user in users %}
|
||||
<li class="customer">
|
||||
{% if user.get_profile.image %}
|
||||
<img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture"/><br />
|
||||
{% else %}
|
||||
<img class="profile" src="{{ STATIC_URL }}img/unknown_person.png" alt="Profile picture" /><br />
|
||||
{% endif %}
|
||||
<span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
|
||||
<span class="balance">{{ user.get_profile.balance }}</span>
|
||||
<span class="id" style="display:none;">{{ user.id }}</span>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</section>
|
||||
<section id="amount">
|
||||
<h2>Hvor mye?</h2>
|
||||
{{form.amount}}
|
||||
{{form.amount.errors}}
|
||||
</section>
|
||||
</fieldset>
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-lg btn-primary" name="submit_order">Sett inn</button>
|
||||
<a href="{% url register %}" class="btn">Avbryt</a>
|
||||
<section id="customer">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h2>Hvem skal sette inn penger?</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<!-- Typeahead customer field -->
|
||||
<div class="col-md-3">
|
||||
<input name="customer_name" id="id_customer_typeahead" type="text" value="" data-provide="typeahead" data-source="{{users_js}}" class="form-control" /><br />
|
||||
<!-- Actual customer select field (hidden) -->
|
||||
<div style="display:none;">{{form.user }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<ul class="well">
|
||||
{% for user in users %}
|
||||
<li class="customer">
|
||||
{% if user.get_profile.image %}
|
||||
<img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture"/><br />
|
||||
{% else %}
|
||||
<img class="profile" src="{{ STATIC_URL }}img/unknown_person.png" alt="Profile picture" /><br />
|
||||
{% endif %}
|
||||
<span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
|
||||
<span class="balance">{{ user.get_profile.balance }}</span>
|
||||
<span class="id" style="display:none;">{{ user.id }}</span>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="amount">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h2>Hvor mye?</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
{{form.amount|add_class:"form-control"}}
|
||||
{{form.amount.errors}}<br />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
<li class="{% if active = "log" %}active{% endif %}"><a href="/log"> Vis logg</a></li>
|
||||
<li class="{% if active = "stats" %}active{% endif %}"><a href="/stats"> Vis statistikk</a></li>
|
||||
{% if request.user.is_superuser %}
|
||||
<li class="{% if active = "create_user" %}active{% endif %}"><a href="{% url create-user %}">Ny bruker</a></li>
|
||||
<li><a href="/admin">Administrasjon</a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
<section id="customer">
|
||||
{% if users %}
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="col-md-12">
|
||||
<h2 title="Sortert etter hvem som kjøpte noe sist.">Hvem kjøper?</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-3">
|
||||
<div class="col-md-3">
|
||||
<!-- Typeahead customer field -->
|
||||
<input name="customer_name" type="text" id="id_customer_typeahead" value="" data-provide="typeahead" data-source="{{users_js}}" class="form-control" />
|
||||
<!-- Actual customer select field (hidden) -->
|
||||
@@ -39,7 +39,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="col-md-12">
|
||||
<ul class="well">
|
||||
{% for user in users %}<li class="customer{% if user.get_profile.last_purchase_date < half_a_year_ago %} infrequent hidden{% endif %}">
|
||||
{% if user.get_profile.image %}
|
||||
@@ -59,7 +59,7 @@
|
||||
</div>
|
||||
{%else%}
|
||||
<div class="row">
|
||||
<div class="col-xs-3">
|
||||
<div class="col-md-3">
|
||||
<h2>Hvem kjøper?</h2>
|
||||
<div class="alert alert-error">Ingen har positiv saldo i BBS.</div><a href="{% url deposit %}" class="btn">Sett inn penger</a>
|
||||
</div>
|
||||
@@ -68,7 +68,7 @@
|
||||
</section>
|
||||
|
||||
<section id="products" class="row">
|
||||
<div class="col-xs-12">
|
||||
<div class="col-md-12">
|
||||
<h2>Kjøper hva?</h2>
|
||||
<ul class="well">
|
||||
{% for product in products %}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{% extends "base.html" %}
|
||||
{% load widget_tweaks %}
|
||||
|
||||
{% block title %}Lag ny bruker {% endblock %}
|
||||
|
||||
{% block header %}
|
||||
{% include "nav.html" with active="create_user" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="row">
|
||||
<div class="col-md-4">
|
||||
{% for message in messages %}
|
||||
<div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</section>
|
||||
<section class="row">
|
||||
<div class="col-md-5">
|
||||
<h1>Legg til ny bruker</h1>
|
||||
{% if form.errors %}
|
||||
<p>{{ form.errors }}.</p>
|
||||
{% endif %}
|
||||
|
||||
<form method="post" role="form">
|
||||
{% csrf_token %}
|
||||
|
||||
<div class="form-group">
|
||||
<label for="id_first_name">{{ form.first_name.label }}</label>{{ form.first_name|add_class:"form-control"}}
|
||||
<label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name|add_class:"form-control"}}
|
||||
<label for="id_email">{{ form.email.label }}</label>{{ form.email|add_class:"form-control"}}
|
||||
<label for="id_facebook_username">{{ form.facebook_username.label }}</label>{{ form.facebook_username|add_class:"form-control"|attr:"placeholder: F.eks simbras"}}
|
||||
|
||||
</div>
|
||||
<input type="submit" value="Legg til" class="btn btn-primary btn-lg" />
|
||||
<a href="{% url register %}" class="btn btn-default" />Tilbake</a>
|
||||
</form>
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
Reference in new issue
Block a user