Changeset 16124 for extensions/Autosize

Timestamp:

Jun 28, 2012, 3:44:47 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (3 diffs)
• css/autosize.css (modified) (3 diffs)
• include/affiche.php (modified) (1 diff)
• js/Affiche_script.js (modified) (78 diffs)
• language/no_NO (added)
• language/no_NO/description.txt (added)
• language/no_NO/index.php (added)
• language/no_NO/plugin.lang.php (added)
• template/picture_2_2.tpl (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -129 +129 @@
                                         'AUTOSIZE_PATH' => AUTOSIZE_PATH,
           'Size' => $size
-
+           
                                         )
                                                 );
-
+  include_once (PHPWG_ROOT_PATH.'include/functions_cookie.inc.php') ;
                         $autoscript="<script type='text/javascript'>
                         /* cl_autosize_script_2 */
                         if (typeof (save_framework) == 'function')
-                           save_framework('".$ma_page."');      
+                           save_framework('".$ma_page."');  
+         var cookie_path   ='". cookie_path() ."' 
                         </script>";
           
@@ -301 +302 @@
 function Get_Options(&$parametres,$str_index){
     global $conf ;
+     if (!isset( $conf[$str_index]))  {   
+      $conf[$str_index]="";
+     }
     $m_options=  $conf[$str_index];
      if(isset($m_options))
@@ -401 +405 @@
 
 
+  if (empty($my_para))
+$my_para = (object) '';
+
 $my_para->query =(isset($_POST['query'])) ? $_POST['query'] : ((isset($my_para->query )) ? $my_para->query : 'Qt' ) ;
 $my_para->type=(isset($_POST['type']))? $_POST['type']: ((isset($my_para->type)) ? $my_para->type:  'Ty') ;

extensions/Autosize/css/autosize.css

@@ -19 +19 @@
 .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 0px; top: 0px; background: transparent url(images/resizable-ne.gif); }
 #theImage {
-    opacity: 0;
-    filter: alpha(opacity:0);
+    opacity: 100;
+    filter: alpha(opacity:100);
     padding-top: 0px;
     padding-bottom: 0px;
@@ -29 +29 @@
 }
 #the_page {
-  margin-top: -4px;position:static ;
-  
+  /*  
+  margin-top: -4px;
+position:static ;*/
+   
 }
 #mapPicture{
@@ -41 +43 @@
 }
 
- 
-#theImage {
+
+#navThumbNext, #navThumbPrev{ /*height:200px;*/
 
  
 }
-#content {   
- 
- 
-}
- #imageContainer {
- 
- 
-}
-#navThumbNext, #navThumbPrev{ height:200px;
-
- 
-}
-.navThumbNextBg{
- 
+/**/
+#theImageAndInfos, #theImageAndTitle {
+ /* background-color: #FFFF00;*/
 }
 
-#_Comment{
+#theImage { 
+ /* margin: 10px;
+ border: 10px solid #f0FFf0;
+  padding: 10px;
  
+  background-color: #00FF00; */
 }
-#_Comment2{
+#theMainImage {
+/*
+  margin: 15px;
+  border: 15px solid #f0f0ff;
+  padding:15px;
+  
+ background-color: #0000FF; */
+}
+
+#imageInfos {
+/* margin : 20px;
+  border: 20px solid #FFf0f0;
+  padding: 20px;
  
+  background-color: #FF0000; */
 }
-#charlie div div{
- 
-}
-#charlie div { 
- 
-}
-#charlie a h1 {
-}
-#charlie {
-
-}
-#form_autosize_picture { 
-
-}
-.Image {
-}

extensions/Autosize/include/affiche.php

@@ -42 +42 @@
                                                                         );      
                  
