Changeset 22135

Timestamp:

Apr 11, 2013, 3:18:46 PM (11 years ago)

Author:

flop25

Message:

bug:2863
display a message on the upload page if "Resized after upload" is checked

Location:

trunk

Files:

• admin/include/photos_add_direct_prepare.inc.php (modified) (2 diffs)
• admin/themes/default/template/photos_add_direct.tpl (modified) (2 diffs)
• admin/themes/default/theme.css (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/include/photos_add_direct_prepare.inc.php

@@ -106 +106 @@
 }
 
+//warn the user if the picture will be resized after upload
+if ($conf['original_resize'])
+{
+  $template->assign(
+    array(
+        'original_resize_maxwidth' => $conf['original_resize_maxwidth'],
+        'original_resize_maxheight' => $conf['original_resize_maxheight'],
+      )
+    );
+}
+
+
 $upload_modes = array('html', 'multiple');
 $upload_mode = isset($conf['upload_mode']) ? $conf['upload_mode'] : 'multiple';
@@ -256 +268 @@
       );
   }
-
   $template->assign(
     array(

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -290 +290 @@
     <fieldset>
       <legend>{'Select files'|@translate}</legend>
+ 
+    {if isset($original_resize_maxheight)}<p class="uploadInfo">{'The picture dimensions will be reduced to %dx%d pixels.'|@translate|@sprintf:$original_resize_maxwidth:$original_resize_maxheight}</p>{/if}
 
     <p id="uploadWarningsSummary">{$upload_max_filesize_shorthand}B. {$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="showInfo" title="{'Learn more'|@translate}">i</a></p>
@@ -300 +302 @@
   {/if}
     </p>
+
+
 
 {if $upload_mode eq 'html'}

trunk/admin/themes/default/theme.css

@@ -996 +996 @@
 #addUploadBox {margin-bottom:2em;}
 
+p.uploadInfo {text-align:left;font-size:90%;color:#999;}
 p#uploadWarningsSummary {text-align:left;margin-bottom:1em;font-size:90%;color:#999;}
 p#uploadWarningsSummary .showInfo {position:static;display:inline;padding:1px 6px;margin-left:3px;}

trunk/language/en_UK/admin.lang.php

@@ -797 +797 @@
 $lang['The original maximum width must be a number between %d and %d'] = 'The original maximum width must be a number between %d and %d';
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = "The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or begin with a number followed by \"-\"";
+$lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'The picture dimensions will be reduced to %dx%d pixels.';
 $lang['The Piwigo export plugin allows you to create albums and export photos.'] = 'The Piwigo export plugin allows you to create albums and export photos.';
 $lang['The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.'] = 'The Piwigo publish Plug-in allows you to export and synchronize photos from Lightroom directly to your Piwigo photo gallery.';

trunk/language/fr_FR/admin.lang.php

@@ -951 +951 @@
 $lang['Rename'] = 'Renommer';
 $lang['Purge user cache'] = 'Purger le cache utilisateur';
+$lang['The picture dimensions will be reduced to %dx%d pixels.'] = 'La tailles des images sera réduite à %dx%d pixels.';
+
 ?>