Changeset 12652

Timestamp:

11/22/11 11:49:44 (18 months ago)

Author:

cljosse

Message:

[extensions] Autosize fix bug with cmd restore

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (2 diffs)
• js/Affiche_script.js (modified) (8 diffs)

extensions/Autosize/autosize.inc.php

@@ -374 +374 @@
   {
                 global $conf,$autosize_parametres; 
+    $autosize_parametres ="";
+ 
+ if (!isset($conf['cl_autosize']))  {    
+  $conf['cl_autosize']="";
+  $q = '
+   INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
+   VALUES ("cl_autosize","","Parametres du plugin Autosize")
+  ;';
+  pwg_query($q);
+  }
+ 
+ 
+
                 $autosize_parametres =  unserialize($conf['cl_autosize']);
       // $autosize_parametres = autosize_controler::Get_Options($autosize_parametres,'cl_autosize');
@@ -455 +468 @@
 $infos_message .=l10n("cl_autosize_save_config")."<br>";
  $autosize_parametres=cl_autosize_Set_Options();
-
- if ( isset($autosize_parametres) )
-        {
- 
+ if ( isset($autosize_parametres) )     { 
                 $query = '
                 UPDATE '.CONFIG_TABLE.'

extensions/Autosize/js/Affiche_script.js

@@ -4 +4 @@
 function Toggle_bp() {
   cl_visible = !cl_visible;
-  set_cl();
+  
   jQuery().newResize();
   Wait_Affichage();
+  set_cl();
 }
   function set_cl(){
@@ -23 +24 @@
       src_info_1 = src5;
     }
-
+    zoom = jQuery('#zoom ').val() ;
     jQuery('#bp_cla').attr('alt', src_info);
     jQuery('#bp_cla').attr('title', src_info);
 
     jQuery('#bp_cla').attr('Stitle', src_info);
-    jQuery('#bp_cla').attr('Stip', " ");
-    zoom = jQuery('#zoom ').val();
-    jQuery('#bp_cla').text(src_info_1);
+    jQuery('#bp_cla').attr('Stip', zoom + "%");
+
+  //jQuery('#bp_cla span').text(src_info_1 +"    "+ zoom + "%");
     jQuery('#bp_cla span').text(zoom+"%" );
     bp_scr = jQuery('#bp_img_cla');
@@ -91 +92 @@
     if (fade_in == 0) {
         jQuery(Parent).css({ opacity: "1" });
+
+      jQuery("#theImg").css({ opacity: "1" });
+      jQuery("#imageTitleContainer").css({ opacity: "1" });
+      jQuery("#theImageAndTitle").css({ opacity: "1" });
+
+      
+
+
     } else {
     jQuery(Parent).animate({ opacity: "1" },
@@ -96 +105 @@
                                          function (i) {
                                            jQuery(Parent).css({ opacity: "1" });
+                                           jQuery("#theImg").css({ opacity: "1" });
+                                           jQuery("#imageTitleContainer").css({ opacity: "1" });
+                                           jQuery("#theImageAndTitle").css({ opacity: "1" });
+
                                        if (DEBUG_autosize == "true") {
 
@@ -544 +557 @@
          newResize: function () {
            //
-           set_cl();
+           //set_cl();
            if (typeof options != "undefined")
              if (options.imageAutosize) {
@@ -1102 +1115 @@
            //=== cadre = theImage
            jQuery(Cadre).css({ marginLeft: "auto" });
-           // jQuery(Cadre).width(Zone_Affichage.width);
-           jQuery(Cadre).css("width", "auto");
+           jQuery(Cadre).width(Zone_Affichage.width); //centrer simple black
+           // jQuery(Cadre).css("width", "auto");
 
            if (Type_Img == "panorama" || Type_Img == "pamoorama") {
@@ -1274 +1287 @@
              });
              if (theme.match(RegExp("luciano", "g"))) {
+               imgl = 180;
+               l = Zone_Affichage.left;
+
+               jQuery(".imageNumber").css({ left: l + "px"
+
+               });
                jQuery(Parent + " #theImg IMG").css({ height: img_finale.height + "px ",
-                 width: img_finale.width + "px "
+                 width: (img_finale.width - imgl) + "px ", marginTop: "0px"
                })
              }
@@ -1344 +1363 @@
            zoom = parseInt(zoom * 100);
            jQuery('#zoom ').val(zoom);
-           jQuery('#bp_cla span').text(zoom + "%");
+           set_cl();
+
+          
            //  --- r�glage de la hauteur de page en fonction du copyright-----------
            if (typeof (pos_copyright) == "undefined") pos_copyright = jQuery("#copyright").infos();