Changeset 872

Show
Ignore:
Timestamp:
12/10/06 04:50:46 (2 years ago)
Author:
gboggs
Message:

- Pass along the entry_insert param and the asset id (after uploading).
- Make upload_complete.tmpl aware of the entry_insert state, hide page elements inappropriate for entry_insert operation and attempt to call mode=asset_insert...
* Uploading is not yet ready for prime time *

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r869 r872  
    91489148    $param{refocus} = 1; 
    91499149    $param{missing_paths} = -d $blog->site_path || -d $blog->archive_path ? 0 : 1; 
     9150    $param{entry_insert} = $app->param('entry_insert'); 
    91509151    $app->build_page('upload.tmpl', \%param); 
    91519152} 
    …… 
    92879288                site_path => scalar $q->param('site_path'), 
    92889289                middle_path => $middle_path, 
     9290                entry_insert => $q->param('entry_insert'), 
    92899291                fname => $basename }); 
    92909292        } 
    …… 
    93689370    $asset->created_by($app->user->id); 
    93699371    $asset->save; 
     9372    $param{asset_id} = $asset->id; 
    93709373 
    93719374    if ($param{is_image}) { 
    93729375        eval { require MT::Image; MT::Image->new or die; }; 
    93739376        $param{do_thumb} = $@ ? 0 : 1; 
     9377        $param{entry_insert} = $q->param('entry_insert'); 
    93749378        # Pass image default settings along. 
    93759379        $param{image_defaults} = $blog->image_default_set() ? 1 : 0; 

  • branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl

    r871 r872  
    129129<li class="special"> 
    130130<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Upload New File">" width="9" height="9" /> 
    131 <a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=start_upload&__type=asset&blog_id=<TMPL_VAR NAME=BLOG_ID>&dialog_view=1&return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Upload New File"></a> 
     131<a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=start_upload&__type=asset&blog_id=<TMPL_VAR NAME=BLOG_ID>&dialog_view=1&entry_insert=1&return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Upload New File"></a> 
    132132</li> 
    133133</TMPL_IF> 

  • branches/wheeljack/tmpl/cms/upload.tmpl

    r851 r872  
    2929<input type="hidden" name="blog_id" value="<TMPL_VAR NAME=BLOG_ID>" /> 
    3030<input type="hidden" name="middle_path" value="" /> 
     31<input type="hidden" name="entry_insert" value="<TMPL_VAR NAME=ENTRY_INSERT>" /> 
    3132 
    3233<h2><span class="weblog-title-highlight"><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML>:</span> <MT_TRANS phrase="Upload New File"></h2> 

  • branches/wheeljack/tmpl/cms/upload_complete.tmpl

    r818 r872  
    55 
    66function doClick (f, mode) { 
     7<TMPL_IF NAME=ENTRY_INSERT> 
     8    doHandleMode(f, mode, 'asset_insert'); 
     9<TMPL_ELSE> 
    710<TMPL_IF NAME=CAN_POST> 
    811    if (f.new_entry.checked) { 
    912        doHandleMode(f, mode, 'start_upload_entry'); 
    10    } else if (!f.new_entry.checked) {  
     13    } 
     14    else { 
    1115        doHandleMode(f, mode, 'list_assets'); 
    12    } else { 
    13 </TMPL_IF> 
    14         doHandleMode(f, mode, 'list_assets'); 
    15 <TMPL_IF NAME=CAN_POST> 
    16     } 
     16    } 
     17<TMPL_ELSE> 
     18    doHandleMode(f, mode, 'list_assets'); 
     19</TMPL_IF> 
    1720</TMPL_IF> 
    1821} 
    1922 
    2023function doHandleMode (f, mode, type) { 
     24if (type == 'asset_insert') { 
     25alert('This feature not yet ready for prime time...');return false; 
     26} 
    2127    var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=' + type; 
    2228    url += '&blog_id=<TMPL_VAR NAME=BLOG_ID>&url=<TMPL_VAR NAME=URL ESCAPE=URL>&site_path=<TMPL_VAR NAME=SITE_PATH>&fname=<TMPL_VAR NAME=FNAME ESCAPE=URL>'; 
    …… 
    115121 
    116122<form action="<TMPL_VAR NAME=SCRIPT_URL>" onsubmit="return false;"> 
     123<input type="hidden" name="id" value="<TMPL_VAR NAME=ASSET_ID>" /> 
    117124<TMPL_IF NAME=DO_THUMB> 
    118125<input type="hidden" name="full_width" value="<TMPL_VAR NAME=WIDTH>" /> 
    …… 
    130137<div class="selector list"> 
    131138    <div class="upload-data-wrapper"> 
     139    <TMPL_UNLESS NAME=ENTRY_INSERT> 
    132140    <TMPL_IF NAME=IS_IMAGE> 
    133141    <b><MT_TRANS phrase="Image Options"></b> 
    …… 
    135143    <b><MT_TRANS phrase="File Options"></b> 
    136144    </TMPL_IF> 
     145    </TMPL_UNLESS> 
    137146    <div class="upload_indent_choices"> 
     147        <TMPL_UNLESS NAME=ENTRY_INSERT> 
    138148        <TMPL_IF NAME=CAN_POST> 
    139149        <p><label><input type="checkbox" name="new_entry" value="1" checked="checked" onclick="toggleSubPrefs(this); return true;" /> <MT_TRANS phrase="Create a new entry using this uploaded file."></label> <a href="#" onclick="return openManual('file_upload', 'creating_a_new_entry')" class="help">?</a><br /></p> 
    140150        </TMPL_IF> 
     151        </TMPL_UNLESS> 
    141152    </div> 
    142153 

  • branches/wheeljack/tmpl/cms/upload_confirm.tmpl

    r811 r872  
    1010<input type="hidden" name="middle_path" value="<TMPL_VAR NAME=MIDDLE_PATH ESCAPE=HTML>" /> 
    1111<input type="hidden" name="magic_token" value="<TMPL_VAR NAME=MAGIC_TOKEN>" /> 
     12<input type="hidden" name="entry_insert" value="<TMPL_VAR NAME=ENTRY_INSERT>" /> 
    1213 
    1314<h2><span class="weblog-title-highlight"><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML>:</span> <MT_TRANS phrase="Upload New File"></h2>