diff options
| author | plegall <plg@piwigo.org> | 2012-04-21 10:56:51 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2012-04-21 10:56:51 +0000 |
| commit | d3c6983b359f08254cf090f97f0807038043db0f (patch) | |
| tree | 8d8043064d1eebb859b8347b9b3deb2ea874e697 | |
| parent | a2ea98d748a55d82600c5cd7f21b4a83cf59bbcc (diff) | |
feature 2606: (multiple size config screen redesign) turn the "restore" button
in a "reset to default values" link in the "Multiple size" fieldset.
git-svn-id: http://piwigo.org/svn/trunk@14251 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/configuration.php | 9 | ||||
| -rw-r--r-- | admin/themes/default/template/configuration.tpl | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/admin/configuration.php b/admin/configuration.php index c89203d4f..0de99e40f 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -248,11 +248,18 @@ WHERE param = \''.$row['param'].'\' //------------------------------------------------------ $conf reinitialization 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') + ); } //----------------------------------------------------- template initialization diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index 94f9b4529..631423d3a 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -439,11 +439,14 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} {/foreach} </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} @@ -642,9 +645,6 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} {if !isset($default)} <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> {/if} |