JS Cleanups and misc

templates/base.html

@@ -37,6 +37,8 @@
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/collapse.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/dropdown.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/tooltip.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}js/highcharts.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}js/underscore-min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}js/app.js"></script>
     {%block tailinc %}
     {%endblock%}

templates/deposit.html

@@ -35,7 +35,7 @@
                 <div class="col-md-12">
                     <ul class="well">
                         {% for user in users %}
-                        <li class="customer">
+                        <li class="customer">{% spaceless %}
                         {% if user.get_profile.image %}
                             <img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture"/><br />
                         {% else %}
@@ -44,7 +44,7 @@
                         <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>
+                        {% endspaceless %}</li>
                         {% endfor %}
                     </ul>
                 </div>
@@ -72,8 +72,3 @@
     </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

@@ -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 %}">
+                            {% for user in users %}<li class="customer{% if user.get_profile.last_purchase_date < half_a_year_ago %} infrequent hidden{% endif %}">{% spaceless %}
                                 {% if user.get_profile.image %}
                                     <img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture" /><br />
                                 {% else %}
@@ -50,7 +50,7 @@
                                 <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 %}
+                                {% endspaceless %}</li>{% endfor %}
                         </ul>
                         <div class="users-description pull-right">
                             <small>Viser: De med minst <strong>{{ cheapest_product_price }}</strong> i saldo<span class="infrequent-users"> og mer enn ett kjøp siden <strong>{{ half_a_year_ago }}</strong></span>. <a href="#" class="toggle-infrequent-users">Vis alle</a></small>
@@ -98,8 +98,3 @@
     </form>
 </section>
 {% endblock %}
-{% block tailinc %}
-    <!--<script src="{{ STATIC_URL }}js/bootstrap-typeahead.js"></script>-->
-    <script src="{{ STATIC_URL }}js/bootstrap/tooltip.js"></script>
-    <script src="{{ STATIC_URL }}js/register.js"></script>
-{% endblock %}

templates/stats.html

@@ -40,10 +40,4 @@
 
 </section>
 {% endblock %}
-{% block tailinc %}
-    <script src="{{ STATIC_URL }}js/bootstrap/tooltip.js"></script>
-    <script src="{{ STATIC_URL }}js/highcharts.js"></script>
-    <script src="{{ STATIC_URL }}js/underscore-min.js"></script>
-    <script src="{{ STATIC_URL }}js/stats.js"></script>
-{% endblock %}