Changeset 3048 for trunk


Ignore:
Timestamp:
08/11/10 15:39:16 (10 years ago)
Author:
tarmo
Message:

Syntax fixes.

Location:
trunk/skins/lemill
Files:
4 edited

Legend:

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

    r3045 r3048  
    2525                <tal:block metal:use-macro="here/multimediamaterial_edit/macros/minor_edit"/> 
    2626 
    27         <div style="margin-top:20px"> 
    2827            <tal:comment replace="nothing">XXX:Where is the origin of these buttons. don't special ones here anymore.</tal:comment> 
    2928        <tal:if_translation condition="translation"> 
  • trunk/skins/lemill/collection_edit.cpt

    r3045 r3048  
    7979                <tr tal:repeat="obj resources" class="choice_row"> 
    8080                   <tal:defines define="index repeat/obj/index; deleted obj/isDeleted"> 
    81 <<<<<<< .mine 
    82                     <td valign="top" style="border-right: 1px solid #8cacbb" width="20"><img src="images/sorthandle.png" width="20" height="20" valign="top" class="handle" /> 
    83                     <input type="hidden" class="orderkeeper" value="0" name="col_order_0" id="col_order_0" tal:attributes="value index;name python:'col_order_%s' % index" /></td>  
    84 ======= 
    8581                    <td valign="top" style="border-right: 1px solid #8cacbb" width="20"><img src="images/sorthandle.png" width="20" height="20" valign="top" class="handle"/> 
    8682                    <input type="hidden" class="orderkeeper" value="0" name="col_order_0" id="col_order_0" tal:attributes="value index;name python:'col_order_%s' % index"/></td>  
    87 >>>>>>> .r3043 
    8883 
    8984                    <td class="coverimage_cell_small"><img src="" alt="" class="coverimage_small" tal:attributes="src obj/getCoverImageURL; alt obj/title_or_id | nothing" /></td> 
  • trunk/skins/lemill/widget_chapter.pt

    r3045 r3048  
    5454              value python:field.confirmUpdated(value); 
    5555              chapter_count python:len(value); 
    56               edit_chapter python: test(edit_chapter<chapter_count, edit_chapter, chapter_count-1);             
     56              edit_chapter python: test(edit_chapter&lt;chapter_count, edit_chapter, chapter_count-1);             
    5757              cleaned_chapters here/getBodyText; 
    5858              macro_mapping python:{'text_block':'here/widget_chapter/macros/%s_text_block', 
  • trunk/skins/lemill/widget_exercise.pt

    r3045 r3048  
    316316   <table width="90%"> 
    317317     <tr><th><label i18n:translate="label_select_exercise_type">Select the exercise type:</label></th></tr> 
    318      <input type="hidden" id="chapter_type" name="chapter_type" value=""> 
     318     <input type="hidden" id="chapter_type" name="chapter_type" value="" /> 
    319319     <tr height="200"><td> 
    320320        <ul> 
     
    322322           <li><label><a href="void(0)" onclick="editQuestion('fill_blanks');"><tal:block i18n:translate="label_exercise_fill_in_the_blanks">Fill-in-the-blanks exercise</tal:block>...</a></label></li> 
    323323           <li><label><a href="void(0)" onclick="editQuestion('open_ended');"><tal:block i18n:translate="label_exercise_open_ended">Open-ended question</tal:block>...</a></label></li> 
    324            <li><label><a href="void(0)" onclick="editQuestion('potatoes_upload');"><tal:block i18n:translate="upload_questions_from_hot_potatoes">Upload questions from Hot Potatoes</tal:block>...</a><label></li> 
     324           <li><label><a href="void(0)" onclick="editQuestion('potatoes_upload');"><tal:block i18n:translate="upload_questions_from_hot_potatoes">Upload questions from Hot Potatoes</tal:block>...</a></label></li> 
    325325        </ul> 
    326326      </td></tr> 
     
    362362                /> 
    363363        </div> 
     364    </td></tr> 
    364365   <tr><td>   
    365366      <a href="void(0)" style="align:left" onclick="questionSelection();">&lt; <tal:block i18n:translate="exercise_types">Exercise types</tal:block></a></td> 
     
    436437       <td><div class="formHelp" i18n:translate="desc_answer">Answer</div></td> 
    437438       <td width="10"></td> 
     439    </tr> 
    438440      <tr class="sortable_row"> 
    439        <td><input type="radio" value="1" name="answer_0_correct" id="answer_0_correct" checked="1"></td>  
    440        <td><input type="radio" value="0" name="answer_0_correct" id="answer_0_correct"></td> 
     441       <td><input type="radio" value="1" name="answer_0_correct" id="answer_0_correct" checked="1"/></td>  
     442       <td><input type="radio" value="0" name="answer_0_correct" id="answer_0_correct"/></td> 
    441443       <td> 
    442444<textarea rows="2" style="height:3em;float:left;" cols="40" class="multiple_choice_answer" name="choice_answer_0" id="choice_answer_0"></textarea></td> 
    443445       <td valign="top"><span class="handle handle_small">&nbsp;</span> 
    444        <input type="hidden" class="orderkeeper" value="0" name="choice_order_0" id="choice_order_0"></td>  
     446       <input type="hidden" class="orderkeeper" value="0" name="choice_order_0" id="choice_order_0"/></td>  
    445447      </tr> 
    446448      <tr class="sortable_row">        
    447        <td><input type="radio" value="1" name="answer_1_correct" id="answer_1_correct"></td>  
    448        <td><input type="radio" value="0" name="answer_1_correct" id="answer_1_correct" checked="1"></td> 
     449       <td><input type="radio" value="1" name="answer_1_correct" id="answer_1_correct"/></td>  
     450       <td><input type="radio" value="0" name="answer_1_correct" id="answer_1_correct" checked="1"/></td> 
    449451       <td><textarea rows="2" style="height:3em;" cols="40" class="multiple_choice_answer" name="choice_answer_1" id="choice_answer_1"></textarea></td> 
    450452       <td valign="top"><span class="handle handle_small">&nbsp;</span> 
    451        <input type="hidden" class="orderkeeper" value="1" name="choice_order_1" id="choice_order_1"></td>  
     453       <input type="hidden" class="orderkeeper" value="1" name="choice_order_1" id="choice_order_1"/></td>  
    452454      </tr> 
    453455      <tr class="sortable_row">       
    454        <td><input type="radio" value="1" name="answer_2_correct" id="answer_2_correct"></td>  
    455        <td><input type="radio" value="0" name="answer_2_correct" id="answer_2_correct" checked="1"></td> 
     456       <td><input type="radio" value="1" name="answer_2_correct" id="answer_2_correct"/></td>  
     457       <td><input type="radio" value="0" name="answer_2_correct" id="answer_2_correct" checked="1"/></td> 
    456458       <td><textarea rows="2" style="height:3em;" cols="40" class="multiple_choice_answer" name="choice_answer_2" id="choice_answer_2"></textarea></td> 
    457459       <td valign="top"><span class="handle handle_small">&nbsp;</span> 
    458        <input type="hidden" class="orderkeeper" value="2" name="choice_order_2" id="choice_order_2"></td>  
     460       <input type="hidden" class="orderkeeper" value="2" name="choice_order_2" id="choice_order_2"/></td>  
    459461      </tr> 
    460462      <tr> 
    461463       <td></td><td></td><td align="right"><input type="button" i18n:attributes="value button_add_choices" value="Add choices" align="right" onclick="addAnswer(this);" /></td><td></td> 
    462       </tr>  
     464      </tr> 
    463465 
    464466    </table> 
Note: See TracChangeset for help on using the changeset viewer.