Changeset 960

Show
Ignore:
Timestamp:
12/20/06 01:20:43 (2 years ago)
Author:
bchoate
Message:

Updates to prevent double request by Safari when opening a dialog. BugId: 45945

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/wheeljack/tmpl/cms/backup_restore.tmpl

    r951 r960  
    1212                el_name.innerHTML = '(<MT_TRANS phrase="None Selected.">)'; 
    1313            } 
    14             openDialog(this.form, 'dialog_select_weblog'); 
     14            openDialog(false, 'dialog_select_weblog'); 
    1515            descriptionObject.innerHTML = '<MT_TRANS phrase="This option allows you to choose exactly what you want to backup.">'; 
    1616        } else { 
     
    176176<TMPL_IF NAME=OPEN_DIALOG> 
    177177<script type="text/javascript"> 
    178 openDialog(this.form, 'dialog_restore_upload', 'magic_token=<TMPL_VAR NAME=MAGIC_TOKEN>&amp;files=<TMPL_VAR NAME=FILES>&amp;assets=<TMPL_VAR NAME=ASSETS>&amp;current_file=<TMPL_VAR NAME=FILENAME>&amp;last=<TMPL_VAR NAME=LAST>&amp;redirect=1;'); 
     178<!-- 
     179openDialog(false, 'dialog_restore_upload', 'magic_token=<TMPL_VAR NAME=MAGIC_TOKEN>&amp;files=<TMPL_VAR NAME=FILES>&amp;assets=<TMPL_VAR NAME=ASSETS>&amp;current_file=<TMPL_VAR NAME=FILENAME>&amp;last=<TMPL_VAR NAME=LAST>&amp;redirect=1;'); 
     180//--> 
    179181</script> 
    180182</TMPL_IF> 
  • branches/wheeljack/tmpl/cms/edit_entry.tmpl

    r935 r960  
    252252</TMPL_IF> 
    253253    } 
     254    var el = getByID("dialog-container"); 
     255    if (el) el.style.position = 'fixed'; 
    254256    initDirty(); 
    255257    entryFocus = new TC.Focus("edit-entry"); 
    256     <TMPL_IF NAME=DEFER_TAG_LOAD>deferredTagLoad();</TMPL_IF
    257     <TMPL_IF NAME=TAGS_JS>initTags();</TMPL_IF> 
     258    <TMPL_IF NAME=DEFER_TAG_LOAD>deferredTagLoad();<TMPL_ELSE
     259    <TMPL_IF NAME=TAGS_JS>initTags();</TMPL_IF></TMPL_IF> 
    258260    <TMPL_UNLESS NAME=ID>title.focus();</TMPL_UNLESS> 
    259261} 
     
    320322 
    321323    return true; 
    322 } 
    323  
    324 function fixDialog() { 
    325     var el = getByID("dialog-container"); 
    326     el.style.position = 'fixed'; 
    327324} 
    328325 
     
    547544        write('<img title="<MT_TRANS phrase="Quote" escape="singlequotes">" onclick="return formatStr(document.entry_form.text, \'blockquote\')" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/quote.gif" alt="<MT_TRANS phrase="Quote" escape="singlequotes">" width="26" height="19" />'); 
    548545        write('<img title="|" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/separator.gif" alt="|" width="7" height="19" />'); 
    549         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" />'); 
    550         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" />'); 
     546        write('<img title="<MT_TRANS phrase="Insert Image" escape=singlequotes">" onclick="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" />'); 
     547        write('<img title="<MT_TRANS phrase="Insert File" escape=singlequotes">" onclick="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" />'); 
    551548    } 
    552549} 
     
    592589        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" />'); 
    593590        write('<img title="|" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/separator.gif" alt="|" width="7" height="19" />'); 
    594         write('<img title="<MT_TRANS phrase="Insert Image" escape=singlequotes">" onclick="fixDialog(); openDialog(document.entry_form, \'list_assets\', \'_type=asset&amp;edit_field=text_more&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" />'); 
    595         write('<img title="<MT_TRANS phrase="Insert File" escape=singlequotes">" onclick="fixDialog(); openDialog(document.entry_form, \'list_assets\', \'_type=asset&amp;edit_field=text_more&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        write('<img title="<MT_TRANS phrase="Insert Image" escape=singlequotes">" onclick="openDialog(document.entry_form, \'list_assets\', \'_type=asset&amp;edit_field=text_more&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" />'); 
     592        write('<img title="<MT_TRANS phrase="Insert File" escape=singlequotes">" onclick="openDialog(document.entry_form, \'list_assets\', \'_type=asset&amp;edit_field=text_more&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" />'); 
    596593    } 
    597594} 
  • branches/wheeljack/tmpl/cms/list_asset.tmpl

    r922 r960  
    7474<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Upload New File">" width="9" height="9" /> 
    7575 
    76 <a href="#" onclick="return openDialog(this.form, 'start_upload', '__type=asset&amp;blog_id=<TMPL_VAR NAME=BLOG_ID>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Upload New File"></a></li> 
     76<a href="#" onclick="return openDialog(false, 'start_upload', 'blog_id=<TMPL_VAR NAME=BLOG_ID>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Upload New File"></a></li> 
    7777 
    7878</TMPL_IF> 
  • branches/wheeljack/tmpl/cms/list_association.tmpl

    r881 r960  
    5151<li class="special"> 
    5252<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/<TMPL_IF NAME=STATUS_ENABLED>create<TMPL_ELSE>create-disabled</TMPL_IF>.gif" alt="<MT_TRANS phrase="Add user to a weblog">" width="9" height="9" /> 
    53 <TMPL_IF NAME=STATUS_ENABLED><a href="javascript:void(0)" onclick="return openDialog(this.form, 'dialog_grant_role', 'author_id=<TMPL_VAR NAME=EDIT_AUTHOR_ID>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>%26author_id=<TMPL_VAR NAME=EDIT_AUTHOR_ID>')"><TMPL_ELSE><span class="no_link" title="<MT_TRANS phrase="You can not create associations for disabled users.">"></TMPL_IF><MT_TRANS phrase="Add [_1] to a weblog" params="<TMPL_VAR NAME=EDIT_AUTHOR_NAME>"><TMPL_IF NAME=STATUS_ENABLED></a><TMPL_ELSE></span></TMPL_IF> 
     53<TMPL_IF NAME=STATUS_ENABLED><a href="javascript:void(0)" onclick="return openDialog(false, 'dialog_grant_role', 'author_id=<TMPL_VAR NAME=EDIT_AUTHOR_ID>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>%26author_id=<TMPL_VAR NAME=EDIT_AUTHOR_ID>')"><TMPL_ELSE><span class="no_link" title="<MT_TRANS phrase="You can not create associations for disabled users.">"></TMPL_IF><MT_TRANS phrase="Add [_1] to a weblog" params="<TMPL_VAR NAME=EDIT_AUTHOR_NAME>"><TMPL_IF NAME=STATUS_ENABLED></a><TMPL_ELSE></span></TMPL_IF> 
    5454</li> 
    5555</TMPL_IF> 
     
    6161<li class="special"> 
    6262<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Assign role to a new user"> width="9" height="9" /> 
    63 <a href="javascript:void(0)" onclick="return openDialog(this.form, 'dialog_grant_role', '_type=user&amp;role_id=<TMPL_VAR NAME=ROLE_ID>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>%26role_id=<TMPL_VAR NAME=ROLE_ID>')"><MT_TRANS phrase="Assign Role to User"></a> 
     63<a href="javascript:void(0)" onclick="return openDialog(false, 'dialog_grant_role', '_type=user&amp;role_id=<TMPL_VAR NAME=ROLE_ID>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>%26role_id=<TMPL_VAR NAME=ROLE_ID>')"><MT_TRANS phrase="Assign Role to User"></a> 
    6464</li> 
    6565</TMPL_IF> 
     
    7676<li class="special"> 
    7777<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Add a user to this weblog">" width="9" height="9" /> 
    78 <a href="javascript:void(0)" onclick="return openDialog(this.form, 'dialog_grant_role', '_type=user<TMPL_IF NAME=BLOG_ID>&amp;blog_id=<TMPL_VAR NAME=BLOG_ID></TMPL_IF>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Add a user to this weblog"></a> 
     78<a href="javascript:void(0)" onclick="return openDialog(false, 'dialog_grant_role', '_type=user<TMPL_IF NAME=BLOG_ID>&amp;blog_id=<TMPL_VAR NAME=BLOG_ID></TMPL_IF>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Add a user to this weblog"></a> 
    7979</li> 
    8080<TMPL_ELSE> 
    8181<li class="special"> 
    8282<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Create a User Association">" width="9" height="9" /> 
    83 <a href="javascript:void(0)" onclick="return openDialog(this.form, 'dialog_grant_role', '_type=user<TMPL_IF NAME=BLOG_ID>&amp;blog_id=<TMPL_VAR NAME=BLOG_ID></TMPL_IF>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Create a User Association"></a> 
     83<a href="javascript:void(0)" onclick="return openDialog(false, 'dialog_grant_role', '_type=user<TMPL_IF NAME=BLOG_ID>&amp;blog_id=<TMPL_VAR NAME=BLOG_ID></TMPL_IF>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Create a User Association"></a> 
    8484</li> 
    8585</TMPL_IF> 
  • branches/wheeljack/tmpl/cms/list_role.tmpl

    r752 r960  
    3838<li class="special"> 
    3939<img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Grant a new role">" width="9" height="9" /> 
    40 <a href="javascript:void(0)" onclick="return openDialog(this.form, 'dialog_grant_role')"><MT_TRANS phrase="Grant another role to [_1]" params="<TMPL_VAR NAME=EDIT_AUTHOR_NAME ESCAPE=HTML>"></a> 
     40<a href="javascript:void(0)" onclick="return openDialog(false, 'dialog_grant_role')"><MT_TRANS phrase="Grant another role to [_1]" params="<TMPL_VAR NAME=EDIT_AUTHOR_NAME ESCAPE=HTML>"></a> 
    4141</li> 
    4242<TMPL_ELSE> 
  • branches/wheeljack/tmpl/cms/restore_upload_file.tmpl

    r795 r960  
    44<script type="text/javascript" src="<TMPL_VAR NAME=STATIC_URI>mt.js?v=<TMPL_VAR NAME=MT_VERSION ESCAPE=URL>"></script> 
    55<script type="text/javascript"> 
    6 openDialog(this.form, 'dialog_restore_upload', 'files=<TMPL_VAR NAME=FILES>&amp;assets=<TMPL_VAR NAME=ASSETS>'); 
     6<!-- 
     7openDialog(false, 'dialog_restore_upload', 'files=<TMPL_VAR NAME=FILES>&amp;assets=<TMPL_VAR NAME=ASSETS>'); 
     8//--> 
    79</script>