Upgrade to django 1.8, ++
This commit is contained in:
nikolark committed
1 parent
8c004276a7
commit
b47ee8f832
22 files changed
+767
-1051
No files matched your search
+14
-14
@@ -1,13 +1,13 @@
|
||||
<!doctype html>
|
||||
{% load compress %}
|
||||
{% load compress staticfiles %}
|
||||
<html>
|
||||
<head>
|
||||
<title>{%block title%}BBS{%endblock%}</title>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="x-django-static-url" content="{{ STATIC_URL }}">
|
||||
<meta name="x-django-static-url" content="{% static "" %}">
|
||||
{% compress css %}
|
||||
<link rel="stylesheet" href="{{ STATIC_URL }}dist/styles/screen.css" type="text/css" media="screen, projection">
|
||||
<link rel="stylesheet" href="{% static "dist/styles/screen.css" %}" type="text/css" media="screen, projection">
|
||||
{% endcompress %}
|
||||
{%block headinc %}{%endblock%}
|
||||
</head>
|
||||
@@ -38,7 +38,7 @@
|
||||
<li><a href="{% url 'login' %}">Logg inn</a></li>
|
||||
{% else %}
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.get_profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
|
||||
<ul class="dropdown-menu">
|
||||
{% if request.user.is_authenticated %}<li class="{% block active_profile %}{% endblock %}"><a href="{% url 'profile' %}"><i class="glyphicon glyphicon-user"></i> Profil</a></li>{% endif %}
|
||||
<li class="{% block active_create_user %}{% endblock %}"><a href="{% url 'create-user' %}"><i class="glyphicon glyphicon-plus"></i> Ny bruker</a></li>
|
||||
@@ -63,7 +63,7 @@
|
||||
{%block footer %}
|
||||
<div class="credits">
|
||||
Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://edb.neuf.no/">EDB-gjengen i KAK</a><br/>
|
||||
<a href="http://edb.neuf.no/"><img src="{{ STATIC_URL }}dist/images/edb_brick.png" alt="EDB" /></a>
|
||||
<a href="http://edb.neuf.no/"><img src="{% static "dist/images/edb_brick.png" %}" alt="EDB" /></a>
|
||||
</div>
|
||||
{%endblock%}
|
||||
</div>
|
||||
@@ -72,15 +72,15 @@
|
||||
|
||||
|
||||
{% compress js %}
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/collapse.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tooltip.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.nb.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/highcharts/highcharts.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/underscore/underscore-min.js"></script>
|
||||
<script type="text/javascript" src="{{ STATIC_URL }}dist/js/app.js"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/jquery/dist/jquery.min.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/collapse.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tooltip.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.nb.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/highcharts/highcharts.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "app/bower_components/underscore/underscore-min.js" %}"></script>
|
||||
<script type="text/javascript" src="{% static "dist/js/app.js" %}"></script>
|
||||
{% endcompress %}
|
||||
{%block tailinc %}{%endblock%}
|
||||
</body>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<p>Spør en av disse om de kan hjelpe deg:</p>
|
||||
<ul>
|
||||
{% for u in allowed_users %}
|
||||
<li style="padding-bottom: 8px;"><img src="{{u.get_profile.image }}" />{{u.first_name }} {{u.last_name }}</li>
|
||||
<li style="padding-bottom: 8px;"><img src="{{u.profile.image }}" />{{u.first_name }} {{u.last_name }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
@@ -48,9 +48,9 @@
|
||||
<ul class="well">
|
||||
{% for user in users %}
|
||||
<li class="customer">{% spaceless %}
|
||||
<img class="profile" src="{{ user.get_profile.profile_image_url }}" alt="Profile picture"/><br />
|
||||
<img class="profile" src="{{ user.profile.profile_image_url }}" alt="Profile picture"/><br />
|
||||
<span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
|
||||
<span class="balance">{{ user.get_profile.balance }}</span>
|
||||
<span class="balance">{{ user.profile.balance }}</span>
|
||||
<span class="id" style="display:none;">{{ user.id }}</span>
|
||||
{% endspaceless %}</li>
|
||||
{% endfor %}
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
<td>{{ t.created }}</td>
|
||||
<td>{{ t.product }}</td>
|
||||
<td>{{ t.amount }}</td>
|
||||
<td>{% if t.user.get_profile.image %}<img src="{{ t.user.get_profile.image }}" class="customer" title="{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}" />{% else %}{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}{% endif %}</td>
|
||||
<td>{% if t.user.profile.image %}<img src="{{ t.user.profile.image }}" class="customer" title="{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}" />{% else %}{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}{% endif %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
|
||||
+2
-2
@@ -36,7 +36,7 @@
|
||||
{% for order in orders %}
|
||||
<tr>
|
||||
<td>{{ order.created }}</td>
|
||||
<td>{% if order.customer %}{% if order.customer.get_profile.image %}<img src="{{ order.customer.get_profile.image }}" class="customer" title="{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}" />{% else %}{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}{% endif %}{% else %}Ekstern{% endif %}</td>
|
||||
<td>{% if order.customer %}{% if order.customer.profile.image %}<img src="{{ order.customer.profile.image }}" class="customer" title="{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}" />{% else %}{{ order.customer.first_name }} {{ order.customer.last_name|slice:":1"}}{% endif %}{% else %}Ekstern{% endif %}</td>
|
||||
<td>{% for line in order.orderlines.all %}
|
||||
<span class="amount">{{ line.amount}}</span> <a href="#" class="product" title="{{ line.unit_price}} per">{{ line.product }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
|
||||
<td>{{ order.order_sum }}</td>
|
||||
@@ -69,7 +69,7 @@
|
||||
{% for t in transactions %}
|
||||
<tr>
|
||||
<td>{{ t.created }}</td>
|
||||
<td>{% if t.user.get_profile.image %}<img src="{{ t.user.get_profile.image }}" class="customer" title="{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}" />{% else %}{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}{% endif %}</td>
|
||||
<td>{% if t.user.profile.image %}<img src="{{ t.user.profile.image }}" class="customer" title="{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}" />{% else %}{{ t.user.first_name }} {{ t.user.last_name|slice:":1"}}{% endif %}</td>
|
||||
<td>{{ t.amount }}</td>
|
||||
<!--<td>{% include "modal-delete-transaction.html" with t=t %}<a class="btn btn-danger" data-toggle="modal" href="#modal-trans-{{t.id}}"><i class="icon-trash icon-white"></i> Slett</a></td>-->
|
||||
</tr>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<section id="user-profile" data-user-id="{{request.user.pk}}">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h1 class="profile-name"><img src="{{ request.user.get_profile.profile_image_url }}" class="profile-image" /> {{user.first_name}}</h1>
|
||||
<h1 class="profile-name"><img src="{{ request.user.profile.profile_image_url }}" class="profile-image" /> {{user.first_name}}</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@@ -13,7 +13,7 @@
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Saldo</div>
|
||||
<div class="panel-body">
|
||||
<h2>{{request.user.get_profile.balance }} kr</h2>
|
||||
<h2>{{request.user.profile.balance }} kr</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel panel-default">
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "base.html" %}
|
||||
{% load staticfiles %}
|
||||
{% block active_register %}active{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
@@ -40,14 +41,14 @@
|
||||
<div class="col-md-12">
|
||||
<ul class="well">
|
||||
<li class="customer">{% spaceless %}
|
||||
<img class="profile" src="{{ STATIC_URL }}dist/images/unknown_person.png" alt="Profile picture" /><br />
|
||||
<img class="profile" src="{% static "dist/images/unknown_person.png" %}" alt="Profile picture" /><br />
|
||||
<span class="name">Ekstern</span><br />
|
||||
<span class="balance"> </span>
|
||||
{% endspaceless %}</li>
|
||||
{% for user in users %}<li class="customer{% if user.get_profile.last_purchase_date < half_a_year_ago and not user.get_profile.last_purchase == None %} infrequent hidden{% endif %}">{% spaceless %}
|
||||
<img class="profile" src="{{ user.get_profile.profile_image_url }}" alt="Profile picture" /><br />
|
||||
{% for user in users %}<li class="customer{% if user.profile.last_purchase_date < half_a_year_ago and not user.profile.last_purchase == None %} infrequent hidden{% endif %}">{% spaceless %}
|
||||
<img class="profile" src="{{ user.profile.profile_image_url }}" alt="Profile picture" /><br />
|
||||
<span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
|
||||
<span class="balance">{{ user.get_profile.balance }}</span>
|
||||
<span class="balance">{{ user.profile.balance }}</span>
|
||||
<span class="id" style="display:none;">{{ user.id }}</span>
|
||||
{% endspaceless %}</li>{% endfor %}
|
||||
</ul>
|
||||
@@ -77,9 +78,9 @@
|
||||
<input type="hidden" name="form-{{ forloop.counter0 }}-unit_price_ext" value="{{product.sale_price_ext }}" />
|
||||
<span class="qty">0</span>
|
||||
{% if product.image %}
|
||||
<img class="product" src="{{ product.image.url }}" /><br />
|
||||
<img class="product" src="{{ product.image.url }}" /><br />
|
||||
{% else %}
|
||||
<img class="product" src="{{ STATIC_URL }}dist/images/product.png" /><br />
|
||||
<img class="product" src="{% static "dist/images/product.png" %}" /><br />
|
||||
{% endif %}
|
||||
<span class="name">{{ product.name }}</span> - <span class="sale_price_ext">{{product.sale_price_ext|floatformat:0}}</span>/<span class="sale_price_int">{{product.sale_price_int|floatformat:0}}</span>
|
||||
</li>
|
||||
|
||||
Reference in new issue
Block a user