bug:2840

disable the "resize after upload" options if gd 
1 lang key added

git-svn-id: http://piwigo.org/svn/trunk@23643 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 16 insertions, 2 deletions

diff --git a/admin/configuration.php b/admin/configuration.php
index f0267ea44..63bc29f3c 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -440,6 +440,8 @@ switch ($page['section'])
     // when submitting the form and an error remains
     if (!isset($page['sizes_loaded_in_tpl']))
     {
+      $is_gd = (pwg_image::get_library()=='gd')? true : false;
+      $template->assign('is_gd', $is_gd);
       $template->assign(
         'sizes',
         array(
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 6e51d53cf..ba1835d23 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -345,7 +345,17 @@ jQuery(document).ready(function(){
 
 <fieldset id="sizesConf">
   <legend>{'Original Size'|@translate}</legend>
-
+{if $is_gd}
+  <div>
+    <label>
+      {'Resize after upload disabled due to the use of GD as graphic library'|@translate}
+      <input type="checkbox" name="original_resize" id="original_resize" disabled="disabled" style="visibility: hidden">
+      <input type="hidden" name="original_resize_maxwidth" value="{$sizes.original_resize_maxwidth}">
+      <input type="hidden" name="original_resize_maxheight" value="{$sizes.original_resize_maxheight}">
+      <input type="hidden" name="original_resize_quality" value="{$sizes.original_resize_quality}">
+    </label>
+  </div>
+{else}
   <div>
     <label for="original_resize">
       <input type="checkbox" name="original_resize" id="original_resize" {if ($sizes.original_resize)}checked="checked"{/if}>
@@ -376,7 +386,7 @@ jQuery(document).ready(function(){
       </td>
     </tr>
   </table>
-
+{/if}
 </fieldset>
 
 <fieldset id="multiSizesConf">
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index bd047fa97..34e0b1fa6 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -692,6 +692,7 @@ $lang['Representative'] = 'Album thumbnail';
 $lang['Represents'] = 'Is thumbnail for';
 $lang['Reset ignored updates'] = 'Reset ignored updates';
 $lang['Resize after upload'] = 'Resize after upload';
+$lang['Resize after upload disabled due to the use of GD as graphic library'] = 'Resize after upload disabled due to the use of GD as graphic library';
 $lang['Resize'] = 'Resize';
 $lang['Restore default configuration. You will lose your plugin settings!'] = "Restore default configuration. You will lose your plugin settings!";
 $lang['Restore'] = "Restore";
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index f07e609c4..6ed4b2ede 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -805,6 +805,7 @@ $lang['Synchronize metadata'] = "Synchroniser les méta-données";
 $lang['Add to caddie'] = 'Ajouter au panier';
 $lang['Zoom'] = 'Zoom';
 $lang['Resize after upload'] = 'Redimensionner après transfert';
+$lang['Resize after upload disabled due to the use of GD as graphic library'] = 'Redimensionnement après transfert désactivé car GD est la librairie graphique utilisée actuellement';
 $lang['Original Size'] = 'Taille originale';
 $lang['Send connection settings by email'] = 'Envoyer les identifiants par email';
 $lang['Activate comments'] = 'Activer les commentaires';