Fixed: Download buttons on movement detail.

Button is no longer erased by cart-button script. Movements that are locked in the cart now have a redish background, rather than a light blue.

Fixes #212

Author: agpar

elvis/static/js/elvis-scripts/cartButtonScript.js

@@ -135,13 +135,14 @@ function build_item_dict($forms)
 
 function str_to_bool(str)
 {
-    if (str.toLowerCase() === "true")
+    if (str === "true")
     {
         return true
     }
-    else if (str.toLowerCase() === "init")
+
+    else if (str === "piece")
     {
-        return "init"
+        return "piece"
     }
     return false
 }
@@ -168,9 +169,9 @@ function draw_badge(data, element)
     $elem.children(":button").remove();
     var new_button = "", new_action = "";
 
-    if (data['in_cart'] === "Piece")
+    if (data['in_cart'] === "piece")
     {
-        new_button = '<button type="button" class="btn btn-mini btn-info disabled cart-badge" data-container="body" data-toggle="tooltip" data-placement="top" title="In cart under piece."><span class="glyphicon glyphicon-lock"> </span> </button>'
+        new_button = '<button type="button" class="btn btn-mini btn-danger disabled cart-badge" data-container="body" data-toggle="tooltip" data-placement="top" title="In cart under piece."><span class="glyphicon glyphicon-lock"> </span> </button>'
         new_action = "add"
     }
     else if (data['in_cart'] === true)

elvis/templates/base/download-badge.html

@@ -13,12 +13,12 @@
         {% endif %}
 
     {% elif in_cart == "piece" %}
-        <input type="hidden" name="in_cart" value="true" />
+        <input type="hidden" name="in_cart" value="piece" />
         <input type="hidden" name="action" value="remove" />
         {% if button_type|default_if_none:"badge" == "badge" %}
-            <button type="button" class="btn btn-mini btn-info cart-badge disabled" data-container="body" data-toggle="tooltip" data-placement="top" title="" data-original-title="Locked in by Piece."><span class="glyphicon glyphicon-lock"> </span> </button>
+            <button type="button" class="btn btn-mini btn-danger cart-badge disabled" data-container="body" data-toggle="tooltip" data-placement="top" title="" data-original-title="Locked in by Piece."><span class="glyphicon glyphicon-lock"> </span> </button>
         {% else %}
-            <button type="button" class="btn btn-info disabled">Locked in by Piece.</button>
+            <button type="button" class="btn btn-danger disabled cart-button">Locked in by Piece.</button>
         {% endif %}
 
     {% elif not in_cart|default_if_none:True %}

elvis/views/download.py

@@ -90,7 +90,7 @@ def _check_in_cart(self, cart, items):
             if item['item_type'] == "elvis_movement":
                 mov = try_get(item['id'], Movement)
                 if mov.parent_cart_id in cart:
-                    back = "Piece"
+                    back = "piece"
                 else:
                     back = item in cart
             else: