Changeset 818
- Timestamp:
- 12/02/06 02:06:50 (2 years ago)
- Files:
-
- branches/wheeljack/build/mt-dists/MT.mk (modified) (1 diff)
- branches/wheeljack/lib/MT/App/CMS.pm (modified) (3 diffs)
- branches/wheeljack/lib/MT/Blog.pm (modified) (2 diffs)
- branches/wheeljack/tmpl/cms/upload_complete.tmpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/wheeljack/build/mt-dists/MT.mk
r767 r818 2 2 PRODUCT_CODE = MT 3 3 PRODUCT_VERSION = 3.3 4 SCHEMA_VERSION = 3.300 64 SCHEMA_VERSION = 3.3007 5 5 API_VERSION = 3.33 branches/wheeljack/lib/MT/App/CMS.pm
r814 r818 5475 5475 'Permission denied setting image defaults for blog #[_2]', $blog_id 5476 5476 )) unless $app->{perms}->can_save_image_defaults; 5477 $blog->image_default_set(1); 5477 5478 $blog->image_default_wrap_text($q->param('wrap_text') ? 1 : 0); 5478 5479 $blog->image_default_align($q->param('align') || MT::Blog::ALIGN()); … … 5480 5481 $blog->image_default_width($q->param('thumb_width') || MT::Blog::WIDTH()); 5481 5482 $blog->image_default_wunits($q->param('thumb_width_type') || MT::Blog::UNITS()); 5482 $blog->image_default_height($q->param('thumb_height') || MT::Blog:: HEIGHT());5483 $blog->image_default_height($q->param('thumb_height') || MT::Blog::WIDTH()); 5483 5484 $blog->image_default_hunits($q->param('thumb_height_type') || MT::Blog::UNITS()); 5484 5485 $blog->image_default_constrain($q->param('constrain') ? 1 : 0); … … 9328 9329 $param{do_thumb} = !$@ ? 1 : 0; 9329 9330 # Pass image default settings along. 9331 $param{image_defaults} = $blog->image_default_set() ? 1 : 0; 9330 9332 $param{make_thumb} = $blog->image_default_thumb() ? 1 : 0; 9331 9333 $param{wrap_text} = $blog->image_default_wrap_text() ? 1 : 0; branches/wheeljack/lib/MT/Blog.pm
r770 r818 83 83 'image_default_constrain' => 'boolean', 84 84 'image_default_popup' => 'boolean', 85 'image_default_set' => 'boolean', 85 86 }, 86 87 indexes => { … … 102 103 use constant ALIGN => 'left'; 103 104 use constant WIDTH => 100; 104 use constant HEIGHT => 100;105 105 use constant UNITS => 'pixels'; 106 106 branches/wheeljack/tmpl/cms/upload_complete.tmpl
r811 r818 166 166 <p><input type="checkbox" name="popup" value="1" /> <MT_TRANS phrase="Link image to full-size version in a popup window."></p> 167 167 <TMPL_IF NAME=CAN_SAVE_IMAGE_DEFAULTS> 168 <p><input type="checkbox" name="image_defaults" value="1" /> <MT_TRANS phrase="Remember these settings"></p>168 <p><input type="checkbox" name="image_defaults" value="1" <TMPL_IF NAME=IMAGE_DEFAULTS>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Remember these settings"></p> 169 169 </TMPL_IF> 170 170
