Changeset 766

Timestamp:

11/18/06 23:06:44 (2 years ago)

Author:

gboggs

Message:

Allow saving of image upload defaults to the existing image upload functionality and template.

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (3 diffs)
• branches/wheeljack/lib/MT/Blog.pm (modified) (3 diffs)
• branches/wheeljack/lib/MT/Permission.pm (modified) (1 diff)
• branches/wheeljack/tmpl/cms/upload_complete.tmpl (modified) (6 diffs)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -5467 +5467 @@
-    my $blog = MT::Blog->load($blog_id, {cached_ok=>1});
-    my($thumb, $thumb_width, $thumb_height);
+    # Save new defaults if requested.
+    if($q->param('image_defaults')) {
+        return $app->error($app->translate(
+            'Permission denied setting image defaults for blog #[_2]', $blog_id
+        )) unless $app->{perms}->can_save_image_defaults;
+        $blog->image_default_wrap_text($q->param('wrap_text') ? 1 : 0);
+        $blog->image_default_align($q->param('align') || MT::Blog::ALIGN());
+        $blog->image_default_thumb($q->param('thumb') ? 1 : 0);
+        $blog->image_default_width($q->param('thumb_width') || MT::Blog::WIDTH());
+        $blog->image_default_wunits($q->param('thumb_width_type') || MT::Blog::UNITS());
+        $blog->image_default_height($q->param('thumb_height') || MT::Blog::HEIGHT());
+        $blog->image_default_hunits($q->param('thumb_height_type') || MT::Blog::UNITS());
+        $blog->image_default_constrain($q->param('constrain') ? 1 : 0);
+        $blog->image_default_popup($q->param('popup') ? 1 : 0);
+        $blog->save;
+    }
-    if ($thumb = $q->param('thumb')) {
-        require MT::Image;
@@ -5603 +5619 @@
-HTML
-    } elsif ($q->param('include')) {
-ment
-ment
+
+
-        if ($thumb) {
-            return <<"HTML";
@@ -9308 +9324 @@
-        eval { require MT::Image; MT::Image->new or die; };
-        $param{do_thumb} = !$@ ? 1 : 0;
+        # Pass image default settings along.
+        $param{make_thumb} = $blog->image_default_thumb() ? 1 : 0;
+        $param{wrap_text} = $blog->image_default_wrap_text() ? 1 : 0;
+        $param{align_left} = $blog->image_default_align() eq 'left' ? 1 : 0;
+        $param{align_center} = $blog->image_default_align() eq 'center' ? 1 : 0;
+        $param{align_right} = $blog->image_default_align() eq 'right' ? 1 : 0;
+        $param{thumb_width} = $blog->image_default_width() || $w;
+        $param{unit_wpixels} = $blog->image_default_wunits() eq 'pixels' ? 1 : 0;
+        $param{unit_wpercent} = $blog->image_default_wunits() eq 'percent' ? 1 : 0;
+        $param{thumb_height} = $blog->image_default_height() || $h;
+        $param{unit_hpixels} = $blog->image_default_hunits() eq 'pixels' ? 1 : 0;
+        $param{unit_hpercent} = $blog->image_default_hunits() eq 'percent' ? 1 : 0;
+        $param{constrain} = $blog->image_default_constrain() ? 1 : 0;
+        $param{popup_image} = $blog->image_default_popup() ? 1 : 0;
+        $param{can_save_image_defaults} = $perms->can_save_image_defaults() ? 1 : 0;
-        MT->run_callbacks('CMSUploadFile',
-                          File => $local_file, Url => $url, Size => $bytes,

branches/wheeljack/lib/MT/Blog.pm

@@ -74 +74 @@
-        'archive_tmpl_category' => 'string(255)',
-        'archive_tmpl_individual' => 'string(255)',
+        'image_default_wrap_text' => 'boolean',
+        'image_default_align' => 'string(10)',
+        'image_default_thumb' => 'boolean',
+        'image_default_width' => 'integer',
+        'image_default_wunits' => 'string(10)',
+        'image_default_height' => 'integer',
+        'image_default_hunits' => 'string(10)',
+        'image_default_constrain' => 'boolean',
+        'image_default_popup' => 'boolean',
-    },
-    indexes => {
@@ -89 +98 @@
-    primary_key => 'id',
-});
+
+# Image upload defaults.
+use constant ALIGN => 'left';
+use constant WIDTH => 100;
+use constant HEIGHT => 100;
+use constant UNITS => 'pixels';
-
-sub set_defaults {
@@ -130 +145 @@
-    # something far in the future to force dynamic side to read it.
-    $blog->children_modified_on('20101231120000');
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/wheeljack/lib/MT/Permission.pm

@@ -94 +94 @@
-        # 32 is deprecated; reserved for future use
-        [ 128,   'rebuild', 'Rebuild Files', 1, 'blog'],
-e
+
-        # has no label.
-        [ 2048,  'not_comment', '', 1, 'blog'],
+        [ 32768, 'save_image_defaults', '', 1, 'blog'],
-    );
-

branches/wheeljack/tmpl/cms/upload_complete.tmpl

@@ -15 +15 @@
-function doHandleMode (f, mode, type) {
-    var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=' + type;
-
+
+
-<TMPL_IF NAME=DO_THUMB>
-    if (f.thumb.checked)
-
+
+
+
+
+
-</TMPL_IF>
-    if (f.wrap_text.checked) {
-ment
-ment
-ment
-ment
+
+
+
+
-            }
-        }
-    }
+    if (f.image_defaults.checked)
+        url += '&image_defaults=1';
-    if (type == 'start_upload_entry') {
-        window.opener.location = url;
@@ -42 +49 @@
-    var w = calcDim(f.thumb_width, f.thumb_width_type, f.full_width.value);
-    var h = calcDim(f.thumb_height, f.thumb_height_type, f.full_height.value);
-
+
+
-}
-
@@ -119 +127 @@
-<TMPL_IF NAME=IS_IMAGE>
-<p>
-
-
-
+
+
+
+
+
+
+
+
-</p>
-</TMPL_IF>
@@ -128 +141 @@
-<h4><MT_TRANS phrase="Image Thumbnail"></h4>
-
-
+
+
+
+
+
+
+
-
-<blockquote>
@@ -134 +153 @@
-<p>
-<label for="thumb_width"><MT_TRANS phrase="Width:"></label>
-
+THUMB_
-<select name="thumb_width_type" onchange="adjustPixelsPct(this.form, 1)">
-selected="selected"
-
+<TMPL_IF NAME=UNIT_WPIXELS>selected="selected"</TMPL_IF>
+ <TMPL_IF NAME=UNIT_WPERCENT>selected="selected"</TMPL_IF>
-</select>
-</p>
@@ -143 +162 @@
-<p>
-<label for="thumb_height"><MT_TRANS phrase="Height:"></label>
-
+THUMB_
-<select name="thumb_height_type" onchange="adjustPixelsPct(this.form, 0)">
-selected="selected"
-
+<TMPL_IF NAME=UNIT_HPIXELS>selected="selected"</TMPL_IF>
+ <TMPL_IF NAME=UNIT_HPERCENT>selected="selected"</TMPL_IF>
-</select>
-</p>
-
-
+
+
+
+
+
+
-
-</blockquote>
-</TMPL_IF>
-
+<div>
-<p><MT_TRANS phrase="Would you like this file to be a:"></p>
-
-<div>
-<TMPL_IF NAME=IS_IMAGE>
-
-
+&
+&
-<TMPL_ELSE>
-
+&
-</TMPL_IF>
-</div>
-
+<TMPL_IF NAME=CAN_SAVE_IMAGE_DEFAULTS>
+<p>
+<label>
+<input type="checkbox" name="image_defaults" value="1" />
+<MT_TRANS phrase="Remember these settings">
+</label>
+</p>
+</TMPL_IF>
+
-</form>
-