-  
-                                
+if (!isset($conf['prefix_thumbnail'])) $conf['prefix_thumbnail']="TN_";                         
         $template->assign(
                                         array(

extensions/Autosize/js/Affiche_script.js

@@ -2 +2 @@
 // problème avec GMaps+diaporama:
 // corriger   gmaps_pip.class.inc.php ajouter ligne 90 if ( !isset($_GET['slideshow'])) 
-function Toggle_bp() {
-  cl_visible = !cl_visible;
-  
-  jQuery().newResize();
-  Wait_Affichage();
-  set_cl();
-}
+  function Toggle_bp() {
+    cl_visible = !cl_visible;  
+    jQuery().newResize();
+    Wait_Affichage();
+    set_cl();
+  }
   function set_cl(){
   if (typeof cl_visible == "undefined") return;
@@ -18 +17 @@
     if (cl_visible) {
       src_info = src3;
-      src_info_1 = src3;
+      src_infos_1 = src3;
     }
     else {
       src_info = src4;
-      src_info_1 = src5;
+      src_infos_1 = src5;
     }
     zoom = jQuery('#zoom ').val() ;
@@ -31 +30 @@
     jQuery('#bp_cla').attr('Stip', zoom + "%");
 
-  //jQuery('#bp_cla span').text(src_info_1 +"    "+ zoom + "%");
+  //jQuery('#bp_cla span').text(src_infos_1 +"    "+ zoom + "%");
     jQuery('#bp_cla span').text(zoom+"%" );
     bp_scr = jQuery('#bp_img_cla');
@@ -44 +43 @@
 
 }
-nu_img = 0;
-tempo=0;
 
 function Wait_pamoorama() {
@@ -62 +59 @@
             return false;
         }
-        info_pamoorama = jQuery("#pamoorama").infos();
-        new_width = info_pamoorama.width - (info_pamoorama.borderwidth.left + info_pamoorama.borderwidth.right);
+        infos_pamoorama = jQuery("#pamoorama").infos();
+        new_width = infos_pamoorama.width - (infos_pamoorama.borderwidth.left + infos_pamoorama.borderwidth.right);
         if (Math.abs(new_width - myPamoorama.options.width) > 10) {
             setTimeout("Wait_pamoorama()", 500);
@@ -161 +158 @@
 }
 
+//=======================================================================
+function Calcul_Image(all_width) {
+  // theImageAndInfos(jaune) -> theImage(vert) -> [llgbo] -> theMainImage
+  // + infos_imageInfos(red)
+  infos_theImage = jQuery("#theImage").infos();
+
+  infos_the_page = jQuery("#the_page").infos();
+          infos_imageToolBar = jQuery("#imageToolBar").infos();
+          infos_imageInfos = jQuery("#imageInfos").infos();
+          //  infos_llgbo = jQuery("#llgbo").infos();
+ 
+          infos_theImageAndInfos = jQuery("#theImageAndInfos").infos();
+
+          pos_left = infos_theImage.left;
+          x = infos_body.left;
+          imageInfos_width = jQuery("#imageInfos").css("width");
+          infos_body = jQuery("body").infos();
+
+           retrait_w = infos_theImage.margin.left
+                        + infos_theImage.margin.right
+                        + infos_theImage.borderwidth.left
+                        + infos_theImage.borderwidth.right
+                        + infos_theImage.padding.left
+                        + infos_theImage.padding.right;
+
+           retrait_w += infos_the_page.margin.left
+                        + infos_the_page.margin.right
+                        + infos_the_page.borderwidth.left
+                        + infos_the_page.borderwidth.right
+                        + infos_the_page.padding.left
+                        + infos_the_page.padding.right;
+
+           retrait_w += infos_body.margin.left +
+                        infos_body.margin.right;
+
+           retrait_h = infos_theImage.margin.top
+                        + infos_theImage.margin.bottom
+                        + infos_theImage.borderwidth.top
+                        + infos_theImage.borderwidth.bottom
+                        + infos_theImage.padding.top
+                        + infos_theImage.padding.bottom;
+
+           t0 = infos_imageToolBar.bottom + infos_imageToolBar.margin.top + infos_imageToolBar.margin.bottom;
+           if ((t0 > 0) && (infos_theImageAndInfos.top == 0))
+             retrait_h += t0;
+
+           else
+             retrait_h += infos_theImageAndInfos.top;  // top+height 
+
+            jQuery("#theMainImage").css({margin:"auto"        
+            });
+
+           retrait_img = infos_theMainImage.borderwidth.left
+            + infos_theMainImage.borderwidth.right
+            + infos_theMainImage.padding.left
+            + infos_theMainImage.padding.right;
+           retrait_img += infos_llgbo.borderwidth.right + infos_llgbo.borderwidth.right;
+
+        if (theme.match(RegExp("elegant", "gi")) ) {
+          if (all_width != true) {
+            new_width = 8  +
+                        infos_imageInfos.width +
+                        infos_imageInfos.borderwidth.left +
+                        infos_imageInfos.borderwidth.right +
+                        infos_imageInfos.margin.left +
+                        infos_imageInfos.borderwidth.right +
+                        infos_imageInfos.padding.left +
+                        infos_imageInfos.padding.right;                    
+              }else{
+                  new_width=0 ;
+              }
+                width_theImage= (jQuery(window).width() - new_width) 
+              
+        }else if (theme.match(RegExp("stripped", "gi")) ) {
+                width_theImage = (jQuery(window).width() ); 
+        }else{
+                width_theImage = (jQuery(window).width() );
+          }
+
+
+              b = 2;
+
+              n = Bandeau_t;
+              if (infos_llgbo.top > 0) {
+                if ((infos_llgbo.top - retrait_h)>0 ) {
+                  b = infos_llgbo.top - retrait_h;
+                } else {
+                b = infos_llgbo.top;
+                }
+              }
+              retrait_h += (b * 2)
+          height_theImage = jQuery(window).height() - retrait_h  ;  
+          width_theImage -= retrait_w ;
+          //===============================================================
+          width_theMainImage = width_theImage - retrait_img;
+          height_theMainImage = parseInt(width_theMainImage / rapport) - (retrait_img );
+          //===============================================================
+          // test débordement
+          if ((height_theMainImage  ) > height_theImage -(retrait_img + (b*2))) {           
+            height_theMainImage = height_theImage - (retrait_img );
+            width_theMainImage = parseInt(height_theMainImage * rapport);
+          } else {
+            width_theMainImage = width_theImage - (retrait_img);
+            height_theMainImage = parseInt(width_theMainImage / rapport);
+          }
+          height_theImage += (b * 2);
+
+        Zone_image = {
+          image: {  width: width_theMainImage    ,
+                    height: height_theMainImage 
+                    },
+                  container: { 
+                    width: width_theImage  ,
+                    height: height_theImage  
+                              }
+                };
+  
+           Zone_image.marge = { width: retrait_w, height: retrait_h };
+           //============ a corriger en fonction window ====
+        
+             return Zone_image;
+  }
+
 //=====================================================================
-    old_window = { width: 0, height: 0 };
-List_autosize = new Array();
 function Autosize_resize(Obj) {
-
     conf = jQuery(Obj).get(0).conf;
     Obj = jQuery(Obj).get(0).obj;
     myWindow = jQuery("#" + conf.parent).infos();
-
     if (myWindow.width == 0) myWindow = jQuery(window).infos();
     marge_basse = 0;
     if (conf.MargeBasse)
-        marge_basse = jQuery().Get_Val_int(
-            conf.MargeBasse
-    );
+        marge_basse = jQuery().Get_Val_int (conf.MargeBasse );
     marge_top = 0;
     if (conf.MargeHaute)
-        marge_top = jQuery().Get_Val_int(
-            conf.MargeHaute
-    );
-    info_Obj = jQuery(Obj).infos();
+        marge_top = jQuery().Get_Val_int(conf.MargeHaute);
+    infos_Obj = jQuery(Obj).infos();
     h1_left = jQuery(Obj).absoluteLeft();
     h1_top = jQuery(Obj).absoluteTop();
 
-    if (h1_top < info_Obj.height)
+    if (h1_top < infos_Obj.height)
         h1 = (myWindow.height - h1_top - marge_basse - marge_top);
     else
         h1 = (myWindow.height - marge_basse);
-    rap = info_Obj.height / info_Obj.width;
+    rap = infos_Obj.height / infos_Obj.width;
     w2 = parseInt(h1 / rap);
-    if (w2 < info_Obj.width)
-        marginLeft = info_Obj.left + parseInt((info_Obj.width - w2) / 2) + "px";
+    if (w2 < infos_Obj.width)
+        marginLeft = infos_Obj.left + parseInt((infos_Obj.width - w2) / 2) + "px";
     else
         marginLeft = "auto";
@@ -214 +326 @@
       h1_top = jQuery(img).absoluteTop() - h1_top; 
       h1_bottom =  Obj_h  - h1_top;
-      info_img = { width: conf.width[i], height: conf.height[i] }; //origine 
+      infos_img = { width: conf.width[i], height: conf.height[i] }; //origine 
         img_rap = conf.rap[i];
-        if (info_img.width > Obj_w) h1 = parseInt(Obj_w / img_rap);
+        if (infos_img.width > Obj_w) h1 = parseInt(Obj_w / img_rap);
       h1 -= h1_top;
       if (h1 > Obj_h - h1_top) {
@@ -233 +345 @@
       h1_top = jQuery(this).absoluteTop() - h1_top;
       h1_bottom = Obj_h - h1_top;
-      info_img = { width: conf.width[i], height: conf.height[i] }; //origine 
+      infos_img = { width: conf.width[i], height: conf.height[i] }; //origine 
       img_rap = conf.rap[i];
-      if (info_img.width > Obj_w) h1 = parseInt(Obj_w / img_rap);
+      if (infos_img.width > Obj_w) h1 = parseInt(Obj_w / img_rap);
       h1 -= h1_top;
       if (h1 > Obj_h - h1_top) {
@@ -416 +528 @@
 }
 //==============================================================
+var infos_theImageAndInfos = jQuery("#theImageAndInfos").infos(); // Cadre general
+var infos_theMainImage = jQuery("#theMainImage").infos();         // Cadre general
+var infos_imageInfos = jQuery("#imageInfos").infos();             // Cadre general
+var infos_the_page = jQuery("#the_page").infos();
+var infos_content = jQuery("#content").infos();
+var infos_titrePage = jQuery("#titrePage").infos();
+var infos_imageInfoBar = jQuery("#imageInfoBar").infos();
+var infos_theHeader = jQuery("#theHeader").infos();
+var infos_imageToolBar = jQuery("#imageToolBar").infos();
+var infos_body = jQuery("body").infos();
+var infos_llgbo = jQuery("#llgbo").infos();
+var infos_llgboh2 = jQuery("#llgboh2").infos();
+//===============================================================
+
 jQuery(document).ready(
      function (jQuery) {
        // jQuery(':Autosize');
+
+
        jQuery(window).unload(function () {
          try {
@@ -445 +573 @@
          href = location.href;
          var aff_ok = false;
-       /*
+         /*
          jQuery.post(href, function (data) {
-           nu_img--;
-           if (nu_img < 0) nu_img = 9;
-           jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
-           //alert("Data Loaded: " + data);
-           Wait_Affichage();
+         nu_img--;
+         if (nu_img < 0) nu_img = 9;
+         jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
+         //alert("Data Loaded: " + data);
+         Wait_Affichage();
          });
-*/
+         */
          // jQuery(':Set_Class');
          if (typeof img_width == "undefined") {
@@ -491 +619 @@
          jQuery("#the_page").css({ top: "0px" });
 
-         Info_the_page = jQuery("#the_page").infos();
-         info_HeaderBar = jQuery("#imageHeaderBar").infos();
+         infos_theImageAndInfos = jQuery("#theImageAndInfos").infos(); // Cadre general
+         infos_theMainImage = jQuery("#theMainImage").infos();         // Cadre general
+         infos_imageInfos = jQuery("#imageInfos").infos();             // Cadre general
+        infos_the_page = jQuery("#the_page").infos();
+         infos_content = jQuery("#content").infos();
+         infos_titrePage = jQuery("#titrePage").infos();
+         infos_imageInfoBar = jQuery("#imageInfoBar").infos();
+         infos_theHeader = jQuery("#theHeader").infos();
+         infos_imageToolBar = jQuery("#imageToolBar").infos();
+         infos_imageHeaderBar = jQuery("#imageHeaderBar").infos();
 
          Parent = "#theImage";
-         var info_theImage = jQuery(Parent).infos();
+         infos_theImage = jQuery(Parent).infos();
          Zone_Affichage = jQuery(Parent).infos();
          //
          var old_window = { width: 0, height: 0 };
 
-         Bandeau_bas = Info_Description_f(Parent);
+         Bandeau_bas = infos_Description_f(Parent);
          if (typeof Bandeau_bas != "undefined") Bandeau = Bandeau_bas.top;
          else Bandeau = 0;
 
+
+         rapport = parseInt(img_init.width) / parseInt(img_init.height);
+
+
+
+
          old_window = { width: 0, height: 0 };
-         jQuery().newResize();
+         jQuery().newResize(true);
          Wait_Affichage();
 
@@ -535 +677 @@
        jQuery.fn.extend({
          //==========================================================
-         Info_description: function (e) {
-           return Info_Description_f(e);
+         infos_description: function (e) {
+           return infos_Description_f(e);
 
          },
@@ -556 +698 @@
          },
          //====================================================
-         newResize: function () {
-           //
-           //set_cl();
+         newResize: function (force) {
+           if (force && force == true) old_window.width = 0;
+           id2 = jQuery("#theImage img").attr("usemap");
+           if (typeof id2 == "undefined") id2 = jQuery("#theImage").attr("usemap");
+           if (id2) {
+             if (id2.match(RegExp("#map", "gi"))) {
+               return true;
+             }
+           }
            if (typeof options != "undefined")
              if (options.imageAutosize) {
                // Wait_Affichage();
                return true; //stripped
-             }
-
-             if (typeof Bandeau_bas == "undefined")
+             }         
+           if (typeof Bandeau_bas == "undefined")
              return true;
-
            if (typeof cl_visible == "undefined") return true;
            if (!cl_visible == true) { return true; }
            var chk = eval(user_status + "_enabled");
            if (chk == "") { return true; }
-           //=================================================================
+           //================================================================= 
+           
+           nds = jQuery("#imageInfos").css("display");
+           Zone_image = Calcul_Image(nds == "none");
+
            var winwidth = jQuery(window).width();
            var winheight = jQuery(window).height();
+
+
            n = winwidth - old_window.width;
            if (Math.abs(n) < 1) {
              n = winheight - old_window.height;
              if (Math.abs(n) < 1) {
-               n = winheight - old_window.height;
-               //return false;
-
+               return false;
              }
            }
+
            if (Math.abs(n) > 30) nu_img = 0;
            nu_img++;
-           //if (nu_img > 10) return true;
+           if (nu_img > 10) return true;
+
            old_window = jQuery(window).infos();
-           //===========================================================================
-
-           jQuery(Parent).width(winwidth);
-
-           var Cadre = jQuery(Parent).get(0);
-
-           //===============  Information cadre ======
-           var info_the_page = jQuery("#the_page").infos();
-           //=============================================================================
-
-           var info_content = jQuery("#content").infos();
-           var info_titrePage = jQuery("#titrePage").infos();
-           var info_imageInfoBar = jQuery("#imageInfoBar").infos();
-           var info_theHeader = jQuery("#theHeader").infos();
-
-           var Zone_Affichage = jQuery(Parent).infos();
-           var info_ToolBar = jQuery("#imageToolBar").infos();
+           //========= Récupération des informations =============       
+
+
            var marge = 0;
            var marge_right = 0;
@@ -610 +748 @@
 
            var Licence = jQuery(".licencetag");
-           info_Licence = jQuery(".licencetag").infos();
-
-           // jQuery(".licencetag").addClass('imageComment');
- /*
-           hd_click = jQuery("#theImage a[href]");
-           if (hd_click.length > 0) {
-             hd_click = hd_click[0];
-             if (hd_click.href.match(RegExp("phpWGOpenWindow", "gi"))) {
-
-               hd_click = jQuery("#theImage p");
-               jQuery(hd_click).addClass('imageComment');
-               jQuery(hd_click).wrapAll('<div id="_Comment2"  />');
-             }
-           }
-
-           if (jQuery('#_Comment, ').length == 0)
-             jQuery('.imageComment, ').wrapAll('<div id="_Comment"  />');
-            */
-
-           if (theme.match(RegExp("simple", "g"))) {
-             if (info_ToolBar.width > 0)
-               marge = (Zone_Affichage.width - info_ToolBar.width) / 2;
-             else if (info_the_page.width > 0)
-               marge = (Zone_Affichage.width - info_the_page.width) / 2;
+           infos_Licence = jQuery(".licencetag").infos();
+
+           if (theme.match(RegExp("simple", "gi"))) {
+             if (infos_imageToolBar.width > 0)
+               marge = (Zone_Affichage.width - infos_imageToolBar.width) / 2;
+             else if (infos_the_page.width > 0)
+               marge = (Zone_Affichage.width - infos_the_page.width) / 2;
 
              marge_right = marge;
              marge_left = marge;
 
-             if (info_content.width > 100) {
-
-               marge_left = (info_imageInfoBar.margin.left) + 1;
-               marge_right = (marge_left + info_imageInfoBar.margin.right) + 1;
-               winwidth = info_content.width;
-               marge_right = info_imageInfoBar.width + marge_right;
+             if (infos_content.width > 100) {
+
+               marge_left = (infos_imageInfoBar.margin.left) + 1;
+               marge_right = (marge_left + infos_imageInfoBar.margin.right) + 1;
+               winwidth = infos_content.width;
+               marge_right = infos_imageInfoBar.width + marge_right;
 
              }
+           } else if (theme.match(RegExp("elegant", "gi"))) {
+
+             infos_theMainImage = jQuery("#theMainImage").infos(); // Image
+             infos_imageHeaderBar = jQuery("#imageHeaderBar").infos();
+             infos_window = jQuery(window).infos();
+
+             infos_theImage = jQuery("#theImage").infos(); // conteneur image
+             infos_imageInfos = jQuery("#imageInfos").infos(); // conteneur infos
+
+             if (jQuery("#imageInfos").is(":hidden")) {
+
+               marge_right = infos_imageInfos.margin.left + infos_imageInfos.margin.right;
+               marge_right += infos_imageInfos.borderwidth.left + infos_imageInfos.borderwidth.right;
+
+               marge_left = infos_imageInfos.left + 2;
+             } else {
+
+               marge_right = infos_imageInfos.margin.left + infos_imageInfos.margin.right;
+               marge_right += infos_imageInfos.width + infos_imageInfos.borderwidth.left + infos_imageInfos.borderwidth.right;
+
+               marge_left = infos_imageInfos.left + 2;
+             }
+
            } else {
-             if (theme.match(RegExp("stripped", "gi"))) {
-
-               info_imageHeaderBar = jQuery("#imageHeaderBar").infos();
-               marge = (info_the_page.width - info_content.width) / 2;
+             infos_imageHeaderBar = jQuery("#imageHeaderBar").infos();
+             if (theme.match(RegExp("stripped", "gi")) || theme.match(RegExp("elegant", "gi"))) {
+               marge = (infos_the_page.width - infos_content.width) / 2;
                marge_right = marge + 2;
                marge_left = marge + 2;
-             } else if (info_ToolBar.width > 0) {
-               marge = (info_the_page.width - info_ToolBar.width) / 2;
-
-               marge_right = marge + info_the_page.left;
+             } else if (infos_imageToolBar.width > 0) {
+               marge = (infos_the_page.width - infos_imageToolBar.width) / 2;
+
+               marge_right = marge + infos_the_page.left;
                marge_left = marge;
 
              }
-             winwidth = info_the_page.width;
+             winwidth = infos_the_page.width;
            }
 
@@ -667 +810 @@
            marge_right += Zone_Affichage.borderwidth.right;
            marge_left += Zone_Affichage.borderwidth.left;
-           if ((marge_right + marge_left) < winwidth ) {
-           winwidth -= (marge_right + marge_left);
-           }
+           if ((marge_right + marge_left) < winwidth) {
+             winwidth -= (marge_right + marge_left);
+           }
+   
+
 
            if (Type_Img == "pamoorama") {
@@ -685 +830 @@
              }
 
-             var info_pamoorama = jQuery("#pamoorama").infos();
-             var info_pamoorama_outter = jQuery("#pamoorama_outter").infos();
-             var info_pamoorama_inner = jQuery("#pamoorama_inner").infos();
-             var info_pamoorama_footer = jQuery("#pamoorama_footer").infos();
-             var info_pamoorama_frame = jQuery("#pamoorama_frame").infos();
+             var infos_pamoorama = jQuery("#pamoorama").infos();
+             var infos_pamoorama_outter = jQuery("#pamoorama_outter").infos();
+             var infos_pamoorama_inner = jQuery("#pamoorama_inner").infos();
+             var infos_pamoorama_footer = jQuery("#pamoorama_footer").infos();
+             var infos_pamoorama_frame = jQuery("#pamoorama_frame").infos();
              The_MainImage = jQuery("#pamoorama");
              obj = The_MainImage.get(0);
@@ -704 +849 @@
            switch (Type_Img) {
              case "map":
-               img_reelle.height = winheight; // info_img.height;
-               info_map = jQuery("#mapPicture").infos();
-               jQuery("#map").css("left", info_map.width + "px");
-               Bandeau_bas.height = 10;
-
-               if (theme.match(RegExp("simple", "g"))) {
-                 img_reelle.width = winwidth; //- info_map.width -marge_right;
-               } else {
-                 img_reelle.width = winwidth - info_map.width - marge_right;
-               }
-
-
-               info_the_page = jQuery("#the_page").infos();
-               winwidth = img_reelle.width;
+
 
                ;
@@ -724 +856 @@
 
 
-             case "panorama":
-               //  return true;
-
-               //the theMainImage ??
+             case "panorama":      
                if (!The_MainImage) {
                  The_MainImage = jQuery("#theMainImage");
@@ -733 +862 @@
                    return;
                  The_MainImage = jQuery().Get_Img_Maxi("#Panorama img[alt]");
-                 // return;
+               
                  if (The_MainImage.length > 0)
                    The_MainImage = The_MainImage[0];
@@ -739 +868 @@
                    The_MainImage = jQuery().Get_Img_Maxi("#Panorama img[alt]");
                }
-               info_theImage = jQuery(The_MainImage).infos();
-               info_the_page = jQuery("#the_page").infos();
-               jQuery("#theImage").height(info_theImage.height);
-               img_finale.height = info_theImage.height;
+               infos_theImage = jQuery(The_MainImage).infos();
+               infos_the_page = jQuery("#the_page").infos();
+               jQuery("#theImage").height(infos_theImage.height);
+               img_finale.height = infos_theImage.height;
 
                break
@@ -752 +881 @@
                }
 
-               info_the_page = jQuery("#the_page").infos();
+               infos_the_page = jQuery("#the_page").infos();
 
 
@@ -762 +891 @@
 
                }
-               info_theImage = jQuery(The_MainImage).infos();
-               info_the_page = jQuery("#the_page").infos();
+               infos_theImage = jQuery(The_MainImage).infos();
+               infos_the_page = jQuery("#the_page").infos();
 
 
@@ -769 +898 @@
              case "embed":
                //
-               if (info_img.width == 0)
-                 info_img = jQuery("#thePicturePage").infos();
-               if (info_img.width == 0)
-                 info_img = jQuery("#the_page").infos();
-               info_theImage = info_img;
-               info_the_page = jQuery("#the_page").infos();
+               if (infos_img.width == 0)
+                 infos_img = jQuery("#thePicturePage").infos();
+               if (infos_img.width == 0)
+                 infos_img = jQuery("#the_page").infos();
+               infos_theImage = infos_img;
+               infos_the_page = jQuery("#the_page").infos();
                Bandeau_bas.height = Bandeau_bas.top;
 
                iph1 = jQuery("#theImage div").infos();
-               if ((winheight - iph1.bottom)>0)
-               Bandeau_bas.height =(winheight - iph1.bottom) + 50;
+               if ((winheight - iph1.bottom) > 0)
+                 Bandeau_bas.height = (winheight - iph1.bottom) + 50;
                else
-               Bandeau_bas.height = 50;
+                 Bandeau_bas.height = 50;
 
 
                if (rapport < 0) {
-                 img_height = info_img.height;
-                 img_width = info_img.width;
+                 img_height = infos_img.height;
+                 img_width = infos_img.width;
                  img_reelle.height = img_height;
                  img_reelle.width = img_width;
@@ -793 +922 @@
                break
              case "charlie":
-               info_theImage = info_img;
-               info_the_page = jQuery("#the_page").infos();
+               infos_theImage = infos_img;
+               infos_the_page = jQuery("#the_page").infos();
                if (rapport < 0) {
-                 img_height = parseInt(info_img.height);
-                 img_width = parseInt(info_img.width);
-
-                 img_reelle.height = parseInt(info_img.height);
-                 img_reelle.width = parseInt(info_img.width);
+                 img_height = parseInt(infos_img.height);
+                 img_width = parseInt(infos_img.width);
+                 img_reelle.height = parseInt(infos_img.height);
+                 img_reelle.width = parseInt(infos_img.width);
                }
                break
@@ -806 +934 @@
 
              case "pamoorama":
-
                img_reelle = { height: img_height, width: img_width };
-
                //=========================================================
                img_reelle.height = img_height;
                img_reelle.width = Zone_Affichage.width;
-
-
                The_MainImage = myPamoorama.image;
-               info_theImage = jQuery("#pamoorama").infos();
-               //img_finale.height = info_theImage.height;
-               //info_theImage.height = img_reelle.height;
-
-               info_theImage.height = info_theImage.height;
-
-               info_the_page = jQuery("#the_page").infos();
-
+               infos_theImage = jQuery("#pamoorama").infos();
+               infos_theImage.height = infos_theImage.height;
+               infos_the_page = jQuery("#the_page").infos();
                break
-
-
-           }
-           //================= Vérification taille image ==================
+           }
+ //================= Vérification taille image ==================
            MinWidth = jQuery(The_MainImage).css("minWidth");
            if (MinWidth == "0px")
@@ -854 +971 @@
            maxHeight = jQuery(The_MainImage).Get_Val_int(MaxHeight, winheight, "0");
 
-
-
            mini_width = parseInt(miniWidth);
            mini_height = parseInt(miniHeight);
@@ -861 +976 @@
            img_reelle.width = parseInt(img_reelle.width);
 
-           if (img_reelle.width < mini_width) {
-             //jQuery(Cadre).width(mini_width); 1.6.2
+           if (img_reelle.width < mini_width) 
              return true;
-
-           }
+         
 
            img_reelle.height = parseInt(img_reelle.height);
            if (img_reelle.height < parseInt(mini_height))
              return true;
-           //==================================================================================
-           //---------------------------------------------
-           //  jQuery(Parent).width(winwidth);
-           //  jQuery(Parent).css({ height: "auto" });
-           //  jQuery(Parent).height(Zone_Affichage.height);
-           //---------------------------------------------
-
-           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;
-
-
+//======================================================================
+           jQuery("#theMainImage").width(Zone_image.image.width);
+           jQuery("#theMainImage").height(Zone_image.image.height);
+           jQuery("#theImage").width(Zone_image.container.width);
+           jQuery("#theImage").height(Zone_image.container.height);
+         
+return true;
+ //=============== Zone d'affichage ============================  
+           Zone_Affichage.width = winwidth;
+           borderH = Zone_Affichage.borderwidth.top;
+           borderH += Zone_Affichage.borderwidth.bottom;
+
+           Zone_Affichage.height = winheight - borderH;
 
            var Licence = jQuery(".licencetag");
-           info_Licence = jQuery(".licencetag").infos();
+           infos_Licence = jQuery(".licencetag").infos();
 
            var MainImage = jQuery("#theMainImage");
@@ -912 +1008 @@
            if (theme.match(RegExp("sobre", "g"))) {
 
-             //   correction = -info_Licence.padding.top;
+             //   correction = -infos_Licence.padding.top;
              if (Type_Img == 'img') {
                if (msie == true) correction = 0;
@@ -930 +1026 @@
            } else if (theme.match(RegExp("os", "g"))) {
              correction += 0; //??
-           }
-
+           } else if (theme.match(RegExp("elegant", "gi"))) {
+             correction += 0; //??
+           }
            //====================================================
            if (options.imageAutosizeMargin > 0) Marge_Basse = options.imageAutosizeMargin;
@@ -938 +1035 @@
            h = 0;
            Bandeau = 0;
-
+           infos_body = jQuery("body").infos();
            h = (Zone_Affichage.padding.bottom + Zone_Affichage.padding.top + Zone_Affichage.margin.top + Zone_Affichage.margin.bottom);
-           if (typeof Bandeau_t != "undefined") Bandeau = Bandeau_t.img_top | 0;
-           Zone_Affichage.height = winheight - Bandeau - Marge_Basse - correction - h;
+           h -= infos_body.margin.bottom;
+           h -= infos_body.margin.top;
+           if (typeof Bandeau_t != "undefined") {
+             Bandeau = Bandeau_t.top | 0;
+
+           }
+           Zone_Affichage.height -= Bandeau + Marge_Basse - correction - h; // 784 -127
+
+
            //=========================================================================
            if (Zone_Affichage.height < mini_height2)
@@ -948 +1052 @@
              Zone_Affichage.width = mini_width2;
            //=========================================================================
+           /*
            if (typeof (Bandeau_bas) != "undefined") {
-             if (Bandeau_bas.height < Zone_Affichage.height) 
-                 Zone_Affichage.height -= (Bandeau_bas.height + Bandeau_bas.marge.top + Bandeau_bas.marge.bottom);
+           if (Bandeau_bas.height < Zone_Affichage.height)
+           Zone_Affichage.height += (Bandeau_bas.height + Bandeau_bas.marge.top + Bandeau_bas.marge.bottom);
            } else {
-           }
-
-           var Image_height = Zone_Affichage.height;
+
+           }
+           */
+
+
+
+           img_finale.width = Zone_Affichage.width - (Zone_Affichage.borderwidth.left + Zone_Affichage.borderwidth.right);
+           img_finale.height = Zone_Affichage.height - (Zone_Affichage.borderwidth.left + Zone_Affichage.borderwidth.bottom);
+
+
+           var Image_height = img_finale.height;
 
            //=============================================================
@@ -970 +1083 @@
            Image_height = parseInt(img_reelle.height * echelle);
            //============================================================
-
            var Image_width;
            if (rapport > 0)
@@ -981 +1093 @@
 
            //===============================================================
+           jQuery(Cadre).width(Zone_Affichage.width);
+           jQuery(Cadre).height(Zone_Affichage.height);
+           jQuery(The_MainImage).removeAttr("width");
+           jQuery(The_MainImage).css({ height: Image_height }); //image
+
+
+
            align_auto = "center";
            if (jQuery("#theImg").css("textAlign"))
@@ -999 +1118 @@
              var marges = 0;
 
-             if (typeof (info_img) != "undefined") {
-               widthmin -= info_img.borderwidth.left || 0;
-               widthmin -= info_img.borderwidth.right || 0;
+             if (typeof (infos_img) != "undefined") {
+               widthmin -= infos_img.borderwidth.left || 0;
+               widthmin -= infos_img.borderwidth.right || 0;
              }
              widthmin -= marges;
@@ -1042 +1161 @@
              t1 = llgboframe;
              if (!The_MainImage.src) {
-               The_MainImage = jQuery("#gbo").find("img").get(0)
+               The_MainImage = jQuery("#llgbo").find("img").get(0)
                if (!The_MainImage.src) {
                  The_MainImage = jQuery(Parent).find("div").get(0)
@@ -1051 +1170 @@
                heightgbo = img_finale.height;
                if (Type_Img == "panorama") {
-                 heightgbo = info_theImage.height;
-                 img_finale.height = info_theImage.height;
+                 heightgbo = infos_theImage.height;
+                 img_finale.height = infos_theImage.height;
                }
 
@@ -1064 +1183 @@
 
                if (wingbo > winwidth) {
-                 jQuery("#gbo").width(winwidth);
-                 jQuery("#gbo").height(winheight);
-                 jQuery("#gbo").css("width", winwidth + "px");
-                 jQuery("#gbo").css("height", winheight + "px");
+                 jQuery("#llgbo").width(winwidth);
+                 jQuery("#llgbo").height(winheight);
+                 jQuery("#llgbo").css("width", winwidth + "px");
+                 jQuery("#llgbo").css("height", winheight + "px");
                }
                else {
-                 jQuery("#gbo").width(wingbo);
-                 jQuery("#gbo").height(heightgbo);
-                 jQuery("#gbo").css("width", wingbo + "px");
-                 jQuery("#gbo").css("height", heightgbo + "px");
+                 jQuery("#llgbo").width(wingbo);
+                 jQuery("#llgbo").height(heightgbo);
+                 jQuery("#llgbo").css("width", wingbo + "px");
+                 jQuery("#llgbo").css("height", heightgbo + "px");
                }
 
@@ -1120 +1239 @@
            //================ Zone affichage =========================
 
-
            //  jQuery(Cadre).css("top", "0px");
            jQuery("#standard").css("top", 0 + "px");
@@ -1141 +1259 @@
 
              jQuery(Cadre).css({ width: Zone_Affichage.width + "px" });
+           } else if (theme.match(RegExp("elegant", "gi"))) {
+
+             // jQuery(Cadre).css("width", "auto");
+             jQuery(Cadre).css({ height: Zone_Affichage.height + "px", width: "auto" }); //conteneur
 
            } else {
@@ -1149 +1271 @@
 
            if (Type_Img == "panorama" || Type_Img == "pamoorama") {
-             img_finale.height = info_theImage.height;
+             img_finale.height = infos_theImage.height;
              Zone_Affichage.height = img_finale.height;
 
@@ -1208 +1330 @@
                });
                jQuery("object").css({ width: img_finale.width + "px",
-                                    height: img_finale.height + "px"
-                                  });
-              jQuery("video").css({ width: img_finale.width + "px",
-                                    height: img_finale.height + "px"
-                                  });
+                 height: img_finale.height + "px"
+               });
+               jQuery("video").css({ width: img_finale.width + "px",
+                 height: img_finale.height + "px"
+               });
 
 
@@ -1254 +1376 @@
              n1 = jQuery("#Panorama div").width();
              jQuery(".panorama-viewport").css("margin", "auto");
-             n = info_imageToolBar;
+             n = infos_imageToolBar;
 
 
@@ -1261 +1383 @@
 
 
-             info_theImage.height = Zone_Affichage.height;
+             infos_theImage.height = Zone_Affichage.height;
              img_height = myPamoorama.imageHeight
              if (theme.match(RegExp("simple", "g"))) {
@@ -1267 +1389 @@
              }
              new_width = Zone_Affichage.width - marge_right - marge_left;
-             new_width = Zone_Affichage.width - (info_theImage.borderwidth.right + info_theImage.borderwidth.left);
+             new_width = Zone_Affichage.width - (infos_theImage.borderwidth.right + infos_theImage.borderwidth.left);
              if (new_width > myPamoorama.imageWidth)
                new_width = myPamoorama.imageWidth;
@@ -1273 +1395 @@
 
 
-             Zone_Affichage.height += info_pamoorama_footer.height;
-             zoom = info_theImage.height / img_height;
+             Zone_Affichage.height += infos_pamoorama_footer.height;
+             zoom = infos_theImage.height / img_height;
              myPamoorama.options.width = new_width * zoom;
              //  if(msie || safari) jQuery("#pamoorama_inner ").css({ zoom: zoom });
@@ -1287 +1409 @@
 
              //====================================================
-             info_pamoorama = jQuery("#pamoorama").infos();
-             img_finale.height = info_pamoorama.height - info_pamoorama_footer.height;
+             infos_pamoorama = jQuery("#pamoorama").infos();
+             img_finale.height = infos_pamoorama.height - infos_pamoorama_footer.height;
              img_finale.width = new_width;
 
@@ -1295 +1417 @@
              jQuery("#pamoorama_thumb").width(200 / zoom);
              // commenter sinon outter augmente à chaque resize
-             //  jQuery("#pamoorama_outter").height(info_pamoorama.height - info_pamoorama_footer.height);
+             //  jQuery("#pamoorama_outter").height(infos_pamoorama.height - infos_pamoorama_footer.height);
              // pamoorama_frame
 
@@ -1303 +1425 @@
              //
              //====================================================
-             info_pamoorama = jQuery("#pamoorama").infos();
-             info_pamoorama_outter = jQuery("#pamoorama_outter").infos();
-             info_pamoorama_inner = jQuery("#pamoorama_inner").infos();
-             info_pamoorama_footer = jQuery("#pamoorama_footer").infos();
-             info_pamoorama_frame = jQuery("#pamoorama_frame").infos();
-
-             info_frame = jQuery(myPamoorama.frame).infos();
+             infos_pamoorama = jQuery("#pamoorama").infos();
+             infos_pamoorama_outter = jQuery("#pamoorama_outter").infos();
+             infos_pamoorama_inner = jQuery("#pamoorama_inner").infos();
+             infos_pamoorama_footer = jQuery("#pamoorama_footer").infos();
+             infos_pamoorama_frame = jQuery("#pamoorama_frame").infos();
+
+             infos_frame = jQuery(myPamoorama.frame).infos();
 
 
@@ -1324 +1446 @@
            } else {
              //===map ? luciano ===
-             jQuery(The_MainImage).height(img_finale.height);
-             jQuery(The_MainImage).width(img_finale.width);
-             jQuery(The_MainImage).css({ height: img_finale.height + "px ",
-               width: img_finale.width + "px "
-             });
+             //   jQuery(The_MainImage).css({ height: img_finale.height + "px ",  width: img_finale.width + "px });
+             //   jQuery(The_MainImage).height(img_finale.height );
+             //   jQuery(The_MainImage).width(img_finale.width );
+             //   jQuery(The_MainImage).attr({ width: img_finale.width  });
+             h = img_finale.height;
+             h = Zone_Affichage.height - Zone_Affichage.borderwidth.top - Zone_Affichage.borderwidth.bottom;
+             h -= (infos_theImage.borderwidth.bottom + infos_theImage.borderwidth.top);
+
+             jQuery(The_MainImage).attr({ height: h - 3 }); //image
+             if (theme.match(RegExp("elegant", "gi"))) {
+               return true;
+
+             }
              if (theme.match(RegExp("luciano", "g"))) {
                imgl = 180;
@@ -1341 +1471 @@
              }
 
+           }
+
+           var theImg = document.getElementById("theMainImage");
+           if (theImg) {
+             theImg.removeAttribute("width");
+             theImg.removeAttribute("height");
+             jQuery(The_MainImage).css("width", img_finale.width + "px");
            }
 
@@ -1349 +1486 @@
              jQuery("#navThumbNext").css({ display: 'none' });
              jQuery("#navThumbPrev").css({ display: 'none' });
-             jQuery("#theImage").css({ marginTop: info_ToolBar.height + "px", marginLeft: "0px",
+             jQuery("#theImage").css({ marginTop: infos_imageToolBar.height + "px", marginLeft: "0px",
                width: winwidth + "px",
                height: winheight + "px"
@@ -1390 +1527 @@
                jQuery("#imageToolBar").css({ position: "static" });
 
-               info_imageInfoBar = jQuery("#imageInfoBar").infos();
-               if (info_imageInfoBar.bottom < info_img.bottom) {
-                 //   jQuery("#imageInfoBar").height(info_img.bottom);
+               infos_imageInfoBar = jQuery("#imageInfoBar").infos();
+               if (infos_imageInfoBar.bottom < infos_img.bottom) {
+                 //   jQuery("#imageInfoBar").height(infos_img.bottom);
                }
 
@@ -1414 +1551 @@
            set_cl();
 
-          
+
            //  --- réglage de la hauteur de page en fonction du copyright-----------
            if (typeof (pos_copyright) == "undefined") pos_copyright = jQuery("#copyright").infos();
@@ -1433 +1570 @@
            }
            */
-           info_frame = jQuery(Cadre).infos();
+           infos_frame = jQuery(Cadre).infos();
            if (theme.match(RegExp("stripped", "gi"))) {
              /*
-             info_theImageBox = jQuery("#theImageAndTitle").infos();
+             infos_theImageBox = jQuery("#theImageAndTitle").infos();
              p1 = jQuery(".randomButtons").infos();
              p2 = jQuery("#imageHeaderBar").infos();
-             p3 = info_content.top;
+             p3 = infos_content.top;
              p1 = options.imageAutosizeTitle;
 
-             jQuery("#theImage").width("width", info_theImageBox.width + "px");
+             jQuery("#theImage").width("width", infos_theImageBox.width + "px");
              //jQuery("#theImageAndTitle").css("position", "relative");
              jQuery("#content").css({ position: "relative", top: "10px", marginTop: "0px",
@@ -1451 +1588 @@
              paddingTop: "0px", marginLeft: "auto"
              }); */
-             t1 = info_theImageBox.top;
-             l1 = info_theImageBox.left;
-             // info_theImageBox = jQuery(Parent).infos();
+             t1 = infos_theImageBox.top;
+             l1 = infos_theImageBox.left;
+             // infos_theImageBox = jQuery(Parent).infos();
 
            } else {
 
-             t1 = info_frame.top;
-             l1 = info_frame.left;
-             info_theImageBox = jQuery(Parent).infos(); //theImage
-           }
-           info_theImageBox.margin.margin = info_frame.margin.margin;
-           info_theImageBox.top = t1;
-           info_theImageBox.left = l1;
-           //  info_theImageBox.position = "absolute";
-
-           Window_Affichage = info_theImageBox;
+             t1 = infos_frame.top;
+             l1 = infos_frame.left;
+             infos_theImageBox = jQuery(Parent).infos(); //theImage
+           }
+           infos_theImageBox.margin.margin = infos_frame.margin.margin;
+           infos_theImageBox.top = t1;
+           infos_theImageBox.left = l1;
+           //  infos_theImageBox.position = "absolute";
+
+           Window_Affichage = infos_theImageBox;
            if (DEBUG_autosize == "_true") {
              //   jQuery(Cadre).css("border", "solid green");
@@ -1480 +1617 @@
                height: Window_Affichage.height + "px"
              }); //red
-             jQuery("#Debug4").css({ top: info_frame.bottom - info_description.height + "px" }); //green
+             jQuery("#Debug4").css({ top: infos_frame.bottom - infos_description.height + "px" }); //green
            }
 
@@ -1510 +1647 @@
     img = jQuery("#theMainImage");
     if (img != null) {
-return;
+      return;
 
     }  
@@ -1525 +1662 @@
                 if (!this.src.match(RegExp(thumbnail, "g"))) {
                     myImg = this;
-           jQuery( myImg).addClass("Image");
+                    jQuery( myImg).addClass("Image");
                     w00 = w0;
                 }
@@ -1539 +1676 @@
 */
 
-function Info_entete(Parent) {
-
-    info_imageToolBar = jQuery("#imageToolBar").infos();
+function infos_entete(Parent) {
+
+    infos_imageToolBar = jQuery("#imageToolBar").infos();
     if (typeof (marge_top) != "undefined") return result;
 
-    if (info_imageToolBar.position == "absolute") {
+    if (infos_imageToolBar.position == "absolute") {
         jQuery("#imageToolBar").css("position", "relative");
         jQuery("#imageToolBar").css("top", 0 + "px");
@@ -1551 +1688 @@
 
 
-    info_imageInfoBar = jQuery("#imageInfoBar").infos();
+    infos_imageInfoBar = jQuery("#imageInfoBar").infos();
 
     jQuery("#" + "theImgContainer").css("marginTop", "0px");
-    info_thePicturePage = jQuery("#thePicturePage").infos();
-    info_theImage = jQuery(Parent).infos();
+    infos_thePicturePage = jQuery("#thePicturePage").infos();
+    infos_theImage = jQuery(Parent).infos();
     if (theme.match(RegExp("stripped", "gi"))) {
-        info_theImageAndTitle = jQuery("#theImageAndTitle").infos();
-        info_theImageBox = jQuery("#theImageBox").infos();
-        optiontop = (marges_llgbo / 2) + info_theImageAndTitle.margin.top;
-    }
-
-    if (info_theImage.position == "relative") {
+        infos_theImageAndTitle = jQuery("#theImageAndTitle").infos();
+        infos_theImageBox = jQuery("#theImageBox").infos();
+        optiontop = (marges_llgbo / 2) + infos_theImageAndTitle.margin.top;
+    }
+
+    if (infos_theImage.position == "relative") {
         //--- passage relative ==> static ===/
         jQuery(Parent).css("position", "static");
-        info_theImage = jQuery(Parent).infos();
+        infos_theImage = jQuery(Parent).infos();
 
     } else {
 
     }
-    if (info_theImage.position == "absolute") {
+    if (infos_theImage.position == "absolute") {
         //--- passage absolute ==> static ===/
         jQuery(Parent).css("position", "static");
-        info_theImage = jQuery(Parent).infos();
-
-    }
-
-    marge_top = Math.ceil(Info_the_page.top +
-                                     Info_the_page.borderwidth.top +
-                                     info_theImage.borderwidth.top +
-                                     info_thePicturePage.margin.top
+        infos_theImage = jQuery(Parent).infos();
+
+    }
+
+    marge_top = Math.ceil(infos_the_page.top +
+                                     infos_the_page.borderwidth.top +
+                                     infos_theImage.borderwidth.top +
+                                     infos_thePicturePage.margin.top
                                      );
 
-    img_top = Math.ceil(info_theImage.top +
-                        info_theImage.padding.top +
-                        info_theImage.borderwidth.top +
-                        info_thePicturePage.margin.top + optiontop);
-    result = info_imageToolBar;
+    img_top = Math.ceil(infos_theImage.top +
+                        infos_theImage.padding.top +
+                        infos_theImage.borderwidth.top +
+                        infos_thePicturePage.margin.top + optiontop);
+    result = infos_imageToolBar;
    // result.width = "20%";
    // result.left = "40%";
@@ -1593 +1730 @@
     result.img_top = img_top;
     //=== Afficher le titre de l'image sur le cadre ===
-    llgboh2 = jQuery("#gboh2").infos();
-    llgbo = jQuery("#gbo").infos();
-
-    if (llgboh2.top > 0)
-      result.img_top = llgboh2.top - (llgboh2.height * 2);
-    else if (marges_llgbo > 0)
+
+
+    if (infos_llgboh2.top > 0) {
+      result.img_top = infos_llgboh2.top;
+
+    }
+    else if (marges_llgbo > 0) {
       result.img_top -= (8);
-
+    }
   
     return result;
@@ -1610 +1748 @@
 */
 type_src = "div";
+old_window = { width: 0, height: 0 };
+List_autosize = new Array();
+nu_img = 0;
+tempo = 0;
 //====================================================
-function Info_Description_f(Parent) {
-    jQuery(Parent).css({ display: "block" });
+function infos_Description_f(Parent) {
+   // jQuery(Parent).css({ display: "block" });
     //====== détection du type d'images ======
     if (jQuery("#charlie").length > 0) {
@@ -1684 +1826 @@
     // jQuery(Parent + " p:not(:contains(' ')) ").remove();
     // jQuery(Parent + " p:(:contains('')) ").remove();
-    llgboframe = jQuery("#gbo").infos();
+      
+      jQuery("#llgbo").trigger("ON");
+      llgboframe = infos_llgbo;
+
     marges_llgbo = 0;
 
     if (llgboframe.height > 0) {
-        ll2 = jQuery("#gbo div:last").infos();
-        ll1 = jQuery("#gbo div:first").infos();
-        ll2 ="" ;
-        jQuery("#gbo div").each(function (i) {
-
-         if (  this.id=="") return ;
-ll2=this ;
-        });
-       ll2 = jQuery(ll2).infos();
-        ll1 = ll1.width;
-        ll2 = ll2.width - ll2.borderwidth.left - ll2.borderwidth.right;
-        marges_llgbo = (ll1 - ll2);
-
-    }
-
-      Bandeau_t = Info_entete(Parent);
+      marges_llgbo = llgboframe.borderwidth.left * 2;
+
+    }
+
+      Bandeau_t = infos_entete(Parent);
 
     Bandeau = Bandeau_t.img_top;
-    info_theImgContainer = jQuery("#" + "theImgContainer").infos();
-    info_description = jQuery("#" + "description").infos();
+    infos_theImgContainer = jQuery("#" + "theImgContainer").infos();
+    infos_description = jQuery("#" + "description").infos();
     //=============================================================================
     //   jQuery(Parent + " p").css({ padding: "0px", margin: "0px "    });
@@ -1724 +1858 @@
         jQuery("#imageContainer").css({ height: "auto" });
         The_MainImage = jQuery(Parent + " #theImg img");
-        info_img = jQuery(The_MainImage).infos();
+        infos_img = jQuery(The_MainImage).infos();
 
 
     } else if (Type_Img == "map") {
 
-        info_map = jQuery("#mapPicture").infos();
-        marge_left = info_map.width;
+        infos_map = jQuery("#mapPicture").infos();
+        marge_left = infos_map.width;
 
         jQuery("#map").css({ left: marge_left + "px", padding: "0px",
@@ -1741 +1875 @@
 
         The_MainImage = jQuery("#map");
-        info_img = jQuery(The_MainImage).infos();
+        infos_img = jQuery(The_MainImage).infos();
 
 
       } else if (jQuery("#charlie").length > 0) {
-        info_charlie = jQuery("#charlie").infos();
+        infos_charlie = jQuery("#charlie").infos();
         obj_charlie = jQuery("object");
         try {
@@ -1775 +1909 @@
         if (MainImage.length == 0) {
           The_MainImage = jQuery("#charlie");
-          info_img = jQuery(The_MainImage).infos();
+          infos_img = jQuery(The_MainImage).infos();
         } else {
           The_MainImage = jQuery("#theMainImage");
-          info_img = jQuery(The_MainImage).infos();
+          infos_img = jQuery(The_MainImage).infos();
           
         }
@@ -1786 +1920 @@
     if (jQuery("#theMainImage").lenght == 0) {
       The_MainImage = jQuery(Parent + " embed");
-      info_img = jQuery(The_MainImage).infos();
-      jQuery(Parent + " embed").width({ width: info_img.width + "px", height: info_img.height + "px" });
+      infos_img = jQuery(The_MainImage).infos();
+      jQuery(Parent + " embed").width({ width: infos_img.width + "px", height: infos_img.height + "px" });
     } else {
       The_MainImage = jQuery("#theMainImage");
-      info_img = jQuery(The_MainImage).infos();
+      infos_img = jQuery(The_MainImage).infos();
       Type_Img == "charlie"
-      if (info_img.width == 0) {
+      if (infos_img.width == 0) {
         The_MainImage = jQuery("#theMainImage");
-        info_img = jQuery(The_MainImage).infos();
+        infos_img = jQuery(The_MainImage).infos();
 
       }
@@ -1802 +1936 @@
         if (!nopano) {
             Wait_pamoorama();
-            return info_description;
+            return infos_description;
         }
         The_MainImage = jQuery("#pamoorama");
-        info_img = jQuery(The_MainImage).infos();
-        info_footer = jQuery("#pamoorama_footer").infos();
-        info_img.height = parseInt(img_reelle.height) + parseInt(info_footer.height);
+        infos_img = jQuery(The_MainImage).infos();
+        infos_footer = jQuery("#pamoorama_footer").infos();
+        infos_img.height = parseInt(img_reelle.height) + parseInt(infos_footer.height);
 
       } else {
@@ -1825 +1959 @@
           }
 
-        info_img = jQuery(The_MainImage).infos();
+        infos_img = jQuery(The_MainImage).infos();
     }
     //=====================================================================================
 
-    switch (info_img.position) {
+    switch (infos_img.position) {
         case "relative":
             break;
@@ -1842 +1976 @@
     }
 
-    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_img.margin.top
-    }
-
-    if (llgboframe.height > 0) info_img = llgboframe; // format de l'image+largeur du cadre
+    infos_description.marge = {
+        bottom: infos_img.padding.bottom + infos_img.margin.bottom + infos_img.borderwidth.bottom,
+        top: infos_img.padding.top + infos_img.borderwidth.top + infos_img.margin.top
+    }
+
+    if (llgboframe.height > 0) infos_img = llgboframe; // format de l'image+largeur du cadre
 
     if (theme.match(RegExp("luciano", "g"))) {
 
-        info_theImgContainer = jQuery("#imageContainer").infos();
-        info_description.bottom = jQuery("#imageInfo").infos().top;
-        info_description.top = info_theImgContainer.bottom;
-        Info_slidshowToolBar = jQuery("#slidshowToolBar").infos();
-
-        if (Info_slidshowToolBar.height > 0) {
-            correction = (Info_slidshowToolBar.height);
-            info_description.top = info_img.bottom;
-            info_description.bottom = jQuery("#copyright").infos().top;
+        infos_theImgContainer = jQuery("#imageContainer").infos();
+        infos_description.bottom = jQuery("#imageInfo").infos().top;
+        infos_description.top = infos_theImgContainer.bottom;
+        infos_slidshowToolBar = jQuery("#slidshowToolBar").infos();
+
+        if (infos_slidshowToolBar.height > 0) {
+            correction = (infos_slidshowToolBar.height);
+            infos_description.top = infos_img.bottom;
+            infos_description.bottom = jQuery("#copyright").infos().top;
         }
 
@@ -1867 +2001 @@
           //options.imageMargin
           jQuery("#content").css({paddingTop:"5px"});
-    info_content = jQuery("#content").infos();
+    infos_content = jQuery("#content").infos();
         if (options.imageAutosizeTitle == false) {
-            info_description.top =   info_theImageBox.bottom ;
-
-            info_description.bottom =info_HeaderBar.margin.top+ info_description.top +
-                                    info_description.borderwidth.top +
-                                    info_description.borderwidth.bottom +
+            infos_description.top =   infos_theImageBox.bottom ;
+
+            infos_description.bottom =infos_HeaderBar.margin.top+ infos_description.top +
+                                    infos_description.borderwidth.top +
+                                    infos_description.borderwidth.bottom +
                                       options.imageAutosizeMargin*2 +
                                     (marges_llgbo / 2)+4;
@@ -1880 +2014 @@
 
 
-            info_description.top = info_theImageBox.bottom -
-                        info_content.top +
+            infos_description.top = infos_theImageBox.bottom -
+                        infos_content.top +
                         options.imageAutosizeMargin * 2  +
                         (marges_llgbo / 2)
                                 ;
-            info_description.bottom = jQuery("#tabZone").infos().top +
-                        info_theImageAndTitle.margin.top;
-           if (msie == true) info_description.bottom -= 4;
+            infos_description.bottom = jQuery("#tabZone").infos().top +
+                        infos_theImageAndTitle.margin.top;
+           if (msie == true) infos_description.bottom -= 4;
         };
         check_desc_v = true;
@@ -1893 +2027 @@
       } else {
         if (theme.match(RegExp("sobre", "gi"))) {
-          info_description.marge.top = -2;
+          infos_description.marge.top = -2;
         }
-        info_description.bottom = info_theImage.bottom; //482
-        info_description.top = info_img.height + info_theImage.top ; //410+62
-        // info_description.bottom -= info_img.top;
+        infos_description.bottom = infos_theImage.bottom; //482
+        infos_description.top = infos_img.height + infos_theImage.top ; //410+62
+        // infos_description.bottom -= infos_img.top;
     }
     //
 
-    info_description.height =   info_description.bottom - info_description.top;
+    infos_description.height =   infos_description.bottom - infos_description.top;
 
     if (check_desc_v == false) {
-        info_description.height = 0;
+        infos_description.height = 0;
     }
 
@@ -1910 +2044 @@
 
     //cl_visible=false ;
-    return info_description;
+    return infos_description;
 }
 
@@ -1962 +2096 @@
         affiche_debug({
             Debug1: Debug_info(1, Bandeau_t, "Bandeau_t"),
-            Debug4: Debug_info(4, info_description, "info_description"),
-            Debug5: Debug_info(5, info_img, "info_img")
+            Debug4: Debug_info(4, infos_description, "infos_description"),
+            Debug5: Debug_info(5, infos_img, "infos_img")
         });
     }
@@ -1985 +2119 @@
 
 jQuery(function () {
-  //'gallyInterfaceReady' 
-
   jQuery('#pamoorama').live('ON', function (e) {
     jQuery(jQuery('.debug').get(1)).trigger('ON');
     if (typeof Bandeau_bas == "undefined" || Bandeau_bas.width == 0) {
-      Bandeau_bas = Info_Description_f(Parent);
+      Bandeau_bas = infos_Description_f(Parent);
       Bandeau = Bandeau_bas.top;
       old_window = { width: 0, height: 0 };
@@ -1998 +2130 @@
 
   });
-
-
+  //=============================================================
+
+
+  jQuery("#infoSwitcher").click(function () {
+    jQuery("#llgbo").trigger("ON");
+    jQuery("#theImage").css({ textAlign: "center" });
+    nds = jQuery("#imageInfos").css("display");
+
+    Zone_image = Calcul_Image(nds != "none");
+    jQuery("#theMainImage").width(Zone_image.image.width);
+    jQuery("#theMainImage").height(Zone_image.image.height);
+
+    jQuery("#theImage").width(Zone_image.container.width);
+    jQuery("#theImage").height(Zone_image.container.height);
+    Set_Map(nds);
+
+  });
 
   jQuery('#ret_autosize').live('ON', function (e) {
-    if (nu_img == "") nu_img = 8 ;
+    if (nu_img == "") nu_img = 8;
     jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
 
   });
 
-  jQuery(Parent).live('ON', function (e) {
+
+  jQuery("#reset").click(function () {
+    location.reload();
+  });
+
+  //=====================================================================
+  // jQuery("#llgbo").trigger("ON");
+  jQuery("#llgbo").live('ON', function (e) {
+    infos_llgbo = jQuery("#llgbo").infos();
+    //llgboframe 
+    marges_llgbo = 0;
+
+    if (infos_llgbo.height > 0) {
+      ll2 = jQuery("#llgbo div:last").infos();
+      ll1 = jQuery("#llgbo div:first").infos();
+      ll2 = "";
+      jQuery("#llgbo div").each(function (i) {
+        if (this.id == "") return;
+        var llgbo_frame = document.getElementById(this.id);
+        this.removeAttribute("width");
+        this.removeAttribute("height");
+        ll2 = this;
+      });
+
+      ll2 = jQuery(ll2).infos();
+      ll1 = ll1.width;
+      ll2 = ll2.width - ll2.borderwidth.left - ll2.borderwidth.right;
+      marges_llgbo = (ll1 - ll2);
+      infos_llgbo.borderwidth.left = parseInt(marges_llgbo / 2);
+      infos_llgbo.borderwidth.right = parseInt(marges_llgbo / 2);
+      infos_llgbo.borderwidth.top = parseInt(marges_llgbo / 2);
+      infos_llgbo.borderwidth.bottom = parseInt(marges_llgbo / 2);
+
+      infos_llgboh2 = jQuery("#llgboh2").infos();
+
+
+    }
+
+
+  });
+  //=====================================================================
+  // jQuery("#theImageAndInfos").trigger("ON");
+  jQuery("#theImageAndInfos").live('ON', function (e) {
+    infos_theImageAndInfos = jQuery("#theImageAndInfos").infos();
+
+
+  });
+  //=====================================================================
+  // jQuery("#map").trigger("ON");
+  jQuery("#mapPicture").live('ON', function (e) {
+    p2 = jQuery("#infoSwitcher").infos();
+  });
+  function Set_Map(nds) {
+    p0 = jQuery("#map").position();
+    if (!p0) return;
+
+    infos_map = jQuery("#map").infos();
+    // if (infos_map.width == (Zone_image.container.width - p0.left))   return ;
+    nds = jQuery("#imageInfos").css("display");
+    if (nds !="none") {
+      p2 = jQuery("#infoSwitcher").infos();
+      p0.left += 35;
+    }
+    jQuery("#map").width(Zone_image.container.width - p0.left);
+    jQuery("#map").css({ height: '100%' });
+  }
+
+  jQuery("#map").live('ON', function (e) {
+
+  });
+  //=====================================================================
+  // jQuery("#theImage").trigger("ON");
+  jQuery("#theImage").live('ON', function (e) {
+
+    infos_theImage = jQuery("#theImage").infos();
+
+    idi = jQuery("#theImage img").attr("src"); ;
+    id2 = jQuery("#theImage img").attr("usemap");
+    if (id2) {
+      id3 = jQuery("#derivativeCheckedAutosize");
+      id4 = id2.replace('#map', ''); // en cours
+      id0 = idi.split('-');
+      id5 = id0[id0.length - 1].split(".")[1];
+      id6 = id0[id0.length - 1];
+
+      id4 = idi.replace("-" + id0[id0.length - 1], "-xx") + "." + id5;
+      idi = id4;
+      id4 = 'xxlarge';
+      path = document.URL;
+      if (id3.length == 0) {
+
+        //derivativeCheckedxxlarge
+        jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
+        // jQuery('#derivativeChecked' + typeSave).css('visibility', 'visible');
+
+        new_html = '<br /><span class="switchCheck" id="derivativeCheckedAutosize" style="visibility:visible" >&#x2714; </span>';
+        new_html += '<a href="javascript:changeImgSrc1(\'' + idi + '\', \'' + id4 + '\', \'Autosize\') ">';
+        new_html += 'Autosize<span class="derivativeSizeDetails"> - Autosize</span>  </a>';
+
+
+        htm = jQuery("#derivativeSwitchBox")[0].innerHTML;
+        jQuery("#derivativeSwitchBox br:last").before(new_html);
+        // cl_visible = false;
+        htm1 = jQuery("#derivativeSwitchBox")[0].innerHTML;
+
+        var theImg = document.getElementById("theMainImage");
+        if (theImg) {
+
+          theImg.removeAttribute("width");
+          theImg.removeAttribute("height");
+          theImg.src = idi;
+          //  theImg.useMap =  ;
+          theImg.useMap = "Autosize";
+        }
+      }
+    }
+    if (nu_img == "") nu_img = 7;
+
+
+    jQuery().newResize(false);
+    p2 = jQuery("#infoSwitcher").css("display");
+    Set_Map(p2);
+    jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
+
+  });
+  //=================================================================
+  jQuery(document).live('gallyInterfaceReady', function (e) {
+    i = jQuery(this).text();
+    jQuery(this).trigger('ON');
+  }
+
+  );
+  jQuery(Parent).live('OK', function (e) {
     if (nu_img == "") nu_img = 7;
     jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
-    jQuery().newResize();
+    jQuery().newResize(false);
+    jQuery().newResize(false);
+
+    jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
   });
   // Custom Event, ON to turn on a debug.
   jQuery('.debug').live('ON', function (e) {
-  
+
     nu_img = jQuery(this).text();
     jQuery('.debug').trigger('OFF');
     jQuery(this).addClass('debugOn');
-   
+
   });
 
@@ -2055 +2337 @@
     }
 
+
+
+    //piwigo 2.4
+    // Add another debug to the DOM 
+    jQuery('#derivativeCheckedAutosize').click(function () {
+
+
+    });
+
+    jQuery("#derivativeSwitchBox a").click(function () {
+      var theImg = document.getElementById("theMainImage");
+      if (theImg) {
+        try {
+          n = eval(this.pathname);
+        } catch (e) {
+          n = false;
+        }
+        infos_theMainImage = jQuery("#theMainImage").infos();
+        infos_theImage = jQuery("#theImage").infos();
+        theImg.removeAttribute("width");
+        theImg.removeAttribute("height");
+        rapport = parseInt(img_init.width) / parseInt(img_init.height);
+        if (n == true) {
+          old_window.width = 0; // force autosize
+          jQuery(window).resize();
+        } else {
+          nw = "100% x 100%".split("x");
+          if (jQuery(this).text().match(RegExp("x", "gi"))) {
+            nw = jQuery(this).text().split("(")[1].split(")")[0];
+            nw = nw.split("x");
+            jQuery("#theImage").css({ marginRight: "auto", marginLeft: "auto", textAlign: "center" });
+
+            wx = parseInt(nw[0]);
+            jQuery(theImg).width(wx);
+            jQuery(theImg).height(wx / rapport);
+            /*  n = jQuery("#imageInfos").css("display");
+            Zone_image = Calcul_Image(n == "none");
+            jQuery("#theImage").width(wx+(Zone_image.marge.width * 1.5));
+            jQuery("#theImage").height((wx / rapport) + Zone_image.marge.height);
+            */
+
+
+
+
+
+          }
+        }
+
+
+
+      }
+
+    });
+
+    function changeImgSrc1(url, typeSave, typeMap) {
+      var theImg = document.getElementById("theMainImage");
+      if (theImg) {
+        theImg.removeAttribute("width");
+        theImg.removeAttribute("height");
+        theImg.src = url;
+        //  theImg.useMap = "#map" + typeMap;
+        if (typeMap == "Autosize") {
+          theImg.useMap = "#" + typeMap;
+        } else {
+          theImg.useMap = "#map" + typeSave;
+        }
+        jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
+        jQuery('#derivativeChecked' + typeMap).css('visibility', 'visible');
+        document.cookie = 'picture_deriv=' + typeSave + ';path="' + cookie_path + '" ';
+      }
+    }
+
+
   }); //on load
 });
+
+function changeImgSrc1(url, typeSave, typeMap) {
+  old_window.width = 0; // force autosize
+  jQuery('#derivativeSwitchBox .switchCheck').css('visibility', 'hidden');
+  jQuery('#derivativeChecked' + typeMap).css('visibility', 'visible');
+  jQuery(window).resize();
+};

extensions/Autosize/template/picture_2_2.tpl

@@ -1 @@
-{combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery,autosize.cookie,conflit_script' }
+{combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery,autosize.cookie,conflit_script'  }