Index: tensions/cl_conflit/js/Affiche_script.js
===================================================================
--- /extensions/cl_conflit/js/Affiche_script.js	(revision 7909)
+++ 	(revision )
@@ -1,1109 +1,0 @@
-
-function Toggle_bp() {
-    cl_visible = !cl_visible;
-    if (cl_visible) src = src1;
-    else src = src2;
-    if (cl_visible) src_info = src3;
-    else src_info = src4;
-
-    jQuery('#bp_cla').attr('alt', src_info);
-    jQuery('#bp_cla').attr('title', src_info);
-
-    jQuery('#bp_img_cla').get(0).src = src;
-    jQuery('#bp_img_cla').attr('alt', src_info);
-    jQuery('#bp_img_cla').attr('title', src_info);
-    jQuery('#bp_cla').attr('Stitle', src_info);
-    jQuery('#bp_cla').attr('Stip', " ");
-    old_w = 0;
-    jQuery(window).resize();
-}
-
-jQuery(document).ready(
-
-      function (jQuery) {
-         
-
-          if (DEBUG == "false") {
-              jQuery("#Debug").hide();
-              jQuery("#Debug1").hide();
-              jQuery("#Debug2").hide();
-          }
-          var img_top = "0";
-
-          var old_h = 0;
-          var rapport = -1;
-          var old_w = 0;
-
-          var llgboframe = jQuery("#gbo div:first");
-          var marges_llgbo = 0;
-          if (llgboframe.length > 0) {
-              ll1 = jQuery(llgboframe).info();
-              ll2 = jQuery("#gbo div:last").info();
-              marges_llgbo = (ll1.width - ll2.width) + ll2.borderwidth.left + ll2.borderwidth.right;
-          }
-
-
-          //=========================================================
-
-          function wait_Timer() {
-              old_w = 0
-              jQuery(window).resize();
-              info_pamoorama_outter = jQuery("#pamoorama_outter").info();
-              if (info_pamoorama_outter.width == 0)
-                  setTimeout("wait_Timer()", 100);
-
-          }
-
-
-          //=============================================================
-          function cl_Timer() {
-              //   if (!jQuery.browser.msie) { jQuery(function () { alert(jQuery.browser.version); }); }
-              if (jQuery.browser.msie && parseInt(jQuery.browser.version) < 8)
-                  alert(jQuery.browser.version);
-              panoramaContainer = jQuery(".panorama-container");
-              n = document.scripts[6]; //12--14affiche_script ;
-              t = n.src;
-
-              currentPosition = 0 - parseInt(jQuery(panoramaContainer).css('margin-left'));
-              if (currentPosition == NaN) return;
-
-
-              if (currentPosition > 1000)
-                  jQuery(panoramaContainer).css('margin-left', "0px")
-              setTimeout("cl_Timer()", 500);
-          }
-          //=============================================================
-          function onPropertyChange(e) {
-              var el = e.srcElement;
-              var new_class = el.className;
-              ID = el.id;
-              Prop = e.propertyName.split(".");
-              Property = Prop[1];
-              if (Property == "display") {
-                  Valeur = parseInt(el.currentStyle[Property]);
-                  if (Valeur == "block") {
-
-
-                  }
-              }
-              return;
-          }
-
-          /* ready
-          *
-          *
-          */
-          //============================================================
-          /*
-          *
-          */
-          function Info_entete(Parent) {
-          
-              var info_imageToolBar = jQuery("#imageToolBar").info();
-              if (info_imageToolBar.position == "absolute") {
-                  jQuery("#imageToolBar").css("position", "relative");
-                  jQuery("#imageToolBar").css("top", 0 + "px");
-              }
-              var info_theImage = jQuery("#theImage").info();
-
-              if (info_theImage.position == "relative") {
-                  //--- passage relative ==> static ===/
-                  jQuery("#theImage").css("position", "static");
-                  info_theImage = jQuery("#theImage").info();
-
-              }
-              if (info_theImage.position == "absolute") {
-                  //--- passage absolute ==> static ===/
-                  jQuery("#theImage").css("position", "static");
-                  info_theImage = jQuery("#theImage").info();
-
-              }
- 
-              marge_top = Info_the_page.top +
-                                     Info_the_page.borderwidth.top +
-                                     info_theImage.borderwidth.top;
-
-              img_top = info_theImage.top + info_theImage.borderwidth.top;
-              return { marge_top: marge_top, img_top: img_top };
-
-          }
-
-          /* Récupère les informations sur la description.
-          *
-          */
-          function Info_description(Parent) {
-
-
-              //  jQuery("#" + Parent + " p:not(:contains(' ')) ").remove();
-
-
-
-              //=============================================================================
-              var info_description = { top: 0, bottom: 0, height: 0 };
-
-              if (theme.match(RegExp("simple", "gi"))) {
-                  jQuery("#" + Parent).css({ padding: "0px",
-                      marginLeft: "0px",
-                      marginRight: "auto",
-                      marginTop: "0px",
-                      marginBottom: "0px", position: "absolute", top: Bandeau + "px"
-                  });
-              } else {
-
-                  /*   jQuery("#" + Parent).css({ padding: "0px",
-                  marginLeft: "auto",
-                  marginRight: "auto",
-                  marginTop: "0px",
-                  marginBottom: "0px"
-                  });
-                  */
-
-              }
-
-
-              //   jQuery("#" + Parent + " p").css({ padding: "0px", margin: "0px "    });
-
-
-              if (theme.match(RegExp("luciano", "g"))) {
-                  info_img = jQuery("#" + Parent + " #theImg img").info();
-
-              } else {
-
-                  info_img = jQuery("#" + Parent + " img").info();
-              }
-
-              info_description.marge = { bottom: info_img.padding.bottom + info_img.margin.bottom + info_img.borderwidth.bottom,
-                  top: info_img.padding.top + info_img.borderwidth.top
-              }
-
-              info_description.top = info_img.bottom + info_img.margin.bottom + info_img.borderwidth.bottom;
-              //=============================================================================
-              info_gbo = jQuery("#gbo").info();
-              if (info_description.top < info_gbo.bottom)
-                  info_description.top = info_gbo.bottom;
-              //=============================================================================
-              info_desc = jQuery("#" + Parent + " p:first").info();
-              if (info_desc.bottom < info_img.bottom)
-                  info_desc.bottom = info_img.bottom;
-
-              //  if (info_desc.top > info_img.bottom)
-              //     info_description.top = info_desc.top;
-
-              if (jQuery("#Panorama").length) {
-                  Type_Img = "panorama";
-                  //  cl_visible = false;
-
-              }
-              info_table = jQuery(".infoTable").info();
-
-              if (info_table.top > info_description.bottom)
-                  info_description.bottom = info_table.top;
-              //===========================================================================
-
-              info_licencetag = jQuery(".licencetag").info();
-
-
-              if (info_licencetag.bottom > 0) {
-                  jQuery(".licencetag").css("border", "solid 5px transparent");
-                  if (info_licencetag.bottom > info_description.bottom) {
-                      info_description.bottom = info_licencetag.bottom;
-                  }
-                  else
-                      info_description.bottom += info_table.margin.top + info_table.padding.top;
-
-              }
-              //=============================================================================
-              if (theme.match(RegExp("gally", "gi"))) {
-                  if (!theme.match(RegExp("lapis", "gi"))) {
-                      info_description.bottom = info_description.bottom
-                  }
-              }
-
-
-
-
-
-              if (info_description.top < 1)
-                  info_description.top = info_description.bottom;
-
-
-              if (info_description.bottom < info_description.top) {
-                  info_description.bottom = info_description.top;
-
-                  info_desc = jQuery("#" + Parent + " p:last").info();
-
-                  if (info_desc.bottom > info_img.bottom)
-                      info_description.bottom = info_desc.bottom;
-              }
-
-
-              if (theme.match(RegExp("gally", "g"))) {
-                  if (!theme.match(RegExp("lapis", "gi"))) {
-                      info_copyright = jQuery("#copyright").info();
-                      info_description.bottom += info_copyright.height;
-                  }
-              }
-
-              if (theme.match(RegExp("luciano", "g"))) { info_description.bottom -= 30 }
-
-              info_description.height = info_description.bottom - info_description.top;
-
-
-              if (DEBUG == "true") {
-
-                  /*  jQuery("#Debug").text(jQuery("#Debug").text() + user_status);    
-        
-
-                  info_description.width = "800";
-                  */
-                  jQuery("#Debug").css('display', 'block');
-                  jQuery("#Debug1").show();
-                  jQuery("#Debug2").show();
-                  Bandeau_bas = info_description;
-
-                  jQuery("#Debug").css({
-                      filter: 'alpha(opacity:50)',
-                      position: "absolute",
-                      width: "800px",
-                      border: "solid 1px green",
-                      top: Bandeau + "px"
-                  });
-                  jQuery("#Debug").text("Debug:Bandeau : " + Bandeau);
-
-                  jQuery("#Debug1").css({
-                      filter: 'alpha(opacity:50)',
-                      position: "absolute",
-                      border: "solid 1px green",
-                      top: Bandeau_bas.top + "px",
-                      width: (200) + "px",
-                      height: Bandeau_bas.height + "px"
-                  });
-                  jQuery("#Debug1").text("Debug1:Bandeau_bas top : " + Bandeau_bas.top + " height:" + Bandeau_bas.height);
-
-                  jQuery("#Debug2").css({
-                      filter: 'alpha(opacity:50)',
-                      position: "absolute",
-                      left: '50px',
-                      width: (300) + "px",
-                      border: "solid 1px green", top: Bandeau_bas.bottom + "px"
-                  });
-                  jQuery("#Debug2").text("Debug2:Bandeau_bas bottom :" + Bandeau_bas.bottom);
-
-              }
-
-              if (check_desc_v != 'checked="checked"') {
-                  info_description.height = 0;
-              }
-
-              return info_description;
-
-          }
-
-          /*
-          *
-          */
-          jQuery("#pamoorama_iner").bind('resize', function () {
-              wait_Timer();
-          })
-          //============================================================//==
-          jQuery("#pamoorama_outter").bind('resize', function () {
-              wait_Timer();
-          })
-
-
-
-          //============================================================
-          jQuery("#iGMapsIcon").bind('resize', function () {
-              jQuery().recentrage_widget();
-          })
-          jQuery("#icon_gmaps").bind('click', function () {
-              jQuery().recentrage_widget();
-          })
-
-
-
-
-
-
-          /* jQuery */
-          var img_init = { height: img_height, width: img_width };  // taille initiale
-          var img_defaut = { height: scaled_height, width: scaled_width };
-          var img_reelle = { height: img_height, width: img_width };
-          var img_finale = { height: 0, width: 0 };
-          var Zone_Affichage = { height: 0, width: 0 };
-
-          //============================================================
-
-          var Info_the_page = jQuery("#the_page").info();
-          var Zone_Affichage = jQuery("#theImage").info();
-
-          var Bandeau = 0;
-          var Bandeau_t = Info_entete("theImage")
-          Bandeau = Bandeau_t.img_top;
-          var Bandeau_bas = 0;
-          Bandeau_bas = Info_description("theImage");
-          //===================================================================	
-          /*
-          * window .resize
-          */
-          jQuery(window).resize(function (event, ui) {
-              if (typeof (event) == 'undefined') return;
-              if (!cl_visible == true) return;
-              if (eval(user_status + "_enabled") == "") return;
-              var chk = eval(user_status + "_enabled");
-
-
-
-              //==========================================================================
-              var winwidth = jQuery(window).width();
-              var winheight = jQuery(window).height();
-              if (old_w == winwidth && old_h == winheight) return;
-
-
-
-              if (old_w != winwidth)
-              { old_w = winwidth; }
-              else
-              { if (old_h != winheight) old_h = winheight; }
-              //===========================================================================
-
-
-              var Type_Img = "";
-              //====== détection du type d'images ======
-              if (jQuery("#charlie").length > 0) {
-                  Type_Img = "charlie";
-              } else if (jQuery("#pamoorama").length) {
-                  Type_Img = "pamoorama";
-              } else if (jQuery("#theImage embed").length > 0) {
-                  Type_Img = "embed";
-              } else if (jQuery("#map").length) {
-                  Type_Img = "map";
-              } else if (jQuery("#Panorama").length) {
-                  Type_Img = "panorama";
-              } else if (jQuery("#theImage").find("img").length > 0) {
-                  Type_Img = "img";
-              } else if (jQuery("img").length > 0) {
-                  Type_Img = "img_autre";
-                  return;
-              } else {
-                  return;
-              }
-
-
-
-              var Cadre = jQuery("#theImage").get(0);
-              var info_Cadre = jQuery(Cadre).info();
-              //===============  Information cadre ======
-              var info_the_page = jQuery("#the_page").info();
-
-              //=============================================================================
-              var info_HeaderBar = jQuery("#imageHeaderBar").info();
-
-              var info_content = jQuery("#content").info();
-
-
-              var info_titrePage = jQuery("#titrePage").info();
-
-
-              var Zone_Affichage = jQuery("#theImage").info();
-
-              var info_ToolBar = jQuery("#imageToolBar").info();
-              var info_imageInfoBar = jQuery("#imageInfoBar").info();
-              var info_theHeader = jQuery("#theHeader").info();
-
-
-              var marge = 0;
-              if (info_ToolBar.width > 0)
-                  marge = (Zone_Affichage.width - info_ToolBar.width) / 2;
-
-              var marge_right = marge;
-              var marge_left = marge;
-
-              if (info_content.width > 100) {
-                  marge_left = 0;
-                  marge_right = info_imageInfoBar.margin.left + info_imageInfoBar.margin.right;
-                  winwidth = info_content.width;
-                  marge_right = info_imageInfoBar.width + marge_right;
-              }
-              else
-                  winwidth = Zone_Affichage.width;
-
-              winwidth -= (marge_right + marge_left);
-
-
-
-
-              if (Type_Img == "pamoorama") {
-                  var info_pamoorama = jQuery("#pamoorama").info();
-                  var info_pamoorama_outter = jQuery("#pamoorama_outter").info();
-                  var info_pamoorama_inner = jQuery("#pamoorama_inner").info();
-                  var info_pamoorama_footer = jQuery("#pamoorama_footer").info();
-                  TheImg = jQuery("#pamoorama");
-
-                  /*
-                  pamoorama_outter
-                  pamoorama_inner
-                  pamoorama_footer
-                  pamoorama_caption
-                  pamoorama_thumb
-                  pamoorama_frame
-                  */
-              } else {
-                  //==== récupère Img la plus grande  =====
-                  if (jQuery("#theImg")) IMG = "#theImg";
-                  else IMG = Cadre;
-
-                  TheImg2 = Get_Img_Maxi(IMG + " img");
-                  //=================================================================
-                  if (TheImg2 == null) {
-                      if (jQuery(Cadre).find("img").length > 0) {
-                          IMG = Cadre;
-                          TheImg = Get_Img_Maxi("#theImage img");
-                      }
-                  } else {
-                      TheImg = TheImg2  //luciano ?
-
-                  }
-              }
-              //=================================================================
-
-
-              switch (Type_Img) {
-                  case "map":
-                      var info_image = jQuery("#map").info();
-
-                      var info_map = jQuery("#mapPicture").info();
-
-                      marge_left = info_map.width;
-                      jQuery("#map").css("left", marge_left);
-
-                      var TheImg = jQuery("#map").get(0);
-                      img_reelle.height = info_image.height;
-                      img_reelle.width = winwidth - marge_right - marge_right;
-                      Bandeau_bas.height = 10;
-                      marge_right = 10;
-
-                      info_the_page = jQuery("#the_page").info();
-                      ;
-
-                      break
-
-
-                  case "panorama":
-                      // return;
-
-
-                      TheImg = Get_Img_Maxi("#Panorama img");
-                      info_theImage = jQuery(TheImg).info();
-                      info_the_page = jQuery("#the_page").info();
-
-                      break
-                  case "img":
-
-                      if (!TheImg) return;
-                      if (theme.match(RegExp("luciano", "g"))) {
-                          TheImg = jQuery("#the_page #theImg");
-                      }
-                      info_theImage = jQuery(TheImg).info();
-                      info_the_page = jQuery("#the_page").info();
-
-
-                      break
-                  case "img_autre":
-                      if (!TheImg) return;
-                      info_theImage = jQuery(TheImg).info();
-                      info_the_page = jQuery("#the_page").info();
-
-
-                      break
-                  case "embed":
-                      //
-
-                      TheImg = jQuery(Cadre).find("embed");
-
-                      info_theImage = jQuery(Cadre).info();
-                      info_the_page = jQuery("#the_page").info();
-                      if (rapport < 0) {
-                          img_height = parseInt(jQuery(TheImg).outerHeight());
-                          img_width = parseInt(jQuery(TheImg).outerWidth());
-
-                          img_reelle.height = img_height;
-                          img_reelle.width = img_width;
-
-                      }
-
-                      break
-                  case "charlie":
-
-                      TheImg = jQuery('#charlie object').get(0);
-                      info_theImage = jQuery(Cadre).info();
-                      info_the_page = jQuery("#the_page").info();
-                      if (rapport < 0) {
-                          img_height = parseInt(TheImg.height);
-                          img_width = parseInt(TheImg.width);
-
-                          img_reelle.height = parseInt(TheImg.height);
-                          img_reelle.width = parseInt(TheImg.width);
-                      }
-
-                      break
-                  case "pamoorama":
-                      //=========================================================
-                      var Images = jQuery("#pamoorama img");
-                      var Image = jQuery("#pamoorama").find("img");
-
-                      info_theImage = jQuery("#pamoorama").info();
-                      info_the_page = jQuery("#the_page").info();
-                      break
-
-
-              }
-
-              //=============== Vérification taille minimale  autorizée ======================
-              var miniWidth = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-width"), mini_width);
-              miniHeight = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-height"), mini_height);
-
-
-              var maxWidth = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("max-width"), winwidth, "0");
-              maxHeight = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("max-height"), winheight, "0");
-
-              mini_width = parseInt(miniWidth);
-              mini_height = parseInt(miniHeight);
-
-              img_reelle.width = parseInt(img_reelle.width);
-
-
-              if (img_reelle.width < mini_width) return;
-
-              img_reelle.height = parseInt(img_reelle.height);
-              if (img_reelle.height < parseInt(mini_height)) return;
-              //==================================================================================   
-              if (rapport < 0) {
-
-                  img_init.height = parseInt(img_height);
-                  img_init.width = parseInt(img_width);
-
-                  rapport = img_width / img_height;
-
-                  if (Type_Img != "map")
-                      rapport = (img_init.width / img_init.height);
-                  else
-                      rapport = 0;
-
-              }
-
-
-              //=============== Zone d'affichage ============================
-
-              borderW = Zone_Affichage.borderwidth.left;
-              borderW += Zone_Affichage.borderwidth.right;
-
-
-              Zone_Affichage.width = winwidth - borderW;
-
-
-
-              var Licence = jQuery(".licencetag");
-              info_Licence = jQuery(".licencetag").info();
-
-              jQuery("#theImage #theImg IMG").css("marginTop", "0px")
-              //========== Correction en fonction du thème =============================
-              var correction = 0;
-              if (theme.match(RegExp("sobre", "g"))) {
-
-                  correction = -info_Licence.padding.top;
-
-              } else if (theme.match(RegExp("Pure", "g"))) {
-                  correction += 0; //??
-              } else if (theme.match(RegExp("luciano", "g"))) {
-                  correction = 0; //??
-
-              } else if (theme.match(RegExp("simple", "g"))) {
-                  correction += 0; //??
-              } else if (theme.match(RegExp("gally", "g"))) {
-                  correction += 0; //??
-
-              }
-              //================ Licence  ========================
-
-              if (Licence.length > 0) {
-                  jQuery(".licencetag").css("padding", "0px");
-
-              }
-              //====================================================
-              info_img = jQuery(TheImg).info();
-
-
-
-              img_top = Bandeau;
-
-              Marge_Basse = parseInt(marge_basse || 0); // hors bandeau
-              //==========================================================================
-              h = 0;
-              Zone_Affichage.height = winheight - Bandeau - Marge_Basse - correction;
-              var Image_height = Zone_Affichage.height - Bandeau_bas.height - Bandeau_bas.marge.top - Bandeau_bas.marge.bottom;
-
-              //=============================================================
-              var height_user = eval(user_status + "_height");
-              var reg1 = new RegExp("%", "g");
-              if (height_user.match(reg1))
-                  Image_height = Image_height * parseInt(height_user) / 100;
-              else
-                  Image_height = parseInt(height_user);
-
-              echelle_max = parseFloat(echelle_max, '3');
-              var echelle = parseFloat(Image_height / img_reelle.height, 3);
-
-              if (echelle > echelle_max) { echelle = echelle_max; }
-              Image_height = parseInt(img_reelle.height * echelle);
-              //============================================================
-
-              var Image_width;
-              if (rapport > 0)
-                  Image_width = parseInt(Image_height * rapport);
-              else if (Type_Img == "map") {
-                  Image_width = Zone_Affichage.width - marge_left - marge_right;
-              } else {
-                  Image_width = Zone_Affichage.width;
-              }
-
-              //===============================================================
-              align_auto = "center";
-              if (jQuery("#theImg").css("textAlign"))
-                  align_auto = jQuery("#theImg").css("textAlign");
-              var widthmin = winwidth;
-
-              if (check_auto_w == 'checked="checked"') {
-                  // if (Type_Img != "pamoorama" && Type_Img != "panorama" ) {
-                  //==== largeur à atteindre ===
-                  var width_user = eval(user_status + "_width");
-                  // Largeur maximale en fonction du statut
-                  if (width_user.match(reg1))
-                  // pourcentage
-                      widthmin = widthmin * parseInt(width_user) / 100;
-                  else
-                      widthmin = parseInt(width_user);
-                  var marges = marges_llgbo;
-                  widthmin -= info_img.borderwidth.left;
-                  widthmin -= info_img.borderwidth.right;
-
-                  widthmin -= marges;
-                  if (Image_width > widthmin) {
-                      //   Image_width largeur à atteindre 
-                      //  Calcul du rapport d'agrandissement 
-                      var echelle_w = parseFloat((widthmin) / img_reelle.width, 3);
-                      if (echelle_w > echelle_max) { echelle_w = echelle_max; }
-                      Image_width = parseInt(img_reelle.width * echelle_w);
-                      if (rapport > 0)
-                          Image_height = parseInt(Image_width / rapport);
-                  }
-
-
-
-              }
-
-
-              // }
-              //===================================================
-
-
-
-              zoom = echelle;
-              //=============LLGBO2 ===========================
-
-
-              if (marges_llgbo > 0) {
-
-                  t1 = jQuery(llgboframe).info();
-                  if (!TheImg.src) {
-                      TheImg = jQuery(TheImg).find("img").get(0)
-                  }
-                  if (TheImg.src) {
-
-                      Image_width -= marges_llgbo; // réduction frame
-                      Image_height -= marges_llgbo; // réduction frame
-                      if (rapport > 1) {
-                          if (Image_width > winwidth) {
-                              jQuery("#gbo").outerWidth(winwidth);
-                              jQuery("#gbo").css("width", winwidth + "px");
-                          }
-                          else {
-                              jQuery("#gbo").outerWidth(Image_width);
-                              jQuery("#gbo").css("width", Image_width + "px");
-                          }
-
-                          t1 = jQuery("#gbo div:last").info();
-
-                          Image_width = t1.width - (t1.borderwidth.left + t1.borderwidth.right);
-                          Image_height = parseInt(Image_width / rapport);
-
-                          jQuery("#gbo").outerHeight(Image_height + marges_llgbo);
-                          jQuery("#gbo").css("height", (Image_height + marges_llgbo) + "px");
-                          if (jQuery.browser.msie) {
-                              jQuery("#gbo").css("paddingBottom", 17 + "px");
-                          }
-
-                      } else {
-                          Image_height -= 4;
-                          Image_width -= 4;
-                          if (Image_width > winwidth) {
-                              jQuery("#gbo").outerWidth(winwidth);
-                              jQuery("#gbo").css("width", winwidth + "px");
-                          }
-                          else {
-                              jQuery("#gbo").outerWidth(Image_width);
-                              jQuery("#gbo").css("width", Image_width + "px");
-                          }
-
-                          jQuery("#gbo").css("height", (Image_height + marges_llgbo) + "px");
-                          jQuery("#gbo").height(Image_height + marges_llgbo);
-
-                          jQuery("#gbo").css("width", Image_width + marges_llgbo + "px");
-                          jQuery("#gbo").width(Image_width + marges_llgbo);
-
-
-
-                          if (jQuery.browser.msie) {
-                              jQuery("#gbo").css("paddingBottom", 17 + "px");
-                          }
-
-                      }
-                      //  jQuery("#" + Parent + " p:not(:contains(' ')) ").remove();
-                      a0 = jQuery("area[rel!=up][rel!=prev][rel!=next]");
-                      a1 = jQuery("area[rel=prev]");
-                      a2 = jQuery("area[rel=next]");
-                      a3 = jQuery("area[rel=up]");
-                      nb_zone = 3;
-                      if (a1.length == 0) {
-                          nb_zone -= 1;
-                      }
-                      if (a2.length == 0) {
-                          nb_zone -= 1;
-                      }
-
-
-                      var Largeur_zone = (Image_width / nb_zone);
-                      var Hauteur_zone = (Image_height);
-                      var init_zone = 0;
-
-                      if (a1.length > 0) {
-                          coord = { x0: init_zone, y0: 0, x1: Largeur_zone, y1: Hauteur_zone };
-
-                          jQuery("area[rel=prev]").attr({ coords: "'" + coord.x0 + "," + coord.y0 + "," + coord.x1 + "," + coord.y1 + "'" });
-                          init_zone += Largeur_zone;
-                      }
-
-                      coord = { x0: init_zone, y0: 0, x1: init_zone + Largeur_zone, y1: Image_height };
-
-                      if (a0.length > 0) {
-                          jQuery("area[rel=up]").attr({ coords: "'" + coord.x0 + "," + coord.y0 + "," + coord.x1 + "," + (coord.y1 / 2) + "'" });
-                          jQuery(a0).attr({ coords: "'" + coord.x0 + "," + (coord.y1 / 2) + "," + coord.x1 + "," + (coord.y1) + "'" });
-                      } else {
-                          jQuery("area[rel=up]").attr({ coords: "'" + coord.x0 + "," + coord.y0 + "," + coord.x1 + "," + (coord.y1) + "'" });
-                      }
-                      init_zone += Largeur_zone;
-
-                      if (a2.length > 0) {
-                          coord = { x0: init_zone, y0: 0, x1: init_zone + Largeur_zone, y1: Image_height };
-                          jQuery("area[rel=next]").attr({ coords: "'" + coord.x0 + "," + coord.y0 + "," + coord.x1 + "," + coord.y1 + "'" });
-                      }
-
-
-
-
-
-                      /*
-                      jQuery("area[rel=prev]").attr({ coords: "'" + 0 + ",0," + (Image_width) / nb_zone + "," + Image_height + "'" });
-                      jQuery("area[rel=up]").attr({ coords: "'" + Image_width * (nb_zone - 1) / (nb_zone + 1) + ",0," + (Image_width * (nb_zone - 1)) / (nb_zone + 1) + "," + Image_height + "'" });
-                      jQuery("area[rel=next]").attr({ coords: "'" + (Image_width * (nb_zone - 1)) / (nb_zone + 1) + ",0," + (Image_width * (nb_zone + 1)) / (nb_zone + 1) + "," + Image_height + "'" });
-                      */
-
-                  }
-              }
-
-              //================ Zone affichage =========================
-              //  Image_height, Image_width = valeur a atteindre.
-              if (theme.match(RegExp("luciano", "g"))) {
-                  //---- information en dehors du cadre 
-                  Zone_Affichage.height -= Bandeau_bas.height;
-                  jQuery(Cadre).height(Zone_Affichage.height);
-
-              }
-
-              //=========================================================
-
-              //  jQuery(Cadre).css("top", "0px");
-              jQuery("#standard").css("top", 0 + "px");
-              jQuery("#comments").css("top", 0 + "px");
-
-
-              jQuery(Cadre).width(Zone_Affichage.width);
-
-              //==============================================================
-
-              img_finale.height = Image_height;
-              img_finale.width = Image_width;
-
-              //=========================================================================
-
-
-              if (typeof (gmaps) != "undefined") {
-                  Gmap_ = gmaps.maps[0];
-                  if (Gmap_.sizeMode == 'A') {
-                      jQuery("#iGMapsIcon").css({ width: old_w * 0.8 + "px", height: old_h * 0.8 + "px" });
-
-                  }
-              }
-              //==============================================================
-              if (Type_Img == "charlie") {
-                  t1 = jQuery("#charlie").info();
-                  /**/
-                  pdf = 2 * parseInt(jQuery(".none_2").css("paddingRight"));
-                  jQuery("#charlie").css({
-                      width: Image_width + pdf,
-                      height: Image_height,
-                      margin: "auto"
-                  });
-
-
-                  jQuery("#player").css("width", Image_width + 100 + "px");
-                  jQuery("#player").css("height", Image_height);
-
-                  jQuery("#embedplayer").css("width", Image_width);
-                  jQuery("#embedplayer").css("height", Image_height);
-
-
-                  jQuery("object").width(Image_width);
-                  jQuery("object").height(Image_height);
-              } else if (Type_Img == "panorama") {
-
-                  // -----     jQuery(TheImg).panorama2(img_finale.height, img_finale.width);
-                  // jQuery(TheImg).height(img_finale.height);
-                  // jQuery(TheImg).width(img_finale.width);
-                  jQuery("#Panorama div").height(Image_height);
-                  //  class=simple_panorama
-
-                  jQuery(".panorama-viewport").css("left", "2px");
-                  jQuery(".panorama-viewport").css("width", "auto");
-                  //   setTimeout("cl_Timer()", 500);
-
-              } else if (Type_Img == "pamoorama") {
-                  return;
-
-                  marge_left += 0;
-                  new_width = Zone_Affichage.width - marge_right - marge_left;
-                  jQuery("#pamoorama").css({ margin: 0 + "px",
-                      left: marge_left + "px",
-                      height: Image_height + info_pamoorama_footer.height + "px",
-                      width: new_width + "px"
-                  });
-
-                  jQuery("#pamoorama").width(new_width);
-
-
-                  jQuery("#pamoorama_outter").css({
-                      left: marge_left + "px",
-                      height: Image_height + "px",
-                      width: (new_width) + "px"
-                  });
-                  jQuery("#pamoorama_outter").width(new_width);
-
-
-                  jQuery("#pamoorama_footer").width((Zone_Affichage.width - marge_right - marge_left));
-                  jQuery("#pamoorama_footer").css('width', (Zone_Affichage.width - marge_right - marge_left) + "px");
-                  zoom = Image_height / img_height;
-                  info_pamoorama_outter = jQuery("#pamoorama_outter").info();
-
-                  h_frame = jQuery("#pamoorama").width();
-                  if (old_w == jQuery(window).width() && old_h == jQuery(window).height()) {
-
-                      /*   if (info_pamoorama_outter.width == 0)
-                      setTimeout("wait_Timer()", 100);
-                      */
-                      //     jQuery(TheImg).css("zoom", zoom);
-                  }
-
-
-              } else if (TheImg.src) {
-                  //--- background ?? ---
-                  jQuery(TheImg).height(img_finale.height);
-                  jQuery(TheImg).width(img_finale.width);
-                  jQuery(TheImg).css("height", img_finale.height + "px");
-                  jQuery(TheImg).css("width", img_finale.width + "px");
-
-              } else {
-                  //===map ? ===
-                  jQuery(TheImg).height(img_finale.height);
-                  jQuery(TheImg).width(img_finale.width);
-                  jQuery(TheImg).css("height", img_finale.height + "px");
-                  jQuery(TheImg).css("width", img_finale.width + "px");
-
-              }
-
-              /*
-              jQuery("#Debug1").css({
-              position: "absolute",
-              top: Bandeau + "px",
-              textAlign: align_auto,
-              margin: "0px auto",
-
-
-              border: "solid 1px red",
-
-              width: Image_width + "px",
-              height: Image_height + "px"
-
-              });
-              //===================================================
-              jQuery("#Debug2").css({ position: "absolute",
-              left: Zone_Affichage.left + 'px',
-              border: "solid 1px green",
-              top: Zone_Affichage.top + "px",
-              width: Zone_Affichage.width / 2 + "px",
-              height: Zone_Affichage.height + "px"
-
-              });
-              jQuery("#Debug2").text(info_Cadre.bottom);
-              */
-
-              try {
-                  if (theme.match(RegExp("gally", "g"))) {
-
-                      //===========================================================================
-
-                      if (jQuery("#navThumbPrev").length > 0) {
-                          jQuery("#navThumbPrev").css({ height: info_img.height + "px",
-                              top: info_img.top
-                          });
-                      }
-                      if (jQuery("#navThumbNext").length > 0) {
-                          jQuery("#navThumbNext").css({ height: info_img.height + "px",
-                              top: info_img.top
-                          });
-                      }
-                      if (!theme.match(RegExp("lapis", "gi"))) { }
-                  } else if (theme.match(RegExp("simple", "g"))) {
-
-                  } else {
-
-                      //    jQuery("#imageToolBar").css("position", "static");
-                  }
-              } catch (e) {
-
-              }
-              //  
-              if (!pos) pos = jQuery("#copyright").info();
-              if (pos != jQuery("#copyright").info())
-                  pos = jQuery("#copyright").info();
-              if (pos.top > 100) jQuery("#the_page").height(pos.top);
-
-              if (old_w == jQuery(window).width() && old_h == jQuery(window).height()) return;
-              jQuery(window).resize();
-              return;
-          });
-          var pos;
-          //===================================================================	  
-          jQuery(window).resize();
-          /*
-          * recherche la plus grande image (hauteur ou largeur)
-          */
-
-
-          function Get_Img_Maxi(myobj) {
-              var w00 = 0;
-              var TheImg = null;
-              jQuery(myobj).each(function (i) {
-                  w0 = img_reelle.width;
-                  h0 = img_reelle.height;
-                  if (h0 > w0) w0 = h0;
-                  if (w0 > w00) {
-                      if (!this.src.match(RegExp(".png", "g")))
-                          if (!this.src.match(RegExp(thumbnail, "g"))) {
-                              TheImg = this;
-                              w00 = w0;
-                          }
-
-                  }
-              });
-              return TheImg;
-          }
-
-
-      } // function
-);                                                                                                                                                                                                                                                                                                                                                                                                                                // ready
-    /*
-*
-*/
-    jQuery.extend(jQuery.expr[':'], {
-        // Nom du sélecteur personnalisé
-        Description: function (a) {
-            n = jQuery(a).info();
-            return a;
-
-        }
-    });
-
-    /* Extension
-    * absolutize:
-    * relativize:
-    */
-//=========================================================
-    jQuery.fn.extend({
-        recentrage_widget: function () {
-            jQuery('html,body').stop().scrollTop(0);
-            jQuery('html,body').stop().scrollLeft(0);
-            jQuery(".ui-widget-overlay").css("opacity", "0.75");
-
-            l1 = (jQuery(window).width() - (jQuery(".gmapsPopup").width()))/2;
-            h1 = (jQuery(window).height() - (jQuery(".gmapsPopup").height()))/2;
- 
-            jQuery(".gmapsPopup").css("left", l1 + "px");
-            jQuery(".gmapsPopup").css("top", h1 + "px");
-
-        },
-        //-------------------------------------------------------
-        absolutize: function (element) {
-            element = jQuery(element).get(0);
-            if (element.getStyle('position') == 'absolute') return;
-            // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-            var offsets = element.positionedOffset();
-            var top = offsets[1];
-            var left = offsets[0];
-            var width = element.clientWidth;
-            var height = element.clientHeight;
-
-            element._originalLeft = left - parseFloat(element.style.left || 0);
-            element._originalTop = top - parseFloat(element.style.top || 0);
-            element._originalWidth = element.style.width;
-            element._originalHeight = element.style.height;
-
-            element.style.position = 'absolute';
-            element.style.top = top + 'px';
-            element.style.left = left + 'px';
-            element.style.width = width + 'px';
-            element.style.height = height + 'px';
-            return element;
-        },
-
-        relativize: function (element) {
-            element = jQuery(element).get(0); ;
-            if (jQuery(element).css('position') == 'relative') return;
-            // Position.prepare(); // To be done manually by Scripty when it needs it.
-            element._originalLeft = parseFloat(element.style.left || 0);
-            element._originalTop = parseFloat(element.style.top || 0);
-            element._originalWidth = element.style.width;
-            element._originalHeight = element.style.height;
-
-            element.style.position = 'relative';
-            var top = parseFloat(element.style.top || 0) - (element._originalTop || 0);
-            var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-            element.style.top = top + 'px';
-            element.style.left = left + 'px';
-            //  element.style.height = element._originalHeight;
-            // element.style.width  = element._originalWidth;
-            return element;
-        }
-        //=========================================================
-    });          // fin extend
Index: /extensions/cl_conflit/js/conflit.js
===================================================================
--- /extensions/cl_conflit/js/conflit.js	(revision 7909)
+++ /extensions/cl_conflit/js/conflit.js	(revision 7910)
@@ -181,4 +181,5 @@
             p0 = jQuery(Parent);
             if (p0.length > 0) {    
+
                 //======================================================
                 if (theme.match("gally", "gi"))
Index: /extensions/cl_conflit/js/jquery.dimensions.js
===================================================================
--- /extensions/cl_conflit/js/jquery.dimensions.js	(revision 7909)
+++ /extensions/cl_conflit/js/jquery.dimensions.js	(revision 7910)
@@ -14,5 +14,5 @@
 */
 (function (jQuery) {
-    jQuery.dimensions = { cl_version: '1.3' };
+    jQuery.dimensions = { cl_dimensions_version: '1.3' };
     /*
     * Interception Height, Width
@@ -31,6 +31,7 @@
                     var torl = name == 'Height' ? 'Top' : 'Left',
                         borr = name == 'Height' ? 'Bottom' : 'Right';
-                    options = jQuery.extend({ margin: false },
-                                                options || {});
+                    options = options || false;
+                    options = jQuery.extend({ margin: options } );
+
                     var val = this.is(':visible') ? this[0]['offset' + name] :
                         num(this,
@@ -39,5 +40,7 @@
                         num(this, 'border' + borr + 'Width') +
                         num(this, 'padding' + torl) +
-                        num(this, 'padding' + borr);
+                        num(this, 'padding' + borr)
+
+                        ;
                     return val + (options.margin ? (num(this, 'margin' + torl) + num(this, 'margin' + borr)) : 0);
                 };
Index: /extensions/cl_conflit/main.inc.php
===================================================================
--- /extensions/cl_conflit/main.inc.php	(revision 7909)
+++ /extensions/cl_conflit/main.inc.php	(revision 7910)
@@ -2,5 +2,5 @@
 /*
 Plugin Name: cl_conflit
-Version: 1.0.1
+Version: 1.0.2
 Description: gestion des conflits entre jQuery et les autres librairies
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=474
