Changeset 23074 for extensions

Timestamp:

Jun 6, 2013, 2:29:14 PM (11 years ago)

Author:

plg

Message:

add 2 configuration settings to let the webmaster decide of errors margins.

• $confautomatic_size_width_margin is 12 by default
• $confautomatic_size_height_margin is 40 by default

(margins can be negative)

bug fixed: do not hide the check sign in front of "Automatic" option in size
list when the user selects another size.

Location:

extensions/automatic_size

Files:

• main.inc.php (modified) (3 diffs)
• picture_js.tpl (modified) (1 diff)

extensions/automatic_size/main.inc.php

@@ -66 +66 @@
       if ($size)
       {
-        // echo $type.' => '.$size[0].' x '.$size[1].'<br>';
         if ($size[0] <= $available_size[0] and $size[1] <= $available_size[1])
         {
@@ -128 +127 @@
       'ALT_IMG' => $element_info['file'],
       'COOKIE_PATH' => cookie_path(),
+      'asize_width_margin' => isset($conf['automatic_size_width_margin']) ? $conf['automatic_size_width_margin'] : 12,
+      'asize_height_margin' => isset($conf['automatic_size_height_margin']) ? $conf['automatic_size_height_margin'] : 40,
       )
     );
@@ -141 +142 @@
   $pattern = '#\{foreach from=\$current\.unique_derivatives#';
   $replacement = '
-<span class="switchCheck" id="aSizeChecked"{if !$is_automatic_size} style="visibility:hidden"{/if}>&#x2714; </span> <a id="aSize" href="{$ASIZE_URL}" title="{$ASIZE_TITLE}" data-checked="{if $is_automatic_size}yes{else}no{/if}">{\'Automatic\'|@translate}</a>
+<span id="aSizeChecked"{if !$is_automatic_size} style="visibility:hidden"{/if}>&#x2714; </span> <a id="aSize" href="{$ASIZE_URL}" title="{$ASIZE_TITLE}" data-checked="{if $is_automatic_size}yes{else}no{/if}">{\'Automatic\'|@translate}</a>
 <br><br>
 {foreach from=$current.unique_derivatives';

extensions/automatic_size/picture_js.tpl

@@ -3 +3 @@
   if (jQuery("#theImage").size() > 0) {
     function save_available_size() {
-      var width = jQuery("#theImage").width();
+      var width = jQuery("#theImage").width()
+      width -= {/literal}{$asize_width_margin}{literal};
 
       var docHeight = "innerHeight" in window ? window.innerHeight : document.documentElement.offsetHeight;
       var offset = jQuery("#theImage").offset();
-      var bottomMargin = 40;
-      var height = docHeight - Math.ceil(offset.top) - bottomMargin;
+      var height = docHeight - Math.ceil(offset.top);
+      height -= {/literal}{$asize_height_margin}{literal};
 
       document.cookie= 'available_size='+width+'x'+height+';path={/literal}{$COOKIE_PATH}{literal}';