From d02d22f52d76fdb6c551b65bfd0688dbd0f0e9a0 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Wed, 5 Feb 2014 19:37:20 +0100
Subject: [PATCH] Small fixes

---
 main/utils.py                           |  2 +-
 templates/register.html                 |  2 +-
 templates/registration/create_user.html | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/utils.py b/main/utils.py
index 82b2291..9735761 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -2,4 +2,4 @@ def format_username(firstname, lastname):
     first = firstname.lower().strip().replace(" ", "")[:6].encode('ascii', 'ignore')
     last = lastname.lower().strip().replace(" ", "")[:6].encode('ascii', 'ignore')
 
-    return "{}{}".format(first, last)
+    return "{0}{0}".format(first, last)
diff --git a/templates/register.html b/templates/register.html
index 9dd62a0..0e1d44c 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -41,7 +41,7 @@
                 <div class="row">
                     <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 %}">{% spaceless %}
+                            {% 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 %}
                                 {% if user.get_profile.image %}
                                     <img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture" /><br />
                                 {% else %}
diff --git a/templates/registration/create_user.html b/templates/registration/create_user.html
index 6843038..9be14a7 100644
--- a/templates/registration/create_user.html
+++ b/templates/registration/create_user.html
@@ -19,19 +19,19 @@
         <section class="row">
             <div class="col-md-5">
                 <h1>Legg til ny bruker</h1>
-                {% if form.errors %}
-                    <p>{{ form.errors }}.</p>
+                {% if form.non_field_errors %}
+                    <p>{{ form.non_field_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"}}{{ form.first_name.error }}
-                        <label for="id_last_name">{{ form.last_name.label }}</label>{{ form.last_name|add_class:"form-control"}}{{ form.last_name.error }}
+                        <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 }}
                     </div>
                     <div class="form-group">
-                        <label for="id_email">{{ form.email.label }}</label>{{ form.email|add_class:"form-control"}}{{ form.email.error }}
+                        <label for="id_email">{{ form.email.label }}</label>{{ form.email|add_class:"form-control"}}{{ form.email.errors }}
                     </div>
                     <div class="form-group">
                         <label for="id_facebook_username">{{ form.facebook_username.label }}</label>