Changeset 935

Timestamp:

12/15/06 22:29:21 (2 years ago)

Author:

gboggs

Message:

* MT/Asset: Added an as_html() method.
* MT/App/CMS:
- Renamed the 'complete_upload' mode to 'complete_insert'.
- Made asset_insert() accept arguments and either proceed with upload or insert the asset html.
- Made asset_insert_text() accept an asset ID argument.
- Moved the parameter assignment and upload_complete template building under the is_image check in the complete_insert() method.
- Fixed a misnamed param+column name that didn't save the popup default choic in the complete_insert() method.
- Called asset_insert() from the complete_insert() method if we are not handling an image asset.
* dialog_list_assets.tmpl:
- Fixed the wording of the instruction message to be more generic (for all assets, not just images).
- Changed the called mode from "complete_upload" ro "complete_insert", as with CMS.pm.
* edit_entry.tmpl:
- Added the "Insert File" icon-button.
- Fixed the edit_field= for text_more.
* upload_complete.tmpl:
- Added a TMPL_IF for setting the popup checked state.

BugId: 45096

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (8 diffs)
• branches/wheeljack/lib/MT/Asset.pm (modified) (1 diff)
• branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl (modified) (2 diffs)
• branches/wheeljack/tmpl/cms/edit_entry.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,
-upload' => \&complete_upload
+insert' => \&complete_insert
-        'start_upload_entry' => \&start_upload_entry,
-        'logout' => \&logout,
@@ -5490 +5490 @@
-
-sub asset_insert {
-
-
+
+
+
+
+
+
+
+
+
-    $app->build_page('asset_insert.tmpl', {
-            upload_html => $text,
@@ -5686 +5693 @@
-        }
-    }
+
-    return $app->asset_insert_text();
-}
@@ -5692 +5700 @@
-    my $app = shift;
-    my $q = $app->param;
+    my $id = shift || $q->param('id');
-    require MT::Asset;
-q->param('id')
-". $q->param('id') .'.'
+id
+$id."
-    my $text = $asset->as_html($q);
-    return $q->param('popup') || $q->param('link')
@@ -9193 +9202 @@
-}
-
-upload
+insert
-    my ($app, %args) = @_;
-
@@ -9213 +9222 @@
-        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}) {
+        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,
+        };
+
-        eval { require MT::Image; MT::Image->new or die; };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -9486 +9502 @@
-    }
-
-upload
+insert
-        asset => $asset,
-        blog => $blog,
@@ -12686 +12702 @@
-=item * upload_file
-
-upload
+insert
-
-=item * view_log

branches/wheeljack/lib/MT/Asset.pm

@@ -257 +257 @@
-}
-
+sub as_html {
+    my ($self, $q) = @_;
+    (my $fname = $self->file_name) =~ s/'/\\'/g;
+    my $text = sprintf '<a href="%s">%s</a>', $self->url, $fname;
+    return $text;
+}
+
-1;
-

branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl

@@ -49 +49 @@
-<h2><span class="weblog-title-highlight"><TMPL_IF NAME=EDIT_BLOG_ID><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML><TMPL_ELSE><MT_TRANS phrase="System-wide"></TMPL_IF>: </span> <MT_TRANS phrase="Assets"></h2>
-
-image you want
+asset you would like
-
-<p class="page-desc">
@@ -64 +64 @@
-<TMPL_IF NAME=OBJECT_LOOP><TMPL_UNLESS NAME=JSON>
-<form method="post" action="<TMPL_VAR NAME=SCRIPT_URL>" name="select_asset">
-upload
+insert
-<input type="hidden" name="_type" value="asset" />
-<input type="hidden" name="return_args" value="<TMPL_VAR NAME=RETURN_ARGS ESCAPE=HTML>" />

branches/wheeljack/tmpl/cms/edit_entry.tmpl

@@ -548 +548 @@
-        write('<img title="|" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/separator.gif" alt="|" width="7" height="19" />');
-        write('<img title="<MT_TRANS phrase="Insert Image" escape=singlequotes">" onclick="fixDialog(); openDialog(document.entry_form, \'list_assets\', \'_type=asset&amp;edit_field=text&amp;blog_id=<TMPL_VAR NAME=BLOG_ID>&amp;dialog_view=1&amp;filter=class&amp;filter_val=image&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>\')" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/add_image.gif" alt="<MT_TRANS phrase="Insert Image" escape="singlequotes">" width="26" height="19" />');
+        write('<img title="<MT_TRANS phrase="Insert File" escape=singlequotes">" onclick="fixDialog(); openDialog(document.entry_form, \'list_assets\', \'_type=asset&amp;edit_field=text&amp;blog_id=<TMPL_VAR NAME=BLOG_ID>&amp;dialog_view=1&amp;filter=class&amp;filter_val=file&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>\')" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/upload_file.gif" alt="<MT_TRANS phrase="Insert File" escape="singlequotes">" width="26" height="19" />');
-    }
-}
@@ -591 +592 @@
-        write('<img title="<MT_TRANS phrase="Quote">" onclick="return formatStr(document.entry_form.text_more, \'blockquote\')" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/quote.gif" alt="<MT_TRANS phrase="Quote">" width="26" height="19" />');
-        write('<img title="|" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/separator.gif" alt="|" width="7" height="19" />');
-
+
+
-    }
-}

branches/wheeljack/tmpl/cms/upload_complete.tmpl

@@ -157 +157 @@
-                </TMPL_IF>
-
-
+<TMPL_IF NAME=POPUP>checked="checked" </TMPL_IF>
-                <TMPL_IF NAME=CAN_SAVE_IMAGE_DEFAULTS>
-                <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>