Changeset 16986


Ignore:
Timestamp:
Jul 24, 2012, 9:14:39 PM (8 years ago)
Author:
rvelices
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/index.php

    r15578 r16986  
    280280          array('display' => '')
    281281        );
    282   $selected_type = pwg_get_session_var('index_deriv', IMG_THUMB);
     282  $selected_type = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) )->type;
    283283  $type_map = ImageStdParams::get_defined_type_map();
    284284  unset($type_map[IMG_XXLARGE], $type_map[IMG_XLARGE]);
  • trunk/themes/default/fix-ie7.css

    r16412 r16986  
    1616.thumbnails .wrap2 IMG {
    1717  position: relative;
    18   top: -50%;   
    19   margin-top: 2%;
     18  top: -50%;
    2019}
    2120
  • trunk/themes/default/print.css

    r8306 r16986  
    11@media print {
    22#menubar, .content .navigationBar, .categoryActions, .content .calendarViews, .calendarBar,
    3 #imageToolBar, .navThumb, #addComment {
     3#imageToolBar, .navThumb, #commentAdd {
    44        display: none;
    55}
Note: See TracChangeset for help on using the changeset viewer.