archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added a button to restore multiple size default sizes ...

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@14228 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-04-19 20:49:43 +00:00
commit dd1f034df2
3 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/configuration.php
View file

@ -248,6 +248,12 @@ WHERE param = \''.$row['param'].'\'
//------------------------------------------------------ $conf reinitialization
load_conf_from_db();
}
elseif (isset($_POST['restore_settings']))
{
ImageStdParams::set_and_save( ImageStdParams::get_default_sizes() );
pwg_query('DELETE FROM '.CONFIG_TABLE.' WHERE param = \'disabled_derivatives\'');
clear_derivative_cache();
}
//----------------------------------------------------- template initialization
$template->set_filename('config', 'configuration.tpl');

14
admin/themes/default/template/configuration.tpl
View file

@ -30,9 +30,7 @@ jQuery(document).ready(function(){
});
{/literal}{/footer_script}
<div class="titrePage">
<h2>{'Piwigo configuration'|@translate} {$TABSHEET_TITLE}</h2>
</div>
{if !isset($default)}
<form method="post" action="{$F_ACTION}" class="properties">
@ -314,13 +312,13 @@ jQuery(document).ready(function(){
jQuery("#showDetails").click(function() {
jQuery(".sizeDetails").show();
jQuery(this).css("visibility", "hidden");
return false;
});
});
{/literal}{/footer_script}
{html_head}{literal}
<style type="text/css">
{html_style}{literal}
input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;}
.dErrorDesc {background-color:red; color:white; padding:0 5px;border-radius:10px; font-weight:bold;cursor:help;}
.sizeEnable {width:50px;}
@ -330,8 +328,7 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;}
.showDetails {padding:0;}
.sizeDetails {display:none;margin-left:10px;}
.sizeEditOpen {margin-left:10px;}
</style>
{/literal}{/html_head}
{/literal}{/html_style}
<fieldset id="sizesConf">
<legend>{'Original Size'|@translate}</legend>
@ -644,7 +641,10 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;}
{if !isset($default)}
<p class="formButtons">
<input class="submit" type="submit" name="submit" value="{'Save Settings'|@translate}">
<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}

31
include/derivative_std_params.inc.php
View file

@ -112,7 +112,8 @@ final class ImageStdParams
}
else
{
self::make_default();
self::$watermark = new WatermarkParams();
self::$type_map = self::get_default_sizes();
}
self::build_maps();
}
@ -141,18 +142,24 @@ final class ImageStdParams
conf_update_param('derivatives', addslashes($ser) );
}
private static function make_default()
static function get_default_sizes()
{
self::$watermark = new WatermarkParams();
self::$type_map[IMG_SQUARE] = new DerivativeParams( SizingParams::square(120,120) );
self::$type_map[IMG_THUMB] = new DerivativeParams( SizingParams::classic(144,144) );
self::$type_map[IMG_XXSMALL] = new DerivativeParams( SizingParams::classic(240,240) );
self::$type_map[IMG_XSMALL] = new DerivativeParams( SizingParams::classic(432,324) );
self::$type_map[IMG_SMALL] = new DerivativeParams( SizingParams::classic(576,432) );
self::$type_map[IMG_MEDIUM] = new DerivativeParams( SizingParams::classic(792,594) );
self::$type_map[IMG_LARGE] = new DerivativeParams( SizingParams::classic(1008,756) );
self::$type_map[IMG_XLARGE] = new DerivativeParams( SizingParams::classic(1224,918) );
self::$type_map[IMG_XXLARGE] = new DerivativeParams( SizingParams::classic(1656,1242) );
$arr = array(
IMG_SQUARE => new DerivativeParams( SizingParams::square(120,120) ),
IMG_THUMB => new DerivativeParams( SizingParams::classic(144,144) ),
IMG_XXSMALL => new DerivativeParams( SizingParams::classic(240,240) ),
IMG_XSMALL => new DerivativeParams( SizingParams::classic(432,324) ),
IMG_SMALL => new DerivativeParams( SizingParams::classic(576,432) ),
IMG_MEDIUM => new DerivativeParams( SizingParams::classic(792,594) ),
IMG_LARGE => new DerivativeParams( SizingParams::classic(1008,756) ),
IMG_XLARGE => new DerivativeParams( SizingParams::classic(1224,918) ),
IMG_XXLARGE => new DerivativeParams( SizingParams::classic(1656,1242) ),
);
foreach($arr as $params)
{
$params->last_mod_time = time();
}
return $arr;
}
static function apply_global($params)