Merge branch 'fix_878' of https://github.com/nlegoff/Phraseanet into nlegoff-fix_878

www/skins/prod/000000/prodcolor.css

@@ -517,7 +517,7 @@ span.ww_winTitle {
 /******* PRESENTATION DE MINIATURES *******************************************/
 
 .captionRolloverTips, .previewTips, .infoTips,
-.baskAdder, .printer, .downloader {
+.baskAdder, .printer, .downloader, .baskDeleter {
     background-image: url('../../icons/zoom.gif');
     background-repeat: no-repeat;
     background-position: center center;
@@ -539,6 +539,10 @@ span.ww_winTitle {
     background-image: url('../../icons/basket.gif');
 }
 
+.baskDeleter {
+    background-image: url('../../icons/delete.gif');
+}
+
 .printer {
     background-image: url('../../icons/print.gif');
 }
@@ -731,8 +735,9 @@ div.diapo {
     background-color:  transparent;
     border: none;
     width: 16px;
-    height: 16px;
+    height: 22px;
     cursor: pointer;
+    padding: 0px;
 }
 
 #idFrameC #baskets .alert_datas_changed {

www/skins/prod/959595/prodcolor.css

@@ -565,6 +565,10 @@ span.ww_winTitle {
     background-image: url('../../icons/basket.gif');
 }
 
+.baskDeleter {
+    background-image: url('../../icons/delete.gif');
+}
+
 .printer {
     background-image: url('../../icons/print.gif');
 }
@@ -761,8 +765,9 @@ div.diapo {
     background-color: transparent;
     border: none;
     width: 16px;
-    height: 16px;
+    height: 22px;
     cursor: pointer;
+    padding: 0px;
 }
 
 #idFrameC #baskets .alert_datas_changed {

www/skins/prod/jquery.Prod.js

@@ -1,45 +1,37 @@
-(function(){
-  
-  $(document).ready(function(){
-    
-    $('a.dialog').live('click', function(event){
+(function() {
+    $(document).ready(function() {
+        humane.info = humane.spawn({addnCls: 'humane-libnotify-info', timeout: 1000});
+        humane.error = humane.spawn({addnCls: 'humane-libnotify-error', timeout: 1000});
 
-      var $this = $(this), size = 'Medium';
-      
-      if($this.hasClass('small-dialog'))
-      {
-        size = 'Small';
-      }
-      else if($this.hasClass('full-dialog'))
-      {
-        size = 'Full';
-      }
-      
-      var options = {
-        size : size,
-        loading : true,
-        title : $this.attr('title'),
-        closeOnEscape : true
-      };
+        $('a.dialog').live('click', function(event) {
+            var $this = $(this), size = 'Medium';
 
-      $dialog = p4.Dialog.Create(options);
-      
-      $.ajax({
-        type: "GET",
-        url: $this.attr('href'),
-        dataType: 'html',
-        beforeSend:function(){
+            if ($this.hasClass('small-dialog')) {
+                size = 'Small';
+            } else if ($this.hasClass('full-dialog')) {
+                size = 'Full';
+            }
 
-        },
-        success: function(data){
-          $dialog.setContent(data);
-          return;
-        }
-      });
+            var options = {
+                size: size,
+                loading: true,
+                title: $this.attr('title'),
+                closeOnEscape: true
+            };
 
-      return false;
+            $dialog = p4.Dialog.Create(options);
+
+            $.ajax({
+                type: "GET",
+                url: $this.attr('href'),
+                dataType: 'html',
+                success: function(data) {
+                    $dialog.setContent(data);
+                    return;
+                }
+            });
+
+            return false;
+        });
     });
-    
-  });
-
-}())
+}());

www/skins/prod/jquery.main-prod.js

@@ -2502,6 +2502,12 @@ function evt_add_in_chutier(sbas_id, record_id,event, singleSelection)
     p4.WorkZone.addElementToBasket(sbas_id, record_id, event, singleSelection);
 }
 
+function remove_from_basket(el, confirm)
+{
+    var confirm = confirm || false;
+    p4.WorkZone.removeElementFromBasket(el, confirm);
+}
+
 
 function doSpecialSearch(qry, allbase){
     if (allbase) {