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

fix checkbox of selected derivative on index page when a plugin overrides the default value (merge from 2.4 to trunk)

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@16986 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-07-24 19:14:39 +00:00
commit 81e869eaa0
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.php
View file

@ -279,7 +279,7 @@ if ( count($page['items']) > 0 )
duplicate_index_url(),
array('display' => '')
);
$selected_type = pwg_get_session_var('index_deriv', IMG_THUMB);
$selected_type = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) )->type;
$type_map = ImageStdParams::get_defined_type_map();
unset($type_map[IMG_XXLARGE], $type_map[IMG_XLARGE]);
foreach($type_map as $params)

1
themes/default/fix-ie7.css
View file

@ -16,7 +16,6 @@
.thumbnails .wrap2 IMG {
position: relative;
top: -50%;
margin-top: 2%;
}
.pwg-icon {

2
themes/default/print.css
View file

@ -1,6 +1,6 @@
@media print {
#menubar, .content .navigationBar, .categoryActions, .content .calendarViews, .calendarBar,
#imageToolBar, .navThumb, #addComment {
#imageToolBar, .navThumb, #commentAdd {
display: none;
}