Oops forgot to commit xerte/edithtml and several other changes of last

commit
thexerteproject · Jun 23, 2014 · a5dfc8b · a5dfc8b
1 parent e7526bb
commit a5dfc8b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/modules/site/parent_templates/site/data.xwd b/modules/site/parent_templates/site/data.xwd
@@ -79,7 +79,7 @@
 
 	</text>
 
-	<canvas icon="icPallette" menuItem="Canvas" label="Canvas" remove="true" advanced="true">
+	<canvas icon="icPallette" menuItem="Canvas" remove="true" advanced="true">
 
 		<name type="TextInput" label="Name"/>
 		<id type="TextInput" label="ID"/>
@@ -96,22 +96,22 @@
 
 	</script>
 
-	<image icon="icImage" height="250" menuItem="Image" label="Text" remove="true">
+	<image icon="icImage" height="250" menuItem="Image" remove="true">
 
 		<name type="TextInput" label="Name"/>
 		<url type="Media" label="Image File"/>
 		<alt type="TextInput" label="Alt Text"/>
 
 	</image>
 
-	<audio icon="icSound" height="250" menuItem="Audio" label="Text" remove="true">
+	<audio icon="icSound" height="250" menuItem="Audio" remove="true">
 
 		<name type="TextInput" label="Name"/>
 		<url type="Media" label="Image File"/>
 
 	</audio>
 
-	<video icon="icFilm" height="250" menuItem="Video" label="Text" remove="true">
+	<video icon="icFilm" height="250" menuItem="Video" remove="true">
 
 		<name type="TextInput" label="Name"/>
 		<url type="Media" label="Image File"/>

diff --git a/modules/xerte/edithtml.php b/modules/xerte/edithtml.php
@@ -58,6 +58,8 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers
 
     $preview_url = $xerte_toolkits_site->users_file_area_short . $row_edit['template_id'] . "-" . $row_username['username'] . "-" . $row_edit['template_name'] . "/" . $preview_filename;
 
+    $data_url = $xerte_toolkits_site->users_file_area_short . $row_edit['template_id'] . "-" . $row_username['username'] . "-" . $row_edit['template_name'] . "/data.xml";
+
     $rlo_url = $media_url = $xerte_toolkits_site->site_url .  $xerte_toolkits_site->users_file_area_short . $row_edit['template_id'] . "-" . $row_username['username'] . "-" . $row_edit['template_name'];
 
     $media_path = $xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_username['username'] . "-" . $row_edit['template_name'] . "/media/";
@@ -131,6 +133,8 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers
     <link rel="stylesheet" type="text/css" href="editor/js/vendor/featherlight/featherlight.min.css" />
     <link rel="stylesheet" type="text/css" href="editor/js/vendor/imgareaselect/imgareaselect-default.css" />
     <link rel="stylesheet" type="text/css" href="editor/js/vendor/jqgrid/css/ui.jqgrid.css" />
+    <link rel="stylesheet" type="text/css" href="editor/js/vendor/ckeditor/plugins/codemirror/css/codemirror.min.css" />
+
     <script src="website_code/scripts/template_management.js"></script>
     <!--[if lte IE 7]>
     <style type="text/css"> body { font-size: 85%; } </style>
@@ -223,6 +227,14 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers
 <script type="text/javascript" src="<?php echo $jqgridlangfile; ?>"></script>
 <script type="text/javascript" src="editor/js/vendor/jqgrid/js/jquery.jqGrid.min.js"></script>
 
