From 4260b923f0b4669a4490fbb93a218d0461ff3d78 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Mon, 31 Dec 2012 12:58:30 +0100
Subject: [PATCH] =?UTF-8?q?Fix=201050=20Push=20ou=20Validation=20>>>=20Abs?=
 =?UTF-8?q?ence=20de=20bouton=20de=20t=C3=A9l=C3=A9chargement=20dans=20l'i?=
 =?UTF-8?q?nterface=20sous=20IE=207=20/=208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/web/lightbox/sc_options_box.twig | 32 +++++++--------
 www/skins/lightbox/jquery.lightbox.js      | 48 +++-------------------
 2 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/templates/web/lightbox/sc_options_box.twig b/templates/web/lightbox/sc_options_box.twig
index b5a31dbe45..632d22860f 100644
--- a/templates/web/lightbox/sc_options_box.twig
+++ b/templates/web/lightbox/sc_options_box.twig
@@ -1,33 +1,33 @@
 <span style="padding:10px 4px 7px;">
     {% if basket_element %}
-        <button class="previous_button play" title="{% trans 'boutton::precedent' %}">
-            <img src="/skins/lightbox/prev.png" />
+        <button class="previous_button play btn btn-mini" title="{% trans 'boutton::precedent' %}">
+            <i class="icon-chevron-left"></i>
         </button>
-        <button class="previous_button pause" title="{% trans 'boutton::precedent' %}">
-            <img src="/skins/lightbox/prev_pause.png" />
+        <button class="previous_button pause btn btn-mini btn-inverse" title="{% trans 'boutton::precedent' %}">
+            <i class="icon-chevron-left icon-white"></i>
         </button>
-        <button class="play_button" title="{% trans 'boutton::demarrer' %}">
-            <img src="/skins/lightbox/play.png" />
+        <button class="play_button btn btn-mini" title="{% trans 'boutton::demarrer' %}">
+            <i class="icon-play"></i>
         </button>
-        <button class="pause_button" title="{% trans 'boutton::pause' %}">
-            <img src="/skins/lightbox/pause.png" />
+        <button class="pause_button btn btn-mini" title="{% trans 'boutton::pause' %}">
+            <i class="icon-pause"></i>
         </button>
-        <button class="next_button play" title="{% trans 'boutton::suivant' %}">
-            <img src="/skins/lightbox/next.png" />
+        <button class="next_button play btn btn-mini" title="{% trans 'boutton::suivant' %}">
+            <i class="icon-chevron-right"></i>
         </button>
-        <button class="next_button pause" title="{% trans 'boutton::suivant' %}">
-            <img src="/skins/lightbox/next_pause.png" />
+        <button class="next_button pause btn btn-mini btn-inverse" title="{% trans 'boutton::suivant' %}">
+            <i class="icon-chevron-right icon-white"></i>
         </button>
-        <button class="download_button" title="{% trans 'boutton::telecharger' %}">
-            <img src="/skins/lightbox/save.png"/>
+        <button class="download_button btn btn-mini btn-inverse" title="{% trans 'boutton::telecharger' %}">
+            <i class="icon-download icon-white"></i>
         </button>
         <form name="download_form" style="display:none;">
             <input type="hidden" name="basrec" value="{{basket_element.getRecord().get_serialize_key()}}"/>
         </form>
          |
         {% if basket_element.getBasket().getValidation() %}
-            <button class="comment_button">
-                <img src="/skins/lightbox/note.png"/>
+            <button class="comment_button btn btn-mini btn-inverse">
+                <i class="icon-edit icon-white"></i>
                 {% set n = 0 %}
                 {% for validationData in basket_element.getValidationDatas() %}
                   {% if validationData.getNote() %}
diff --git a/www/skins/lightbox/jquery.lightbox.js b/www/skins/lightbox/jquery.lightbox.js
index f12d8dbedf..f751bc4831 100644
--- a/www/skins/lightbox/jquery.lightbox.js
+++ b/www/skins/lightbox/jquery.lightbox.js
@@ -414,24 +414,12 @@ function display_basket_element(compare, sselcont_id)
 
   var options_container = $('.options',container);
 
-  $('.download_button', options_container).button({
-    text	: false
-  //				,
-  //				icons	: {
-  //					primary: 'ui-icon-disk'
-  //				}
-  }).bind('click',function(){
+  $('.download_button', options_container).bind('click',function(){
     //		$(this).blur();
     download($(this).next('form[name=download_form]').find('input').val());
   });
 
-  $('.comment_button', options_container).button({
-    text	: true
-  //		,
-  //		icons	: {
-  //			primary: 'ui-icon-comment'
-  //		}
-  }).bind('click',function()
+  $('.comment_button', options_container).bind('click',function()
   {
     //				$(this).blur();
     if($('.container', container).hasClass('note_editing'))
@@ -447,35 +435,17 @@ function display_basket_element(compare, sselcont_id)
 
   activate_notes(container);
 
-  $('.previous_button', options_container).button({
-    text	: false
-  //		,
-  //		icons	: {
-  //			primary: 'ui-icon-seek-prev'
-  //		}
-  }).bind('click',function(){
+  $('.previous_button', options_container).bind('click',function(){
     //		$(this).blur();
     get_prev();
   });
 
-  $('.play_button', options_container).button({
-    text	: false
-  //		,
-  //		icons	: {
-  //			primary: 'ui-icon-play'
-  //		}
-  }).bind('click',function(){
+  $('.play_button', options_container).bind('click',function(){
     //		$(this).blur();
     slideshow(true);
   });
 
-  $('.pause_button', options_container).button({
-    text	: false
-  //		,
-  //		icons	: {
-  //			primary: 'ui-icon-pause'
-  //		}
-  }).bind('click',function(){
+  $('.pause_button', options_container).bind('click',function(){
     //		$(this).blur();
     slideshow(false);
   });
@@ -489,13 +459,7 @@ function display_basket_element(compare, sselcont_id)
     $('.pause_button, .next_button.pause, .previous_button.pause', options_container).hide();
   }
 
-  $('.next_button', options_container).button({
-    text	: false
-  //		,
-  //		icons	: {
-  //			primary: 'ui-icon-seek-next'
-  //		}
-  }).bind('click',function(){
+  $('.next_button', options_container).bind('click',function(){
     //		$(this).blur();
     slideshow(false);
     get_next();