Revert changes on textVideo

thexerteproject · May 9, 2015 · 96d01a8 · 96d01a8
1 parent 13f51c9
commit 96d01a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd b/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
@@ -386,6 +386,7 @@
     <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"/>
+    <trackingWeight label="Tracking Score Weight (0=Off)" optional="true" type="textInput" width="120" defaultValue="1.0"/>
 
     <newNodes>
       <category><![CDATA[<category name="category name"/>]]></category>
@@ -2047,9 +2048,7 @@
 
     <startFrame label="Start Time" type="textInput" defaultValue="0" optional="true" tooltip="Enter the start frame in seconds"/>
     <endFrame label="End Time" type="textInput" defaultValue="0" optional="true" tooltip="enter the end frame in seconds"/>
-    <movieSize label="Video Size" type="textInput" defaultValue="320,240" optional="true" deprecated="Replaced by separate width and height options"/>
-    <width label="Video Width" type="textInput" defaultValue="320" optional="true"/>
-    <height label="Video Height" type="textInput" defaultValue="240" optional="true"/>
+    <movieSize label="Video Size" type="textInput" defaultValue="320,240" optional="true"/>
     <transcript label="Transcript" type="textArea" height="150" optional="true"/>
 
     <narrationNavigate label="Navigate on narration" type="CheckBox" defaultValue="false" optional="true"/>

diff --git a/src/Nottingham/wizards/en-GB/textVideo.xwd b/src/Nottingham/wizards/en-GB/textVideo.xwd
@@ -1 +1 @@
-<wizard menus="Media">  <pageWizard remove="true" duplicate="false">    <newNodes>          <textVideo><![CDATA[<textVideo name="Enter Page Title" align="Left" url="Select a Video" tip="Enter a Description for Accessibility" reset="true" transcriptTabTxt="Transcript" transcriptTabTip="Transcript" transcriptTabWidth="90">Enter text for the page here</textVideo>]]></textVideo>    </newNodes>  	    </pageWizard>  <!-- TEXT VIDEO============================================= -->  <textVideo menu="Media" menuItem="Video" hint="A page for integrating FLV video files with your presentation" label="Page Text" icon="icPageWhiteFilm"  thumb="thumbs/textVideo.jpg" type="text"  height="180"  remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true" />    <align label="Align Text" options="Left,Right,Top,Bottom" type="ComboBox"  data="Left,Right,Top,Bottom" defaultValue="Left" width="100"/>    <url label="Video" type="media" />    <tip label="Video Description" type="TextInput" />	    <reset label="Reset on Completion" type="Checkbox" defaultValue="false"/>	    <transcriptTabTxt label="Transcript Tab Label" type="TextInput" wysiwyg="true" divider="true" language="true" />    <transcriptTabTip label="Check Button Tip" type="textInput" language="true" />	    <transcriptTabWidth label="Check Button Width" type="NumericStepper" min="80" max="150" step="10" width="100" defaultValue="90" language="true" />		    <startFrame label="Start Time" type="textInput" defaultValue="0" optional="true" tooltip="Enter the start frame in seconds"/>    <endFrame label="End Time" type="textInput" defaultValue="0" optional="true" tooltip="enter the end frame in seconds"/>    <movieSize label="Video Size" type="textInput" defaultValue="320,240" optional="true" deprecated="Replaced by separate width and height options" />    <width label="Video Width" type="textInput" defaultValue="320" optional="true"/>    <height label="Video Height" type="textInput" defaultValue="240" optional="true"/>    <transcript label="Transcript" type="textArea" height="150"  optional="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" />  </textVideo></wizard>
+<wizard menus="Media">  <pageWizard remove="true" duplicate="false">    <newNodes>          <textVideo><![CDATA[<textVideo name="Enter Page Title" align="Left" url="Select a Video" tip="Enter a Description for Accessibility" reset="true" transcriptTabTxt="Transcript" transcriptTabTip="Transcript" transcriptTabWidth="90">Enter text for the page here</textVideo>]]></textVideo>    </newNodes>  	    </pageWizard>  <!-- TEXT VIDEO============================================= -->  <textVideo menu="Media" menuItem="Video" hint="A page for integrating FLV video files with your presentation" label="Page Text" icon="icPageWhiteFilm"  thumb="thumbs/textVideo.jpg" type="text"  height="180"  remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true" />    <align label="Align Text" options="Left,Right,Top,Bottom" type="ComboBox"  data="Left,Right,Top,Bottom" defaultValue="Left" width="100"/>    <url label="Video" type="media" />    <tip label="Video Description" type="TextInput" />	    <reset label="Reset on Completion" type="Checkbox" defaultValue="false"/>	    <transcriptTabTxt label="Transcript Tab Label" type="TextInput" wysiwyg="true" divider="true" language="true" />    <transcriptTabTip label="Check Button Tip" type="textInput" language="true" />	    <transcriptTabWidth label="Check Button Width" type="NumericStepper" min="80" max="150" step="10" width="100" defaultValue="90" language="true" />		    <startFrame label="Start Time" type="textInput" defaultValue="0" optional="true" tooltip="Enter the start frame in seconds"/>    <endFrame label="End Time" type="textInput" defaultValue="0" optional="true" tooltip="enter the end frame in seconds"/>    <movieSize label="Video Size" type="textInput" defaultValue="320,240" optional="true" />    <transcript label="Transcript" type="textArea" height="150"  optional="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" />  </textVideo></wizard>