+<!-- load exactly the same codemirror scripts as needed by ckeditor -->
+<script type="text/javascript" src="editor/js/vendor/ckeditor/plugins/codemirror/js/codemirror.min.js"></script>
+<script type="text/javascript" src="editor/js/vendor/ckeditor/plugins/codemirror/js/codemirror.addons.min.js"></script>
+<script type="text/javascript" src="editor/js/vendor/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js"></script>
+<script type="text/javascript" src="editor/js/vendor/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js"></script>
+<script type="text/javascript" src="editor/js/vendor/ckeditor/plugins/codemirror/js/beautify.min.js"></script>
+<script type="text/javascript" src="editor/js/vendor/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js"></script>
+
 <script>
     <?php
     $_SESSION['KCFINDER']= array(
@@ -233,7 +245,8 @@ function output_editor_code($row_edit, $xerte_toolkits_site, $read_status, $vers
 
 
 
-    echo "xmlvariable=\"" . $preview_url . "\";\n";
+    echo "previewxmlurl=\"" . $preview_url . "\";\n";
+    echo "dataxmlurl=\"" . $data_url . "\";\n";
     echo "mediavariable=\"" . $media_path . "\";\n";
     echo "mediaurlvariable=\"" . $media_url . "\";\n";
     echo "languagecodevariable=\""  . $_SESSION['toolkits_language'] . "\";\n";

diff --git a/src/Nottingham/wizards/en-GB/hangman.xwd b/src/Nottingham/wizards/en-GB/hangman.xwd
@@ -12,7 +12,7 @@
   <hangman menu="Games" menuItem="Hangman" hint="A Hangman game. Create a list of words for the learner to work out." icon="icPageWhite" thumb="thumbs/hangman.jpg" remove="true">
     <name label="Page Title" type="TextInput"/>
     <text label="Instructions" type="TextArea" height="100"/>
-    <words label="Words" type="TextArea" height="100"/>
+    <words label="Words" type="script" height="100"/>
 
 	<nextBtnTxt label="Next Button Label" type="textInput" divider="true" language="true" />
     <nextBtnTip label="Next Button Tip" type="textInput" language="true" />		

diff --git a/src/Nottingham/wizards/en-GB/modify.xwd b/src/Nottingham/wizards/en-GB/modify.xwd
@@ -1 +1 @@
-<wizard menus="Interactivity">  <pageWizard remove="true" duplicate="false">    <newNodes>      <modify><![CDATA[<modify name="Enter Title"  instruction="Provide instructions here" text="Provide initial text here" prompt="provide a prompt" answer="Provide a model answer here"	   answerHeaderTxt="Write your answer here:" feedbackBtnTxt="Feedback" feedbackBtnTip="Feedback" feedbackBtnWidth="80"	  />]]></modify>    </newNodes>  </pageWizard>  <!-- MODIFY INTERACTION============================== -->  <modify menu="Interactivity" menuItem="Modify Exercise" hint="Presents a piece of text that the user must modify in some way, for example, by changing the tense." icon="icModify" thumb="thumbs/modify.jpg" remove="true">        <name label="Page Title" type="TextInput"/>    <instruction label="Instruction" type="TextArea" height="100"/>    <text label="Initial Text" type="TextArea" height="100"/>    <prompt label="Answer Prompt" type="TextArea" height="100"/>    <answer label="Model Answer" type="TextArea" height="100"/>    <answerHeaderTxt label="Instruction Header" type="textInput" divider="true" language="true" />		    <feedbackBtnTxt label="Button Label" type="textInput" language="true" />    <feedbackBtnTip label="Button Tip" type="textInput" language="true" />	    <feedbackBtnWidth label="Button Width" type="NumericStepper" min="80" max="250" step="10" width="100" defaultValue="100" language="true" />	    <narrationNavigate label="Navigate on narration" type="CheckBox" defaultValue="false" optional="true"/>    <playNarration label="Auto-play narration" type="CheckBox" defaultValue="false" optional="true"/>    <narration label="Narration" type="media"  optional="true"/>    <navSetting label="Navigation Buttons" options="All,Back and Next,Back Only,Next Only,None" type="ComboBox" width="120" data="all,backnext,backonly,nextonly,none" defaultValue="all" optional="true"/>    <pageID label="Page ID" defaultValue="Unique ID for this page" type="TextInput" optional="true" />	<timer label="Page Timer" defaultValue="60" type="NumericStepper" min="0" max="1200" step="1" width="100" optional="true" />  </modify></wizard>
+<wizard menus="Interactivity">  <pageWizard remove="true" duplicate="false">    <newNodes>      <modify><![CDATA[<modify name="Enter Title"  instruction="Provide instructions here" text="Provide initial text here" prompt="provide a prompt" answer="Provide a model answer here"	   answerHeaderTxt="Write your answer here:" feedbackBtnTxt="Feedback" feedbackBtnTip="Feedback" feedbackBtnWidth="80"	  />]]></modify>    </newNodes>  </pageWizard>  <!-- MODIFY INTERACTION============================== -->  <modify menu="Interactivity" menuItem="Modify Exercise" hint="Presents a piece of text that the user must modify in some way, for example, by changing the tense." icon="icModify" thumb="thumbs/modify.jpg" remove="true">        <name label="Page Title" type="TextInput"/>    <instruction label="Instruction" type="TextArea" height="100"/>    <text label="Initial Text" type="script" height="100"/>    <prompt label="Answer Prompt" type="script" height="100"/>    <answer label="Model Answer" type="script" height="100"/>    <answerHeaderTxt label="Instruction Header" type="textInput" divider="true" language="true" />		    <feedbackBtnTxt label="Button Label" type="textInput" language="true" />    <feedbackBtnTip label="Button Tip" type="textInput" language="true" />	    <feedbackBtnWidth label="Button Width" type="NumericStepper" min="80" max="250" step="10" width="100" defaultValue="100" language="true" />	    <narrationNavigate label="Navigate on narration" type="CheckBox" defaultValue="false" optional="true"/>    <playNarration label="Auto-play narration" type="CheckBox" defaultValue="false" optional="true"/>    <narration label="Narration" type="media"  optional="true"/>    <navSetting label="Navigation Buttons" options="All,Back and Next,Back Only,Next Only,None" type="ComboBox" width="120" data="all,backnext,backonly,nextonly,none" defaultValue="all" optional="true"/>    <pageID label="Page ID" defaultValue="Unique ID for this page" type="TextInput" optional="true" />	<timer label="Page Timer" defaultValue="60" type="NumericStepper" min="0" max="1200" step="1" width="100" optional="true" />  </modify></wizard>

diff --git a/src/Nottingham/wizards/en-GB/template.xwd b/src/Nottingham/wizards/en-GB/template.xwd
@@ -810,7 +810,7 @@
   </geocommons><hangman menu="Games" menuItem="Hangman" hint="A Hangman game. Create a list of words for the learner to work out." icon="icPageWhite" thumb="thumbs/hangman.jpg" remove="true">
     <name label="Page Title" type="TextInput"/>
     <text label="Instructions" type="TextArea" height="100"/>
-    <words label="Words" type="TextArea" height="100"/>
+    <words label="Words" type="script" height="100"/>
 
 	<nextBtnTxt label="Next Button Label" type="textInput" divider="true" language="true"/>
     <nextBtnTip label="Next Button Tip" type="textInput" language="true"/>		
@@ -1190,9 +1190,9 @@
 
     <name label="Page Title" type="TextInput"/>
     <instruction label="Instruction" type="TextArea" height="100"/>
-    <text label="Initial Text" type="TextArea" height="100"/>
-    <prompt label="Answer Prompt" type="TextArea" height="100"/>
-    <answer label="Model Answer" type="TextArea" height="100"/>
+    <text label="Initial Text" type="script" height="100"/>
+    <prompt label="Answer Prompt" type="script" height="100"/>
+    <answer label="Model Answer" type="script" height="100"/>
 
     <answerHeaderTxt label="Instruction Header" type="textInput" divider="true" language="true"/>		
     <feedbackBtnTxt label="Button Label" type="textInput" language="true"/>