Adds messages and balance check

templates/base.html

@@ -21,10 +21,12 @@
     <div id="container" class="container-fluid">
         {%block content%}
         {%endblock%}
-        <div id="footer" class="row-fluid span12">
-            {%block footer %}
-                <img src="{{ STATIC_URL }}gaute/img/edb_brick.png" />
-            {%endblock%}
+        <div id="footer" class="row-fluid">
+            <div class="span12">
+                {%block footer %}
+                    <img src="{{ STATIC_URL }}gaute/img/edb_brick.png" />
+                {%endblock%}
+            </div>
         </div>
     </div>
 

templates/deposit.html

@@ -5,17 +5,54 @@
 
 {% block content %}
 <section id="deposit" class="row-fluid">
-    <div class="span12">
-        <form id="order" method="post" class="form-stacked" autocomplete="off">
-            {% csrf_token %}
-            <fieldset>
-            {{form}}
-            </fieldset>
-            <div class="form-actions">
-                    <button type="submit" class="btn btn-large btn-primary" name="submit_order">Sett inn</button>
-                    <a href="{% url register %}" class="btn">Avbryt</a>
-            </div>
-        </form>
-    </div>
+    {% if messages %}
+    <section class="row-fluid">
+        <div class="span4">
+            {% 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>
+    {% endif %}
+    <form id="order" method="post" class="form-stacked" autocomplete="off">
+        {% csrf_token %}
+        <fieldset>
+            <section id="customer" class="row-fluid">
+            <h2>Hvem skal sette inn penger?</h2>
+            <!-- Typeahead customer field -->
+            <input name="customer_name" id="id_customer_typeahead" 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.url }}" /><br />
+                {% else %}
+                    <img class="profile" src="{{ STATIC_URL }}gaute/img/unknown.png" /><br />
+                {% endif %}
+                <span class="name">{{ user }}</span> ({{ user.get_profile.balance }})
+                <span class="id" style="display:none;">{{ user.id }}</span>
+                </li>
+                </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-large btn-primary" name="submit_order">Sett inn</button>
+                <a href="{% url register %}" class="btn">Avbryt</a>
+        </div>
+    </form>
 </section>
 {% endblock %}
+{% block tailinc %}
+    <script src="{{ STATIC_URL }}js/bootstrap-typeahead.js"></script>
+    <script src="{{ STATIC_URL }}js/deposit.js"></script>
+{% endblock %}
+

templates/register.html

@@ -5,6 +5,7 @@
 
 {% block content %}
 <section id="register" class="row-fluid">
+    {% if messages %}
     <section class="row-fluid">
         <div class="span4">
             {% for message in messages %}
@@ -12,6 +13,7 @@
             {% endfor %}
         </div>
     </section>
+    {% endif %}
     <form id="order" method="post" autocomplete="off">
         <fieldset>
             {% csrf_token %}
@@ -21,13 +23,13 @@
             <input type="hidden" name="form-MAX_NUM_FORMS" id="id_form-MAX_NUM_FORMS" />
 
             <section id="customer" class="row-fluid">
+                {% if users %}
                 <div class="span12">
                     <h2>Hvem kjøper?</h2>
                     <!-- Typeahead customer field -->
                     <input name="customer_name" id="id_customer_typeahead" value="" data-provide="typeahead" data-source="{{users_js}}" />
                     <!-- Actual customer select field (hidden) -->
                     <div style="display:none;">{{orderform.customer }}</div>
-                    {% if users %}
                         <ul class="well">
                         {% for user in users %}
                                 <li class="customer">
@@ -42,10 +44,13 @@
                                 </li>
                         {% endfor %}
                         </ul>
-                    {%else%}
-                        <div class="alert alert-error">Ingen har positiv saldo i BBS.</div>
-                    {%endif%}
                 </div>
+                {%else%}
+                    <div class="span3">
+                        <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>
+                {%endif%}
             </section>
 
             <section id="products" class="row-fluid">