Changeset 17407

Timestamp:

Aug 5, 2012, 4:51:13 PM (12 years ago)

Author:

Zaphod

Message:

version 2.2.7

Location:

extensions/stripped

Files:

• admin/admin.tpl (modified) (4 diffs)
• js/scripts-tpp.js (modified) (4 diffs)
• readme.txt (modified) (1 diff)
• theme.css (modified) (2 diffs)

extensions/stripped/admin/admin.tpl

@@ -117 +117 @@
                                                 <option value="2small" {if ($options.albumSize=="2small")}selected{/if}>{'2small'|@translate}</option>
                                                 <option value="xsmall" {if ($options.albumSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option>
+                                                <option value="small" {if ($options.albumSize=="small")}selected{/if}>{'small'|@translate}</option>
                                                 <option value="medium" {if ($options.albumSize=="medium")}selected{/if}>{'medium'|@translate}</option>
                                                 <option value="large" {if ($options.albumSize=="large")}selected{/if}>{'large'|@translate}</option>
@@ -130 +131 @@
                                                 <option value="2small" {if ($options.thumbSize=="2small")}selected{/if}>{'2small'|@translate}</option>
                                                 <option value="xsmall" {if ($options.thumbSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option>
+                                                <option value="small" {if ($options.thumbSize=="small")}selected{/if}>{'small'|@translate}</option>
                                                 <option value="medium" {if ($options.thumbSize=="medium")}selected{/if}>{'medium'|@translate}</option>
                                                 <option value="large" {if ($options.thumbSize=="large")}selected{/if}>{'large'|@translate}</option>
@@ -143 +145 @@
                                                 <option value="2small" {if ($options.imageSize=="2small")}selected{/if}>{'2small'|@translate}</option>
                                                 <option value="xsmall" {if ($options.imageSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option>
+                                                <option value="small" {if ($options.imageSize=="small")}selected{/if}>{'small'|@translate}</option>
                                                 <option value="medium" {if ($options.imageSize=="medium")}selected{/if}>{'medium'|@translate}</option>
                                                 <option value="large" {if ($options.imageSize=="large")}selected{/if}>{'large'|@translate}</option>
@@ -156 +159 @@
                                                 <option value="2small" {if ($options.hdSize=="2small")}selected{/if}>{'2small'|@translate}</option>
                                                 <option value="xsmall" {if ($options.hdSize=="xsmall")}selected{/if}>{'xsmall'|@translate}</option>
+                                                <option value="small" {if ($options.hdSize=="small")}selected{/if}>{'small'|@translate}</option>
                                                 <option value="medium" {if ($options.hdSize=="medium")}selected{/if}>{'medium'|@translate}</option>
                                                 <option value="large" {if ($options.hdSize=="large")}selected{/if}>{'large'|@translate}</option>

extensions/stripped/js/scripts-tpp.js

@@ -174 +174 @@
                         var marge_cote;
 
-                        if (ImageCadre.length == 0) {
-                                ImageContainer.css("opacity","1");
-                                jQuery("img","#theImageAndTitle").css("opacity","1");
-                                return;
-                        }
-                        
-                        if (options.navArrows) {marge_cote=30;} else {marge_cote=10;};
-
                         var marge_sup = 5 + Content.offset().top;
                         var marge_inf;
                         if (options.themeStyle == 'original') { marge_inf = options.imageAutosizeMargin+10;} else { marge_inf = 30;};
                         var marge_spec = 0;
+
+                        if (ImageCadre.length == 0) {
+                                ImageContainer.css("opacity","1");
+                                jQuery("img","#theImageAndTitle").css("opacity","1");
+                                ImageContainer.css("top",marge_sup+"px");
+                                //maps & earth
+                                if (jQuery("#map").length == 1) {
+                                        ImageContainer.css("position","static");
+                                        ImageContainer.css("margin-top","10px");
+                                }
+                                return;
+                        }
                         
                         var slideshow=jQuery("#light_slideshow");
@@ -361 +365 @@
 {
   p = new Object();
+  imgH = jQuery(document).data("highHeight") 
+  imgW = jQuery(document).data("highWidth") 
 
   if(zoom=='full')
@@ -369 +375 @@
     p.top=options.marginContainer;
 
-    if(p.width>jQuery(document).data("highWidth"))
-    {
-      p.width = jQuery(document).data("highWidth")-options.paddingContainer*2;
+    if(p.width>imgW)
+    {
+      p.width = imgW;
       p.left = (jQuery("html").get(0).clientWidth-p.width)/2;
-    }
-
-    if(p.height>jQuery(document).data("highHeight"))
-    {
-      p.height = jQuery(document).data("highHeight")-options.paddingContainer*2;
+      jQuery("#theImgHighZoomButton").hide();
+    }
+
+    if(p.height>imgH)
+    {
+      p.height = imgH;
       p.top = (jQuery("html").get(0).clientHeight-p.height)/2;
-    }
+      jQuery("#theImgHighZoomButton").hide();
+    }
+        
+        if ((p.width==imgW) && (p.height==imgH)) switchZoomHigh();
   }
   else
   {
     //zoom = 'fit'
-    ratioImg = jQuery(document).data("highWidth") / jQuery(document).data("highHeight");
+        ratioImg = imgW / imgH;
     ratioPage = jQuery("html").get(0).clientWidth / jQuery("html").get(0).clientHeight;
 
@@ -398 +408 @@
       p.height = p.width/ratioImg;
     }
+        
+        if ((p.width > imgW) || (p.height > imgH)) {
+                p.height = imgH;
+                p.width = imgW;
+                jQuery("#theImgHighZoomButton").hide();
+        }
     p.left = (jQuery("html").get(0).clientWidth-p.width)/2;
     p.top = (jQuery("html").get(0).clientHeight-p.height)/2;

extensions/stripped/readme.txt

@@ -31 +31 @@
 Changelog
 ---------
+
+*** version 2.2.7
+
+- bugfixes with multisize support
+- improved compatibility with PWG Stuffs + RV Maps & Earth plugins
+- languages updates
 
 *** version 2.2.6

extensions/stripped/theme.css

@@ -1339 +1339 @@
     left:240px;
         margin-bottom:15px;
-        margin-right:260px;
+        margin-right:270px;
 }
 
@@ -1497 +1497 @@
 }
 
+#content .stuffs_block  .wrap2 { height:130px!important;}
+#content .stuffs_block .wrap1 .wrap2full { height:160px!important;}