Changeset 14251

Timestamp:

Apr 21, 2012, 12:56:51 PM (13 years ago)

Author:

plg

Message:

feature 2606: (multiple size config screen redesign) turn the "restore" button
in a "reset to default values" link in the "Multiple size" fieldset.

Location:

trunk/admin

Files:

• configuration.php (modified) (1 diff)
• themes/default/template/configuration.tpl (modified) (2 diffs)

trunk/admin/configuration.php

@@ -249 +249 @@
   load_conf_from_db();
 }
-elseif (isset($_POST['restore_settings']))
+
+// restore default derivatives settings
+if ('sizes' == $page['section'] and isset($_GET['action']) and 'restore_settings' == $_GET['action'])
 {
   ImageStdParams::set_and_save( ImageStdParams::get_default_sizes() );
   pwg_query('DELETE FROM '.CONFIG_TABLE.' WHERE param = \'disabled_derivatives\'');
   clear_derivative_cache();
+
+  array_push(
+    $page['infos'],
+    l10n('Your configuration settings are saved')
+    );
 }
 

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

@@ -440 +440 @@
 </table>
 
-<p style="margin:20px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails">
+<p style="margin:10px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails">
   {'Image Quality'|@translate}
   <input type="text" name="resize_quality" value="{$resize_quality}" size="3" maxlength="3"{if isset($ferrors.resize_quality)} class="dError"{/if}> %
   {if isset($ferrors.resize_quality)}<span class="dErrorDesc" title="{$ferrors.resize_quality}">!</span>{/if}
 </p>
+<p style="margin:10px 0 0 0;{if isset($ferrors)} display:block;{/if}" class="sizeDetails">
+  <a href="{$F_ACTION}&action=restore_settings" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">{'Reset to default values'|@translate}</a>
+</p>
 </fieldset>
 {/if}
@@ -643 +646 @@
         <p class="formButtons">
                 <input type="submit" name="submit" value="{'Save Settings'|@translate}">
-{if isset($sizes)}
-                <input type="submit" name="restore_settings" value="{'Restore'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">
-{/if}
         </p>
 </form>