Changeset 16986

Timestamp:

Jul 24, 2012, 9:14:39 PM (12 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:

• index.php (modified) (1 diff)
• themes/default/fix-ie7.css (modified) (1 diff)
• themes/default/print.css (modified) (1 diff)

trunk/index.php

@@ -280 +280 @@
           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]);

trunk/themes/default/fix-ie7.css

@@ -16 +16 @@
 .thumbnails .wrap2 IMG {
   position: relative;
-  top: -50%;   
-  margin-top: 2%;
+  top: -50%;
 }
 

trunk/themes/default/print.css

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