Changeset 865

Timestamp:

12/09/06 02:01:42 (2 years ago)

Author:

gboggs

Message:

MT/Asset/Image:

• Added (and documented) as_html() to return the appropriate HTML to insert.
  
• Fixed the A&C POD link.
  

MT/App/CMS:

• Added (and documented) an asset_insert() method to load an asset, construct appropriate parameters and call the insertion template.
  

dialog_list_assets.tmpl:

• Added function validate() to toggle the mode if an asset is chosen onsubmit.
  
• Removed unneeded list_assets HTML (like tabls, etc) and rearranged things a bit.
  
• Changed the chckboxes to radio buttons.
  

asset_insert.tmpl: - Added this template to serve at the end of the insert asset selection process.

BugId: 45620

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (4 diffs)
• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (2 diffs)
• branches/wheeljack/tmpl/cms/asset_insert.tmpl (added)
• branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl (modified) (5 diffs)

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

@@ -153 +153 @@
-        'dialog_restore_upload' => \&dialog_restore_upload,
-        'restore_premature_cancel' => \&restore_premature_cancel,
+        'asset_insert' => \&asset_insert,
-    );
-    $app->{state_params} = [
@@ -996 +997 @@
-}
-
+sub asset_insert {
+    my $app = shift;
+    my $asset = $app->param('id');
+    require MT::Asset;
+    $asset = MT::Asset->load($asset) ||
+        return $app->errtrans("Can't load asset, $asset.");
+    my $param = {
+        asset_html => $asset->as_html,
+        class => $app->param('class'),
+        magic_token => $app->param('magic_token'),
+    };
+    $app->build_page('asset_insert.tmpl', $param);
+}
+
-sub list_roles {
-    my $app = shift;
@@ -12070 +12085 @@
-Approves a comment or trackback for publication.
-
+=item * asset_insert
+
+Load an asset, given the I<asset id>, construct an appropriate
+parameter list and render the I<asset_insert> template.
+
-=item * ban_commenter
-
@@ -12222 +12242 @@
-
-Ajax-style handler for returning the tags that exist on a particular blog.
+
+=item * list_assets
+
+Handler for displaying a list of blog-level assets.
-
-=item * list_associations

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

@@ -100 +100 @@
-}
-
+sub as_html {
+    my $self = shift;
+    my %args = @_;
+    return sprintf '<img src="%s" height="%d" width="%d" alt="%s" class="%s" />',
+        $self->url, $self->image_height, $self->image_width, $self->file_name, $args{class};
+}
+
-1;
-
@@ -141 +148 @@
-undef.
-
-1 AUTHORS & COPYRIGHT
+2 $asset->as_html
-
-
+
+
+
+
+
+
-
-=cut

branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl

@@ -9 +9 @@
-assets[<TMPL_VAR NAME=ID>] = <TMPL_VAR NAME=METADATA_JSON>;
-</TMPL_LOOP>
+
+function validate (f) {
+    var x = undefined;
+    for (var i = 0; i < f.id.length; i++) {
+        if (f.id[i].checked) f.__mode.value = 'asset_insert';
+    }
+    return f['__mode'] ? true : false;
+}
-
-function displayAssetDetails(id) {
@@ -115 +123 @@
-<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>
-
-<p class="page-desc"><MT_TRANS phrase="TBD"></p>
-
-<div class="tabs">
-<ul>
-<li class="yah"><a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=list_assets<TMPL_IF NAME=EDIT_BLOG_ID>&amp;blog_id=<TMPL_VAR NAME=EDIT_BLOG_ID></TMPL_IF>"><MT_TRANS phrase="Assets"></a></li>
-<TMPL_IF NAME=EDIT_BLOG_ID>
-<TMPL_IF NAME=CAN_UPLOAD>
@@ -206 +211 @@
-<div class="list-wrapper">
-<TMPL_IF NAME=OBJECT_LOOP>
-this['__mode'] ? true : false
+validate(this)
-<input type="hidden" name="__mode" value="" />
-
-
-
+
-<input type="hidden" name="filter_args" value="<TMPL_VAR NAME=FILTER_ARGS>" />
-<input type="hidden" name="return_args" value="<TMPL_VAR NAME=RETURN_ARGS ESCAPE=HTML>" />
-<input type="hidden" name="magic_token" value="<TMPL_VAR NAME=MAGIC_TOKEN>" />
-<input type="hidden" name="dialog_view" value="1" />
+<TMPL_IF NAME=EDIT_BLOG_ID>
+<input type="hidden" name="blog_id" value="<TMPL_VAR NAME=EDIT_BLOG_ID>" />
+</TMPL_IF>
-
-<div class="list" id="selector">
@@ -221 +227 @@
-<thead>
-<tr>
-cb"><input type="checkbox" name="id-head" value="all" class="select" /
+"
-<th id="as-file-status"><img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/flag.gif" alt="<MT_TRANS phrase="Status">" title="<MT_TRANS phrase="Status">" width="9" height="9" /></th>
-<th id="as-file-name"><MT_TRANS phrase="Filename"></th>
@@ -239 +245 @@
-<TMPL_LOOP NAME=OBJECT_LOOP>
-<tr class="<TMPL_IF __ODD__>odd<TMPL_ELSE>even</TMPL_IF>">
-checkbox
+radio
-<td class="status-<TMPL_IF NAME=FILE_IS_MISSING>missing<TMPL_ELSE>publish</TMPL_IF>"><img src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" <TMPL_IF NAME=FILE_IS_MISSING>alt="<MT_TRANS phrase="Pending">"<TMPL_ELSE>alt="<MT_TRANS phrase="Published">"</TMPL_IF> width="9" height="9" /</td>
-<td><span title="<TMPL_VAR NAME=FILE_PATH ESCAPE=HTML>"><TMPL_UNLESS NAME=FILE_IS_MISSING><a href="javascript:void(0)" onclick="return displayAssetDetails('<TMPL_VAR NAME=ID>');"></TMPL_UNLESS><TMPL_VAR NAME=FILE_NAME ESCAPE=HTML><TMPL_UNLESS NAME=FILE_IS_MISSING></a></TMPL_UNLESS></span><div id="asset-<TMPL_VAR NAME=ID>-detail" class="asset-detail-panel"><div id="asset-<TMPL_VAR NAME=ID>-detail-inner" class="asset-detail-panel-inner"></div></div></td>