Changeset 874

Show
Ignore:
Timestamp:
12/10/06 21:26:22 (2 years ago)
Author:
gboggs
Message:

- Closer!
- Renamed the misleading js "mode" argument, which was not actually the MT mode, to "trigger."
- Refactored doHandleMode() by consolidating the url concatination.
- Implemented the beginnings of a solution to the final upload from this template.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r872 r874  
    44<!-- 
    55 
    6 function doClick (f, mode) { 
     6function doClick (f, trigger) { 
    77<TMPL_IF NAME=ENTRY_INSERT> 
    8     doHandleMode(f, mode, 'asset_insert'); 
     8    doHandleMode(f, trigger, 'asset_insert'); 
    99<TMPL_ELSE> 
    1010<TMPL_IF NAME=CAN_POST> 
    1111    if (f.new_entry.checked) { 
    12         doHandleMode(f, mode, 'start_upload_entry'); 
     12        doHandleMode(f, trigger, 'start_upload_entry'); 
    1313    } 
    1414    else { 
    15         doHandleMode(f, mode, 'list_assets'); 
     15        doHandleMode(f, trigger, 'list_assets'); 
    1616    } 
    1717<TMPL_ELSE> 
    18     doHandleMode(f, mode, 'list_assets'); 
     18    doHandleMode(f, trigger, 'list_assets'); 
    1919</TMPL_IF> 
    2020</TMPL_IF> 
    2121} 
    2222 
    23 function doHandleMode (f, mode, type) { 
    24 if (type == 'asset_insert') { 
    25 alert('This feature not yet ready for prime time...');return false; 
    26 } 
    27     var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=' + type; 
    28     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>'; 
    29     url += mode; 
     23function doHandleMode (f, trigger, type) { 
     24    var url = '<TMPL_VAR NAME=SCRIPT_URL>?__mode=' + type + trigger; 
     25    url += '&blog_id=<TMPL_VAR NAME=BLOG_ID>&site_path=<TMPL_VAR NAME=SITE_PATH>&fname=<TMPL_VAR NAME=FNAME ESCAPE=URL>&url=<TMPL_VAR NAME=URL ESCAPE=URL>'; 
    3026<TMPL_IF NAME=DO_THUMB> 
    3127    if (f.thumb.checked) { 
    3228        url += '&thumb=1' + calcGeometry(f); 
    33         url += '&thumb_width_type=pixels'; 
    34         url += '&thumb_height_type=pixels'; 
    35         url += '&constrain=1'; 
     29        url += '&thumb_width_type=pixels&thumb_height_type=pixels&constrain=1'; 
    3630    } 
    3731</TMPL_IF> 
    …… 
    4236        url += '&link=1'; 
    4337    } 
    44     url += '&width=<TMPL_VAR NAME=WIDTH>'; 
    45     url += '&height=<TMPL_VAR NAME=HEIGHT>'; 
    46     url += '&image_type=<TMPL_VAR NAME=IMAGE_TYPE>'; 
     38    url += '&width=<TMPL_VAR NAME=WIDTH>&height=<TMPL_VAR NAME=HEIGHT>&image_type=<TMPL_VAR NAME=IMAGE_TYPE>'; 
    4739    if (f.include.checked) { 
    4840        url += '&wrap_text=1&align='; 
    49         for (i=0; i<f.align.length; i++) { 
    50             if (f.align[i].checked) { 
    51                 url += f.align[i].value; 
    52             } 
     41        for (i = 0; i < f.align.length; i++) { 
     42            if (f.align[i].checked) url += f.align[i].value; 
    5343        } 
    5444    } 
    5545     
    56     if (f.popup.checked) {  
    57         url += '&popup=1'; 
     46    if (f.popup.checked) url += '&popup=1'; 
     47    if (f.image_defaults.checked) url += '&image_defaults=1'; 
     48</TMPL_IF> 
     49    if (type == 'asset_insert') { 
     50        document.asset_insert.submit(); 
     51        return true; 
    5852    } 
    59     if (f.image_defaults.checked) { 
    60         url += '&image_defaults=1'; 
    61     } 
    62 </TMPL_IF> 
    63     if (type == 'start_upload_entry') { 
    64           closeDialog(url); 
    65     } else if (type == 'list_assets') { 
    66           closeDialog(url); 
    67     } 
     53 
     54    closeDialog(url); 
    6855} 
    6956 
    …… 
    7360    var w = calcDim(f.thumb_width, f.thumb_width_type, f.full_width.value); 
    7461    var h = calcDim(f.thumb_height, f.thumb_height_type, f.full_height.value); 
    75     var url = '&thumb_width=' + w + '&thumb_height=' + h; 
    76     return url; 
     62    return '&thumb_width=' + w + '&thumb_height=' + h; 
    7763} 
    7864 
    …… 
    120106</script> 
    121107 
     108<form name="asset_insert" action="<TMPL_VAR NAME=SCRIPT_URL>"> 
     109<input type="hidden" name="__mode" value="asset_insert" /> 
     110<input type="hidden" name="id" value="<TMPL_VAR NAME=ASSET_ID>" /> 
     111<input type="hidden" name="blog_id" value="<TMPL_VAR NAME=BLOG_ID>" /> 
     112</form> 
     113 
    122114<form action="<TMPL_VAR NAME=SCRIPT_URL>" onsubmit="return false;"> 
    123 <input type="hidden" name="id" value="<TMPL_VAR NAME=ASSET_ID>" /> 
    124115<TMPL_IF NAME=DO_THUMB> 
    125116<input type="hidden" name="full_width" value="<TMPL_VAR NAME=WIDTH>" />