feature 2548, multiple size:

* adapt the upload script

* remove the resize settings screen

* add a new screen [Administration > Configuration > Options > Photo Sizes]
  with the ability to resize original after upload


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

2 files changed, 47 insertions, 164 deletions

diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 59ab62006..008dfe4e0 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -247,6 +247,52 @@ jQuery(document).ready(function () {
 
 </div> <!-- configContent -->
 
+{if isset($sizes)}
+
+{footer_script}{literal}
+jQuery(document).ready(function(){
+  function toggleResizeFields(prefix) {
+    var checkbox = jQuery("#"+prefix+"_resize");
+    var needToggle = jQuery("input[name^="+prefix+"_]").not(checkbox).parents('tr');
+
+    if (jQuery(checkbox).is(':checked')) {
+      needToggle.show();
+    }
+    else {
+      needToggle.hide();
+    }
+  }
+
+  toggleResizeFields("original");
+  jQuery("#original_resize").click(function () {toggleResizeFields("original")});
+});
+{/literal}{/footer_script}
+
+<fieldset id="sizesConf">
+  <legend>{'Original Size'|@translate}</legend>
+
+  <table>
+    <tr>
+      <th><label for="original_resize">{'Resize after upload'|@translate}</label></th>
+      <td><input type="checkbox" name="original_resize" id="original_resize" {if ($sizes.original_resize)}checked="checked"{/if}></td>
+    </tr>
+    <tr>
+      <th>{'Maximum Width'|@translate}</th>
+      <td><input type="text" name="original_resize_maxwidth" value="{$sizes.original_resize_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}</td>
+    </tr>
+    <tr>
+      <th>{'Maximum Height'|@translate}</th>
+      <td><input type="text" name="original_resize_maxheight" value="{$sizes.original_resize_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}</td>
+    </tr>
+    <tr>
+      <th>{'Image Quality'|@translate}</th>
+      <td><input type="text" name="original_resize_quality" value="{$sizes.original_resize_quality}" size="3" maxlength="3"> %</td>
+    </tr>
+  </table>
+
+</fieldset>
+{/if}
+
 {if isset($default)}
 {$PROFILE_CONTENT}
 {/if}
@@ -445,7 +491,7 @@ jQuery(document).ready(function () {
 
 {if !isset($default)}
   <p>
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
+    <input class="submit" type="submit" name="submit" value="{'Save Settings'|@translate}">
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
   </p>
 </form>
diff --git a/admin/themes/default/template/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
deleted file mode 100644
index 3180ac024..000000000
--- a/admin/themes/default/template/photos_add_settings.tpl
+++ /dev/null
@@ -1,163 +0,0 @@
-{footer_script}
-var width = '{'Width'|@translate}';
-var height = '{'Height'|@translate}';
-var max_width = '{'Maximum Width'|@translate}';
-var max_height = '{'Maximum Height'|@translate}';
-
-{literal}
-jQuery(document).ready(function(){
-  function toggleResizeFields(prefix) {
-    var checkbox = jQuery("#"+prefix+"_resize");
-    var needToggle = jQuery("input[name^="+prefix+"_]").not(checkbox).not(jQuery("#hd_keep")).parents('tr');
-
-    if (jQuery(checkbox).is(':checked')) {
-      needToggle.show();
-
-      if (prefix == "websize") {
-        jQuery("#hd_keep").parents("fieldset").show();
-      }
-    }
-    else {
-      needToggle.hide();
-
-      if (prefix == "websize") {
-        jQuery("#hd_keep").parents("fieldset").hide();
-      }
-    }
-  }
-
-  function toggleCropFields(prefix) {
-    if (jQuery("#"+prefix+"_crop").is(':checked')) {
-      jQuery("#"+prefix+"_width_th").text(width);
-      jQuery("#"+prefix+"_height_th").text(height);
-      jQuery("#"+prefix+"_follow_orientation_tr").show();
-    }
-    else {
-      jQuery("#"+prefix+"_width_th").text(max_width);
-      jQuery("#"+prefix+"_height_th").text(max_height);
-      jQuery("#"+prefix+"_follow_orientation_tr").hide();
-    }
-
-  }
-
-  toggleResizeFields("websize");
-  jQuery("#websize_resize").click(function () {toggleResizeFields("websize")});
-
-  toggleResizeFields("hd");
-  jQuery("#hd_resize").click(function () {toggleResizeFields("hd")});
-
-  toggleCropFields("thumb");
-  jQuery("#thumb_crop").click(function () {toggleCropFields("thumb")});
-
-  function toggleHdFields() {
-    var checkbox = jQuery("#hd_keep");
-    var needToggle = jQuery("input[name^=hd_]").not(checkbox).parents('tr');
-
-    if (jQuery(checkbox).is(':checked')) {
-      needToggle.show();
-      toggleResizeFields("hd");
-    }
-    else {
-      needToggle.hide();
-    }
-  }
-
-  toggleHdFields();
-  jQuery("#hd_keep").click(function () {toggleHdFields()});
-});
-{/literal}{/footer_script}
-
-<div class="titrePage">
-  <h2>{'Upload Photos'|@translate}</h2>
-</div>
-
-<div id="photosAddContent">
-
-<form id="uploadFormSettings" enctype="multipart/form-data" method="post" action="{$F_ACTION}" class="properties">
-
-  <fieldset>
-    <legend>{'Web size photo'|@translate}</legend>
-
-    <table>
-      <tr>
-        <th><label for="websize_resize">{'Resize'|@translate}</label></th>
-        <td><input type="checkbox" name="websize_resize" id="websize_resize" {$values.websize_resize}></td>
-      </tr>
-      <tr>
-        <th>{'Maximum Width'|@translate}</th>
-        <td><input type="text" name="websize_maxwidth" value="{$values.websize_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}</td>
-      </tr>
-      <tr>
-        <th>{'Maximum Height'|@translate}</th>
-        <td><input type="text" name="websize_maxheight" value="{$values.websize_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}</td>
-      </tr>
-      <tr>
-        <th>{'Image Quality'|@translate}</th>
-        <td><input type="text" name="websize_quality" value="{$values.websize_quality}" size="3" maxlength="3"> %</td>
-      </tr>
-    </table>
-  </fieldset>
-
-  <fieldset>
-    <legend>{'Thumbnail'|@translate}</legend>
-
-    <table>
-      <tr>
-        <th><label for="thumb_crop">{'Crop'|@translate}</label></th>
-        <td><input type="checkbox" name="thumb_crop" id="thumb_crop" {$values.thumb_crop}></td>
-      </tr>
-      <tr id="thumb_follow_orientation_tr">
-        <th><label for="thumb_follow_orientation">{'Follow Orientation'|@translate}</label></th>
-        <td><input type="checkbox" name="thumb_follow_orientation" id="thumb_follow_orientation" {$values.thumb_follow_orientation}></td>
-      </tr>
-      <tr>
-        <th id="thumb_width_th">{'Maximum Width'|@translate}</th>
-        <td><input type="text" name="thumb_maxwidth" value="{$values.thumb_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}</td>
-      </tr>
-      <tr>
-        <th id="thumb_height_th">{'Maximum Height'|@translate}</th>
-        <td><input type="text" name="thumb_maxheight" value="{$values.thumb_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}</td>
-      </tr>
-      <tr>
-        <th>{'Image Quality'|@translate}</th>
-        <td><input type="text" name="thumb_quality" value="{$values.thumb_quality}" size="3" maxlength="3"> %</td>
-      </tr>
-    </table>
-  </fieldset>
-
-{if $MANAGE_HD}
-  <fieldset>
-    <legend>{'High definition'|@translate}</legend>
-
-    <table>
-      <tr>
-        <th><label for="hd_keep">{'Keep high definition'|@translate}</label></th>
-        <td><input type="checkbox" name="hd_keep" id="hd_keep" {$values.hd_keep}></td>
-      </tr>
-      <tr>
-        <th><label for="hd_resize">{'Resize'|@translate}</label></th>
-        <td><input type="checkbox" name="hd_resize" id="hd_resize" {$values.hd_resize}></td>
-      </tr>
-      <tr>
-        <th>{'Maximum Width'|@translate}</th>
-        <td><input type="text" name="hd_maxwidth" value="{$values.hd_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate}</td>
-      </tr>
-      <tr>
-        <th>{'Maximum Height'|@translate}</th>
-        <td><input type="text" name="hd_maxheight" value="{$values.hd_maxheight}" size="4" maxlength="4"> {'pixels'|@translate}</td>
-      </tr>
-      <tr>
-        <th>{'Image Quality'|@translate}</th>
-        <td><input type="text" name="hd_quality" value="{$values.hd_quality}" size="3" maxlength="3"> %</td>
-      </tr>
-    </table>
-  </fieldset>
-{/if}
-
-  <p>
-    <input class="submit" type="submit" name="submit" value="{'Save Settings'|@translate}"/>
-  </p>
-
-</form>
-
-</div> <!-- photosAddContent -->