Changeset 728

Show
Ignore:
Timestamp:
11/09/06 08:36:33 (2 years ago)
Author:
gboggs
Message:

Basic handlng of wrap_text and alignment during image upload.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r724 r728  
    52875287    my $q = $app->param; 
    52885288    my($url, $width, $height) = map $q->param($_), qw( url width height ); 
     5289    my $wrap_style = ''; 
     5290    if($q->param('wrap_text')) { 
     5291        if($q->param('alignment') eq 'left') { 
     5292            $wrap_style = 'style="float: left; margin: 0px 5px 5px 0px;"'; 
     5293        } else { 
     5294            $wrap_style = 'style="float: right; margin: 0px 0px 5px 5px;"'; 
     5295        } 
     5296    } 
     5297 
    52895298    my ($base_url, $fname) = $url =~ m|(.*)/([^/]*)|; 
    52905299    $url = $base_url . '/' . $fname; # no need to re-encode filename; url is already encoded 
    …… 
    54005409        if ($thumb) { 
    54015410            return <<"HTML"; 
    5402 <a href="$url"><img alt="$fname" src="$thumb" width="$thumb_width" height="$thumb_height" /></a> 
     5411<a href="$url"><img alt="$fname" src="$thumb" width="$thumb_width" height="$thumb_height" $wrap_style /></a> 
    54035412HTML 
    54045413        } else { 
    54055414            return <<"HTML"; 
    5406 <img alt="$fname" src="$url" width="$width" height="$height" /> 
     5415<img alt="$fname" src="$url" width="$width" height="$height" $wrap_style /> 
    54075416HTML 
    54085417        } 

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

    r2 r728  
    77<TMPL_IF NAME=CAN_POST> 
    88    if (f.new_entry[0].checked) 
    9         doStartEntry(f, mode); 
     9        doHandleMode(f, mode, 'start_upload_entry'); 
    1010    else 
    1111</TMPL_IF> 
    12         doShowHTML(f, mode); 
     12      doHandleMode(f, mode, 'show_upload_html'); 
    1313} 
    1414 
    15 function doShowHTML (f, mode) { 
    16     var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=show_upload_html&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>&' + mode; 
     15function doHandleMode (f, mode, type) { 
     16    var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=' + type; 
     17    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>&' + mode; 
    1718<TMPL_IF NAME=DO_THUMB> 
    1819    if (f.thumb.checked) 
    1920        url += '&thumb=1&' + calcGeometry(f); 
    2021</TMPL_IF> 
    21     window.location = url; 
    22 } 
    23  
    24 function doStartEntry (f, mode) { 
    25     var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=start_upload_entry&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>&' + mode; 
    26 <TMPL_IF NAME=DO_THUMB> 
    27     if (f.thumb.checked) 
    28         url += '&thumb=1&' + calcGeometry(f); 
    29 </TMPL_IF> 
    30     window.opener.location = url; 
    31     window.close(); 
     22    if (f.wrap_text.checked) { 
     23        url += '&wrap_text=1&alignment='; 
     24        if (f.alignment[0].checked) { 
     25            url += f.alignment[0].value; 
     26        } else { 
     27            url += f.alignment[1].value; 
     28        } 
     29    } 
     30    if (type == 'start_upload_entry') { 
     31        window.opener.location = url; 
     32        window.close(); 
     33    } 
     34    else if (type == 'show_upload_html') { 
     35        window.location = url; 
     36    } 
    3237} 
    3338 
    …… 
    112117</TMPL_IF> 
    113118 
     119<TMPL_IF NAME=IS_IMAGE> 
     120<p> 
     121<label> 
     122<input type="checkbox" name="wrap_text" value="1" /> <MT_TRANS phrase="Wrap text">: 
     123<input type="radio" name="alignment" value="left" checked="checked" /> <MT_TRANS phrase="Left"> 
     124<input type="radio" name="alignment" value="right" /> <MT_TRANS phrase="Right"> 
     125</p> 
     126</TMPL_IF> 
     127 
    114128<TMPL_IF NAME=DO_THUMB> 
    115129<h4><MT_TRANS phrase="Image Thumbnail"></h4>