Changeset 928

Timestamp:

12/15/06 03:56:44 (2 years ago)

Author:

gboggs

Message:

* MT/Asset/Image:
- Don't translate image dimensions if none are given.
* MT/App/CMS:
- Added a 'complete_upload' mode that accepts an asset and builds complete_upload.tmpl.
- Replaced all the %param logic in upload_file() with a call to complete_upload().
- Refactored the way that 'is_image' is handled in upload_file().
* dialog_list_assets.tmpl:
- Changed the "direct insertion" mode from "asset_insert" to "complete_upload."
- Added "entry_insert" and "direct_asset_insert" (=1 boolean) HTML hidden vars, so the backend knows what's up.
* upload_complete.tmpl:
- Conditioned the "file name, file size" string display on NAME=DIRECT_ASSET_INSERT.

BugId: 45620

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (11 diffs)
• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (1 diff)
• branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl (modified) (2 diffs)
• branches/wheeljack/tmpl/cms/upload_complete.tmpl (modified) (1 diff)

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

@@ -98 +98 @@
-        'start_upload' => \&start_upload,
-        'upload_file' => \&upload_file,
+        'complete_upload' => \&complete_upload,
-        'start_upload_entry' => \&start_upload_entry,
-        'logout' => \&logout,
@@ -991 +992 @@
-                edit_blog_id => $blog_id,
-                edit_field => $app->param('edit_field') || '',
-($app->param('dialog_view') ? 1 : 0)
+$app->param('dialog_view') ? 1 : 0
-            ) : ()),
-            class_loop => \@class_loop,
@@ -9185 +9186 @@
-}
-
+sub complete_upload {
+    my ($app, %args) = @_;
+
+    my $asset = $args{asset};
+    if (!$asset && $app->param('id')) {
+        require MT::Asset;
+        $asset = MT::Asset->load($app->param('id')) ||
+            return $app->errtrans("Can't load asset, ". $app->param('id') .'.');
+    }
+    return $app->errtrans('No asset to upload.') unless $asset;
+
+    $args{is_image} = $asset->isa('MT::Asset::Image') ? 1 : 0
+        unless defined $args{is_image};
+
+    require MT::Blog;
+    my $blog = $args{blog} || MT::Blog->load($app->param('blog_id')) ||
+        return $app->errtrans("Can't load blog, ". $app->param('blog_id') .'.');
+    my $perms = $args{perms} || $app->{perms} ||
+        return $app->errtrans('No permissions');
+
+    my %param = (
+        asset_id => $asset->id,
+        bytes => $args{bytes},
+        direct_asset_insert => scalar $app->param('direct_asset_insert'),
+        edit_field => scalar $app->param('edit_field'),
+        entry_insert => scalar $app->param('entry_insert'),
+        fname => $asset->file_name,
+        height => $asset->image_height,
+        is_image => $args{is_image},
+        site_path => scalar $app->param('site_path'),
+        url => $asset->url,
+        width => $asset->image_width,
+    );
+
+    if ($args{is_image}) {
+        eval { require MT::Image; MT::Image->new or die; };
+        $param{do_thumb} = $@ ? 0 : 1;
+        $param{can_save_image_defaults} = $perms->can_save_image_defaults ? 1 : 0;
+        $param{constrain} = $blog->image_default_constrain ? 1 : 0;
+        $param{popup_image} = $blog->image_default_popup ? 1 : 0;
+        $param{image_defaults} = $blog->image_default_set ? 1 : 0;
+        $param{wrap_text} = $blog->image_default_wrap_text ? 1 : 0;
+        $param{make_thumb} = $blog->image_default_thumb ? 1 : 0;
+        $param{'align_'.$_} = $blog->image_default_align eq $_ ? 1 : 0 for qw(left center right);
+        $param{'unit_w'.$_} = $blog->image_default_wunits eq $_ ? 1 : 0 for qw(percent pixels);
+        $param{'unit_h'.$_} = $blog->image_default_hunits eq $_ ? 1 : 0 for qw(percent pixels);
+        $param{thumb_width} = $blog->image_default_width || $asset->image_width || 0;
+        $param{thumb_height} = $blog->image_default_height || $asset->image_height || 0;
+    }
+
+    $app->build_page('upload_complete.tmpl', \%param);
+}
+
-sub upload_file {
-    my $app = shift;
@@ -9305 +9359 @@
-                    File::Temp::tempfile(DIR => $tmp_dir);
-            };
-) {
+
-                return $app->errtrans(
-                    "Error creating temporary file; please check your TempDir ".
@@ -9373 +9427 @@
-    $relative_url =~ s!\\!/!g;
-    $relative_url =~ s!^/!!;
-
-
-
-
+
-    $url .= '/' unless $url =~ m!/$!;
-    $relative_url =~ s!^/!!;
-    $url .= $relative_url;
-
+
-    require File::Basename;
-    my $local_basename = File::Basename::basename($local_file);
@@ -9387 +9438 @@
-    # Does the file have dimensions with a recognized image extension?
-    require MT::Asset::Image;
-if(defined($w) && defined($h) && MT::Asset::Image->can_handle($local_basename)) {
-$param{is_image} = 1
-
+my $is_image = defined($w) && defined($h) && MT::Asset::Image->can_handle($local_basename)
+? 1 : 0;
+
-    require MT::Asset;
-param{is_image}
-new $img_pkg
+is_image
+$img_pkg->new()
-    my $original = $asset->clone;
-    $asset->blog_id($blog_id);
@@ -9399 +9450 @@
-    $asset->file_name($local_basename);
-    $asset->file_ext($ext);
-param{is_image}
+is_image
-        $asset->image_width($w);
-        $asset->image_height($h);
@@ -9407 +9458 @@
-    MT->run_callbacks('CMSPostSave.asset', $app, $asset, $original);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        MT->run_callbacks('CMSUploadFile',
-                          File => $local_file, Url => $url, Size => $bytes,
@@ -9450 +9478 @@
-                          Blog => $blog);
-    }
-
+
+
+
+
+
+
+
-}
-
@@ -12608 +12642 @@
-=item * asset_insert
-
+=item * asset_insert_text
+
-=item * start_upload_entry
-
@@ -12642 +12678 @@
-
-=item * upload_file
+
+=item * complete_upload
-
-=item * view_log

branches/wheeljack/lib/MT/Asset/Image.pm

@@ -19 +19 @@
-    my $obj = shift;
-    my $meta = $obj->SUPER::metadata(@_);
-
-
+
+
+
+
-    $meta;
-}

branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl

@@ -64 +64 @@
-<TMPL_IF NAME=OBJECT_LOOP><TMPL_UNLESS NAME=JSON>
-<form method="post" action="<TMPL_VAR NAME=SCRIPT_URL>" name="select_asset">
-asset_insert
+complete_upload
-<input type="hidden" name="_type" value="asset" />
-<input type="hidden" name="return_args" value="<TMPL_VAR NAME=RETURN_ARGS ESCAPE=HTML>" />
@@ -73 +73 @@
-<input type="hidden" name="id" value="" />
-<input type="hidden" name="edit_field" value="<TMPL_VAR NAME=EDIT_FIELD>" />
+<input type="hidden" name="entry_insert" value="1" />
+<input type="hidden" name="direct_asset_insert" value="1" />
-</TMPL_IF>
-</form>

branches/wheeljack/tmpl/cms/upload_complete.tmpl

@@ -109 +109 @@
-<h2><span class="weblog-title-highlight"><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML>:</span> <MT_TRANS phrase="Upload File"></h2>
-
+<TMPL_UNLESS NAME=DIRECT_ASSET_INSERT>
-<div class="items-wrapper">
-    <span class="modal_added"><MT_TRANS phrase="The file named '[_1]' has been uploaded. Size: [quant,_2,byte]." params="<TMPL_VAR NAME=FNAME ESCAPE=HTML>%%<TMPL_VAR NAME=BYTES>"></span>
-</div>
+</TMPL_UNLESS>
-
-<p class="page-desc"><img border="0" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" width="17" height="5"></p>