From 52a8d9672cdcbe244e1fd6890947999e0ad33158 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Mon, 25 Nov 2013 15:04:22 +0100
Subject: [PATCH] Fix #1584 Unable to order medias

Conflicts:
	templates/web/prod/Baskets/Reorder.html.twig
---
 templates/web/prod/Baskets/Reorder.html.twig | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/web/prod/Baskets/Reorder.html.twig b/templates/web/prod/Baskets/Reorder.html.twig
index 38755b3287..99c74b26fd 100644
--- a/templates/web/prod/Baskets/Reorder.html.twig
+++ b/templates/web/prod/Baskets/Reorder.html.twig
@@ -1,7 +1,8 @@
 {% import 'common/thumbnail.html.twig' as thumbnail %}
-<div id="reorder_box" class="PNB" style="top:10px; overflow:auto; padding:10px;">
-    <div id="reorder_options" style="height:32px; margin-bottom:10px;">
-        <span>{% trans 'Reordonner automatiquement' %}</span>
+<div id="reorder_box">
+    <div id="reorder_options" class="row-fluid">
+        <form class="form-inline span10">
+        <label for="auto_order">{% trans 'Reordonner automatiquement' %}</label>
         <select id="auto_order">
             <option value="">{% trans 'Choisir' %}</option>
             <option value="default">{% trans 'Re-initialiser' %}</option>
@@ -9,14 +10,15 @@
         </select>
         <button type="button" class="autoorder btn btn-inverse">{% trans 'Re-ordonner' %}</button>
         <button type="button" class="reverseorder btn btn-inverse">{% trans 'Inverser' %}</button>
-        <form name="reorder" method="POST" action="{{ path('prod_baskets_basket_reorder', { 'basket_id' : basket.getId() }) }}" style="display:inline;">
+        </form>
+        <form class="form-inline span2" name="reorder" method="POST" action="{{ path('prod_baskets_basket_reorder', { 'basket_id' : basket.getId() }) }}">
         {% for element in basket.getElements() %}
                 <input type="hidden" name="element[{{ element.getId() }}]" value="{{ element.getOrd() }}"/>
         {% endfor %}
-        <button class="btn btn-inverse">{% trans 'boutton::valider' %}</button>
+        <input type="submit" class="btn btn-inverse" value="{% trans 'boutton::valider' %}" />
         </form>
     </div>
-    <div class="elements">
+    <div class="elements row-fluid">
     {% for element in basket.getElements() %}
         <div id="ORDER_{{ element.getId() }}" class="CHIM diapo" style="height:130px;overflow:hidden;">
             <div class="title" title="{{ element.getRecord(app).get_title() }}" style="position:relative;z-index:1200;height:30px;overflow:visible;text-align:center;">