Changeset 3048 for trunk/skins

Timestamp:

08/11/10 15:39:16 (1 year ago)

Author:

tarmo

Message:

Syntax fixes.

Files:

• trunk/skins/lemill/activity_edit.cpt (modified) (1 diff)
• trunk/skins/lemill/collection_edit.cpt (modified) (1 diff)
• trunk/skins/lemill/widget_chapter.pt (modified) (1 diff)
• trunk/skins/lemill/widget_exercise.pt (modified) (4 diffs)

trunk/skins/lemill/activity_edit.cpt

@@ -25 +25 @@
-                <tal:block metal:use-macro="here/multimediamaterial_edit/macros/minor_edit"/>
-
-        <div style="margin-top:20px">
-            <tal:comment replace="nothing">XXX:Where is the origin of these buttons. don't special ones here anymore.</tal:comment>
-        <tal:if_translation condition="translation">

trunk/skins/lemill/collection_edit.cpt

@@ -79 +79 @@
-                <tr tal:repeat="obj resources" class="choice_row">
-                   <tal:defines define="index repeat/obj/index; deleted obj/isDeleted">
-<<<<<<< .mine
-                    <td valign="top" style="border-right: 1px solid #8cacbb" width="20"><img src="images/sorthandle.png" width="20" height="20" valign="top" class="handle" />
-                    <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> 
-=======
-                    <td valign="top" style="border-right: 1px solid #8cacbb" width="20"><img src="images/sorthandle.png" width="20" height="20" valign="top" class="handle"/>
-                    <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> 
->>>>>>> .r3043
-
-                    <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

@@ -54 +54 @@
-              value python:field.confirmUpdated(value);
-              chapter_count python:len(value);
-<
+&lt;
-              cleaned_chapters here/getBodyText;
-              macro_mapping python:{'text_block':'here/widget_chapter/macros/%s_text_block',

trunk/skins/lemill/widget_exercise.pt

@@ -316 +316 @@
-   <table width="90%">
-     <tr><th><label i18n:translate="label_select_exercise_type">Select the exercise type:</label></th></tr>
-
+ /
-     <tr height="200"><td>
-        <ul>
@@ -322 +322 @@
-           <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>
-           <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>
-
+/
-        </ul>
-      </td></tr>
@@ -362 +362 @@
-                />
-        </div>
+    </td></tr>
-   <tr><td>  
-      <a href="void(0)" style="align:left" onclick="questionSelection();">&lt; <tal:block i18n:translate="exercise_types">Exercise types</tal:block></a></td>
@@ -436 +437 @@
-       <td><div class="formHelp" i18n:translate="desc_answer">Answer</div></td>
-       <td width="10"></td>
+    </tr>
-      <tr class="sortable_row">
-
-
+/
+/
-       <td>
-<textarea rows="2" style="height:3em;float:left;" cols="40" class="multiple_choice_answer" name="choice_answer_0" id="choice_answer_0"></textarea></td>
-       <td valign="top"><span class="handle handle_small">&nbsp;</span>
-
+/
-      </tr>
-      <tr class="sortable_row">       
-
-
+/
+/
-       <td><textarea rows="2" style="height:3em;" cols="40" class="multiple_choice_answer" name="choice_answer_1" id="choice_answer_1"></textarea></td>
-       <td valign="top"><span class="handle handle_small">&nbsp;</span>
-
+/
-      </tr>
-      <tr class="sortable_row">      
-
-
+/
+/
-       <td><textarea rows="2" style="height:3em;" cols="40" class="multiple_choice_answer" name="choice_answer_2" id="choice_answer_2"></textarea></td>
-       <td valign="top"><span class="handle handle_small">&nbsp;</span>
-
+/
-      </tr>
-      <tr>
-       <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>
- 
+
-
-    </table>