Changeset 3142 for trunk


Ignore:
Timestamp:
02/02/11 01:59:21 (9 years ago)
Author:
jukka
Message:

Several small fixes

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/ExerciseMaterial.py

    r3119 r3142  
    244244        body=[] 
    245245        students_name = to_unicode(REQUEST.get('your_name','')) 
    246         students_email = REQUEST.get('students_email','') 
    247         teachers_email = REQUEST.get('teachers_email','') 
     246        students_email = to_unicode(REQUEST.get('students_email','')) 
     247        teachers_email = to_unicode(REQUEST.get('teachers_email','')) 
    248248        captcha_c=REQUEST.get('recaptcha_challenge_field','') 
    249249        captcha_r=REQUEST.get('recaptcha_response_field','') 
  • trunk/LeMillTool.py

    r3138 r3142  
    127127            if tag=='pre':  
    128128                self.pre=True 
     129 
     130    def handle_startendtag(self, tag, attrs): 
     131        if self.pre or self.latex:  
     132            self.resdata.append(self.get_starttag_text()) 
     133            return 
     134        if tag in GOOD_TAGS: 
     135            good_attrs=GOOD_TAG_DICT[tag] 
     136            adats=[] 
     137            for key,value in attrs: 
     138                if key in good_attrs: 
     139                    adats.append(''.join((' ',key,'="',value,'"')))                 
     140            self.resdata.append(''.join(('<',tag,''.join(adats),'/>'))) 
     141 
    129142 
    130143    def handle_endtag(self, tag):         
  • trunk/skins/lemill/lemill_grid.css

    r3138 r3142  
    961961/*.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0} */ 
    962962.defaultSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0} 
    963 .defaultSkin .mceButtonDisabled {border:1px solid color:#ccc; opacity:0.2; } 
     963.defaultSkin .mceButtonDisabled {border:1px solid #ccc;} 
    964964 
    965965/*opacity:0.3; */ 
  • trunk/skins/lemill/master.js

    r3137 r3142  
    289289 $.getJSON("http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&callback=?&q="+url,function(data){ 
    290290    item=data.responseData.feed.entries[0]; 
    291     pd= new Date(Date.parse(item.publishedDate)); 
    292     html='<a href="'+item.link+'">'+item.title+'</a> ('+pd.getFullYear()+'-'+pd.getMonth()+'-'+pd.getDate()+')'; 
     291    pd= new Date(item.publishedDate); 
     292    html='<a href="'+item.link+'">'+item.title+'</a> ('+pd.getFullYear()+'-'+pd.getMonth()+1+'-'+pd.getDate()+')'; 
    293293    $("span#title_from_blog").html(html);                
    294294 }); 
  • trunk/skins/lemill/tiny_mce/themes/lemill/charmap.html

    r3137 r3142  
    22<html xmlns="http://www.w3.org/1999/xhtml"> 
    33<head> 
    4     <title>{#lemill.charmap_title}</title> 
     4    <title>Symbol map</title> 
    55    <script type="text/javascript" src="../../tiny_mce_popup.js"></script> 
    66    <script type="text/javascript" src="js/charmap.js"></script> 
  • trunk/skins/lemill/tiny_mce/themes/lemill/js/latex.js

    r3138 r3142  
    4242        tinyMCEPopup.execCommand("mceInsertContent", false, '<code class="latex">'+code+'<\code>{$caret}'); 
    4343    } else if (formObj.block.checked) { 
    44         tinyMCEPopup.execCommand("mceInsertContent", false, '<code class="latex">begin{equation}'+code+'\\end{equation}<\code>{$caret}'); 
     44        tinyMCEPopup.execCommand("mceInsertContent", false, '<code class="latex">\\begin{equation}'+code+'\\end{equation}<\code>{$caret}'); 
    4545    } 
    4646    // this is kind of cleanup. I don't know where that empty code-node comes from. 
  • trunk/skins/lemill/tiny_mce/themes/lemill/langs/en.js

    r3138 r3142  
    1818code:"Code", 
    1919charmap_desc:"Symbol map", 
     20charmap_title:"Symbol map", 
    2021link_title:"Insert/edit link", 
    2122link_url:"Link URL", 
  • trunk/skins/lemill/wysiwyg_support.pt

    r3138 r3142  
    22 
    33   <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" tal:define="area_id fieldName | inputname"> 
     4<style type="text/css"> 
     5.defaultSkin .mceButtonDisabled {border:1px solid; color:#ccc; opacity:0.2; } 
     6</style> 
    47<input type="hidden" id="portal_url" name="portal_url" tal:attributes="value portal_url" /> 
    58<textarea id="content1" name="content1" tal:attributes="id area_id; name area_id" tal:content="inputvalue" class="mceTextarea" cols="85" rows="30">This will be the editor, since it has a selector class.</textarea> 
  • trunk/version.txt

    r3133 r3142  
    1 3.0.11 
     13.0.12 
    22 
Note: See TracChangeset for help on using the changeset viewer.