Changeset 6953

Timestamp:

09/17/10 10:23:58 (3 years ago)

Author:

cljosse

Message:

[Autosize]IImprovement pamooramic compatibility

Location:

extensions/Autosize

Files:

• js/Affiche_script.js (modified) (3 diffs)
• main.inc.php (modified) (3 diffs)
• template/autosize.tpl (added)

extensions/Autosize/js/Affiche_script.js

@@ -13 +13 @@
             Type_Img = "embed";
         } else if (jQuery("#pamoorama").length) {
-          
+
             Type_Img = "pamoorama";
         } else if (jQuery("#theImage").find("img").length > 0) {
@@ -42 +42 @@
                 var Image = jQuery(Images).get(0);
 
-                if (!Image) return;
-                var TheImg = jQuery(Image);
+                var TheImg = jQuery("#pamoorama").get(0);
+                if (!TheImg) return;
                 break
         }
@@ -121 +121 @@
         jQuery("#theImage").width("100%");
         jQuery("#theImage").height("auto");
-            jQuery(TheImg).height(Image_height + "px");
-            jQuery(TheImg).width(Imgage_Width + "px");
 
-        if (Type_Img = "pamoorama") {
 
-            return;
-            jQuery("#pamoorama_inner").css("zoom", "1");
-            jQuery("#pamoorama_inner").css("height", Image_height + "px");
-            jQuery("#pamoorama_inner").css("width", Imgage_Width + "px");
 
-            jQuery("#pamoorama_outter").css("zoom", "1");
+        if (Type_Img == "pamoorama") {
+            h1 = jQuery("#pamoorama").height();
+            jQuery("#pamoorama").css("overflow", "hidden");
+            jQuery("#pamoorama").css(jQuery(window).width() + "px");
+  
             jQuery("#pamoorama_outter").css("height", Image_height + "px");
-            jQuery("#pamoorama_outter").css("width", Imgage_Width + "px");
+            jQuery("#pamoorama_outter").css("width", jQuery(window).width() + "px");
+/*
+            jQuery(TheImg).css(Image_height + "px");
+            jQuery(TheImg).css(jQuery(window).width() + "px");
+            */
+            zoom = Image_height / img_height;
+
+            jQuery("#pamoorama_inner").css("zoom", zoom);
+
 
 
         } else {
-     
+        jQuery(TheImg).height(Image_height + "px");
+        jQuery(TheImg).width(Imgage_Width + "px");
 
         }

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: AutoSize
-Version: 1.0.4
+Version: 1.0.5
 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448
@@ -16 +16 @@
 );
 
-
-//add_event_handler('render_element_content', 'cl_autosize_affiche',EVENT_HANDLER_PRIORITY_NEUTRAL+1);
-//add_event_handler('loc_end_picture', 'cl_autosize_affiche',EVENT_HANDLER_PRIORITY_NEUTRAL);
-//add_event_handler('loc_begin_picture', 'cl_autosize_affiche',EVENT_HANDLER_PRIORITY_NEUTRAL);
-add_event_handler('loc_end_picture', 'cl_autosize_affiche',EVENT_HANDLER_PRIORITY_NEUTRAL);
-
+add_event_handler('loc_end_picture', 'cl_autosize_affiche',EVENT_HANDLER_PRIORITY_NEUTRAL+10);
 function cl_autosize_affiche()
 {
-    global $user, $picture, $template;
-    global $content, $element_info;
-    $my_path = dirname(__FILE__).'/';
-  
-   
+    global $user, $picture, $template,$page;
+    global $content, $element_info;   
     global $infos_message,$erreur_message;
     global  $conf,$lang ;
+    if ( $page['body_id']=='thePicturePage'  ) {
+   if ( isset($picture['current'])){
+    $my_path = dirname(__FILE__).'/';
     $autosize_parametres = cl_autosize_Get_Options();
- include (AUTOSIZE_PATH."include/affiche.php");                 
+    include (AUTOSIZE_PATH."include/affiche.php");              
  
-  $template->set_filenames(
-    array('default_content'=> $my_path.'template/picture.tpl')
+    $template->set_filenames(
+        array('autosize_content'=> $my_path.'template/autosize.tpl')
     );
-       return $template->parse( 'default_content', true);
+
+       return $template->parse( 'autosize_content', false);
+       }
+       }
 }
 
@@ -50 +48 @@
     return $menu;
 }
-
-
-
+//===================================================================
 function cl_autosize_aff_infos_plus()
 {