Changeset 3028 for trunk


Ignore:
Timestamp:
05/07/10 17:03:17 (10 years ago)
Author:
jukka
Message:

Fixed #1980 and other similar javascript links.

Location:
trunk/skins/lemill
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/skins/lemill/lemill_content_add.cpt

    r3023 r3028  
    7676            <li class="resultobject"> 
    7777                    <div class="templateicon"> 
    78                         <a href="javascript:$('#selection').hide();$('#upload').show()"> 
     78                        <a href="javascript:$('#selection').hide();$('#upload').show();void(0);"> 
    7979                            <img src="images/default_media_piece.png" width="120" height="120" border="0" /> 
    8080                        </a> 
     
    8383                    <dl> 
    8484                    <dt class="browse_title_r"> 
    85                         <strong><a i18n:translate="" href="javascript:$('#selection').hide();$('#upload').show()" >Media piece</a></strong> 
     85                        <strong><a i18n:translate="" href="javascript:$('#selection').hide();$('#upload').show();void(0);" >Media piece</a></strong> 
    8686                    </dt>                 
    8787                    <dd class="browse_info" i18n:translate="description_add_media_piece" >Upload images and sound clips that can be used to create learning resources.</dd> 
  • trunk/skins/lemill/master.js

    r3026 r3028  
    4040 
    4141function getLatestBlogPost(lang){ 
    42  url="http://blog.lemill.net/"+lang+"/?feed=rss"; 
     42 url="http://blog.lemill.net/"+lang+"/?feed=rss2"; 
    4343 $.getJSON("http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&callback=?&q="+url,function(data){ 
    4444    item=data.responseData.feed.entries[0]; 
    45     pd= new Date(Date.parse(item["publishedDate"])); 
    46     html='<b><a href="'+item['link']+'">'+item['title']+'</a></b> ('+pd.getFullYear()+'-'+pd.getMonth()+'-'+pd.getDate()+')'; 
     45    pd= new Date(Date.parse(item.publishedDate)); 
     46    html='<b><a href="'+item.link+'">'+item.title+'</a></b> ('+pd.getFullYear()+'-'+pd.getMonth()+'-'+pd.getDate()+')'; 
    4747    $("span#title_from_blog").html(html);                
    4848 }); 
  • trunk/skins/lemill/piece_edit.cpt

    r3014 r3028  
    6363        </tal:fields> 
    6464 
    65             <p i18n:translate="text_original_author_of_piece">If you are not the author of this piece you must add <span i18n:name="copyright_info"><a href="javascript:$('#copyright').toggle('slow');" i18n:translate="text_snippet_copyright_information">copyright information</a></span></p> 
     65            <p i18n:translate="text_original_author_of_piece">If you are not the author of this piece you must add <span i18n:name="copyright_info"><a href="javascript:$('#copyright').toggle('slow');void(0);" i18n:translate="text_snippet_copyright_information">copyright information</a></span></p> 
    6666        <div id="copyright" style="display:none"> 
    6767            <metal:fieldMacro use-macro="python: here.widget('originalAuthor', mode='edit')"/> 
  • trunk/skins/lemill/widget_exercise.pt

    r3024 r3028  
    4646    </tal:chapters> 
    4747    <fieldset class="visualNoPrint"> 
    48         <p i18n:translate="text_do_send_answers_to_e_mail">If you want the system to check your answers and send feedback as e-mail to you or your teacher, you need to fill <span i18n:name="show_form"><a href="javascript:$('#sending_email').toggle('slow');" i18n:translate="text_snippet_show_form">the e-mail form</a></span>.</p> 
     48        <p i18n:translate="text_do_send_answers_to_e_mail">If you want the system to check your answers and send feedback as e-mail to you or your teacher, you need to fill <span i18n:name="show_form"><a href="javascript:$('#sending_email').toggle('slow');void(0);" i18n:translate="text_snippet_show_form">the e-mail form</a></span>.</p> 
    4949        <div id="sending_email" style="display:none"> 
    5050        <div class="visualClear" style="height:10px">&nbsp;</div> 
  • trunk/skins/lemill/wysiwyg_support.pt

    r3016 r3028  
    44 
    55<textarea id="content1" name="content1" tal:attributes="id area_id; name area_id" tal:content="inputvalue" class="mceEditor" cols="85" rows="20">This will be a editor, since it has a selector class.</textarea> 
    6     <a href="javascript:;" class="visual_toggle" onclick="$(this).hide();$('.mceEditor').tinymce().show();$('.html_toggle').show();" style="display:none">[Visual]</a> 
    7     <a href="javascript:;" class="html_toggle" onclick="$(this).hide();$('.mceEditor').tinymce().hide();$('.visual_toggle').show();">[HTML]</a>     
     6    <a href="javascript:void(0);" class="visual_toggle" onclick="$(this).hide();$('.mceEditor').tinymce().show();$('.html_toggle').show();" style="display:none">[Visual]</a> 
     7    <a href="javascript:void(0);" class="html_toggle" onclick="$(this).hide();$('.mceEditor').tinymce().hide();$('.visual_toggle').show();">[HTML]</a>     
    88</div> 
    99 
Note: See TracChangeset for help on using the changeset viewer.