Fix #390

thexerteproject · Oct 21, 2015 · 6ca519f · 6ca519f
1 parent d959692
commit 6ca519f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 3 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/data.xwd b/modules/xerte/parent_templates/Nottingham/data.xwd
@@ -168,6 +168,7 @@
     <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
     <initObject label="Init Object" type="TextInput" optional="true" flashonly="true" deprecated="This property is deprecated"/>
 	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>
+	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->
 
   </nestedPage><annotatedDiagram menu="Interactivity" menuItem="Annotated Diagram" hint="An interaction for exploring labelled diagrams." icon="icPageWhiteStar" remove="true" thumb="thumbs/annotatedDiagram.jpg">
 
@@ -808,6 +809,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"/>
+	<casesensitive label="Case Sensitive" defaultValue="false" type="CheckBox" optional="true" tooltip="Treat fill in the gap exercise answers as case sensitive"/>
 
   </gapFill><geocommons menu="Misc" menuItem="GeoCommons Map" hint="Embed GeoCommons Maps" icon="icGeoComm" thumb="thumbs/googleMap.jpg" remove="true" deprecated="This page is no longer supported">
 

diff --git a/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd b/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
@@ -168,6 +168,7 @@
     <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
     <initObject label="Init Object" type="TextInput" optional="true" flashonly="true" deprecated="This property is deprecated"/>
 	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>
+	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->
 
   </nestedPage><annotatedDiagram menu="Interactivity" menuItem="Annotated Diagram" hint="An interaction for exploring labelled diagrams." icon="icPageWhiteStar" remove="true" thumb="thumbs/annotatedDiagram.jpg">
 

diff --git a/src/Nottingham/wizards/en-GB/accNav.xwd b/src/Nottingham/wizards/en-GB/accNav.xwd
@@ -1 +1 @@
-<wizard menus="Navigators">  <pageWizard remove="true" duplicate="false">    <newNodes>          <accNav><![CDATA[<accNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></accNav>    </newNodes>  	    </pageWizard>    <!-- ACCORDION NAVIGATOR=================================================== -->  <accNav menu="Navigators" menuItem="Accordion Navigator" hint="A group of panes to present related text and graphical content." icon="icAccordion"  thumb="thumbs/accNav.jpg"  remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox"  data="Small,Medium,Large,Full" defaultValue="Small" width="100"/>    <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" />	    <newNodes>      <nestedPage><![CDATA[<nestedPage name="Enter Title Here" text="Content for the pane" align="Top"/>]]></nestedPage>    </newNodes>	  </accNav>  <nestedPage menuItem="Nested Page" icon="icBullet" remove="true">    <name label="Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <align label="Align Text" options="Top,Bottom" type="ComboBox" data="Top,Bottom" defaultValue="Top" width="100"/>	    <url label="Image" type="media"  optional="true"/>    <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>    <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>  </nestedPage> </wizard>
+<wizard menus="Navigators">  <pageWizard remove="true" duplicate="false">    <newNodes>          <accNav><![CDATA[<accNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></accNav>    </newNodes>  	    </pageWizard>    <!-- ACCORDION NAVIGATOR=================================================== -->  <accNav menu="Navigators" menuItem="Accordion Navigator" hint="A group of panes to present related text and graphical content." icon="icAccordion"  thumb="thumbs/accNav.jpg"  remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox"  data="Small,Medium,Large,Full" defaultValue="Small" width="100"/>    <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" />	    <newNodes>      <nestedPage><![CDATA[<nestedPage name="Enter Title Here" text="Content for the pane" align="Top"/>]]></nestedPage>    </newNodes>	  </accNav>  <nestedPage menuItem="Nested Page" icon="icBullet" remove="true">    <name label="Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <align label="Align Text" options="Top,Bottom" type="ComboBox" data="Top,Bottom" defaultValue="Top" width="100"/>	    <url label="Image" type="media"  optional="true"/>    <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>    <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->  </nestedPage> </wizard>

diff --git a/src/Nottingham/wizards/en-GB/buttonNav.xwd b/src/Nottingham/wizards/en-GB/buttonNav.xwd
@@ -34,6 +34,7 @@
     <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
     <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>
 	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>
+	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->
 
   </nestedPage>   
 

diff --git a/src/Nottingham/wizards/en-GB/columnPage.xwd b/src/Nottingham/wizards/en-GB/columnPage.xwd
@@ -33,6 +33,7 @@
     <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
     <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>
 	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>
+	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->
 
   </nestedPage> 
 

diff --git a/src/Nottingham/wizards/en-GB/slideshow.xwd b/src/Nottingham/wizards/en-GB/slideshow.xwd
@@ -1 +1 @@
-<wizard menus="Navigators">  <pageWizard remove="true" duplicate="false">    <newNodes>      <slideshow><![CDATA[<slideshow name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium" nextBtnTip="Next" priorBtnTip="Previous" slideCount="Slide {i} of {n}"/>]]></slideshow>    </newNodes>  </pageWizard>  <!-- SLIDESHOW======================= -->  <slideshow menu="Navigators" menuItem="Slideshow" hint="A sequence of pages of related text and graphical content navigated with two arrow controls." icon="icPages" thumb="thumbs/slideNav.jpg" sortChildren="true" remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true"/>    <text label="Text" type="TextArea" height="250"/>    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>    <nextBtnTip label="Next Button Tip" type="textInput" divider="true" language="true"/>	    <priorBtnTip label="Previous Button Tip" type="textInput" language="true"/>    <slideCount label="Slide {i} of {n} slides" type="TextInput" wysiwyg="true" 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" />    <newNodes>      <nestedPage><![CDATA[<nestedPage name="Enter Title Here" text="Content for the pane" align="Top"/>]]></nestedPage>    </newNodes>  </slideshow>  <nestedPage menuItem="Nested Page" icon="icBullet" remove="true">    <name label="Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <align label="Align Text" options="Top,Bottom" type="ComboBox" data="Top,Bottom" defaultValue="Top" width="100"/>	    <url label="Image" type="media"  optional="true"/>    <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>    <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>  </nestedPage> </wizard>
+<wizard menus="Navigators">  <pageWizard remove="true" duplicate="false">    <newNodes>      <slideshow><![CDATA[<slideshow name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium" nextBtnTip="Next" priorBtnTip="Previous" slideCount="Slide {i} of {n}"/>]]></slideshow>    </newNodes>  </pageWizard>  <!-- SLIDESHOW======================= -->  <slideshow menu="Navigators" menuItem="Slideshow" hint="A sequence of pages of related text and graphical content navigated with two arrow controls." icon="icPages" thumb="thumbs/slideNav.jpg" sortChildren="true" remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true"/>    <text label="Text" type="TextArea" height="250"/>    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>    <nextBtnTip label="Next Button Tip" type="textInput" divider="true" language="true"/>	    <priorBtnTip label="Previous Button Tip" type="textInput" language="true"/>    <slideCount label="Slide {i} of {n} slides" type="TextInput" wysiwyg="true" 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" />    <newNodes>      <nestedPage><![CDATA[<nestedPage name="Enter Title Here" text="Content for the pane" align="Top"/>]]></nestedPage>    </newNodes>  </slideshow>  <nestedPage menuItem="Nested Page" icon="icBullet" remove="true">    <name label="Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <align label="Align Text" options="Top,Bottom" type="ComboBox" data="Top,Bottom" defaultValue="Top" width="100"/>	    <url label="Image" type="media"  optional="true"/>    <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>    <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->  </nestedPage> </wizard>

diff --git a/src/Nottingham/wizards/en-GB/tabNav.xwd b/src/Nottingham/wizards/en-GB/tabNav.xwd
@@ -1 +1 @@
-<wizard menus="Navigators">  <pageWizard remove="true" duplicate="false">    <newNodes>      <tabNav><![CDATA[<tabNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></tabNav>    </newNodes>    </pageWizard>  <!-- TABBED NAVIGATOR=========================== -->  <tabNav menu="Navigators" menuItem="Tabbed Navigator" hint="A series of tabbed pages to present related text and graphical content." icon="icTab" thumb="thumbs/tabNav.jpg" remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true"/>    <text label="Text" type="TextArea" height="250"/>    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>    <tabWidth label="Tab Width" type="NumericStepper" min="20" max="250" step="10" width="100" defaultValue="100" deprecated="Width is now set automatically"/>    <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" />    <newNodes>      <nestedPage><![CDATA[<nestedPage name="Enter Title Here" text="Content for the pane" align="Top"/>]]></nestedPage>    </newNodes>  </tabNav>    <nestedPage menuItem="Nested Page" icon="icBullet" remove="true">    <name label="Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <align label="Align Text" options="Top,Bottom" type="ComboBox" data="Top,Bottom" defaultValue="Top" width="100"/>	    <url label="Image" type="media"  optional="true"/>    <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>    <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>  </nestedPage>    </wizard>
+<wizard menus="Navigators">  <pageWizard remove="true" duplicate="false">    <newNodes>      <tabNav><![CDATA[<tabNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></tabNav>    </newNodes>    </pageWizard>  <!-- TABBED NAVIGATOR=========================== -->  <tabNav menu="Navigators" menuItem="Tabbed Navigator" hint="A series of tabbed pages to present related text and graphical content." icon="icTab" thumb="thumbs/tabNav.jpg" remove="true">    <name label="Page Title" type="TextInput" wysiwyg="true"/>    <text label="Text" type="TextArea" height="250"/>    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>    <tabWidth label="Tab Width" type="NumericStepper" min="20" max="250" step="10" width="100" defaultValue="100" deprecated="Width is now set automatically"/>    <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" />    <newNodes>      <nestedPage><![CDATA[<nestedPage name="Enter Title Here" text="Content for the pane" align="Top"/>]]></nestedPage>    </newNodes>  </tabNav>    <nestedPage menuItem="Nested Page" icon="icBullet" remove="true">    <name label="Title" type="TextInput" wysiwyg="true" />    <text label="Text" type="TextArea" height="250" />    <align label="Align Text" options="Top,Bottom" type="ComboBox" data="Top,Bottom" defaultValue="Top" width="100"/>	    <url label="Image" type="media"  optional="true"/>    <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>    <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->  </nestedPage>    </wizard>

diff --git a/src/Nottingham/wizards/en-GB/tabNavExtra.xwd b/src/Nottingham/wizards/en-GB/tabNavExtra.xwd
@@ -54,6 +54,7 @@
     <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
     <initObject label="Init Object" type="TextInput"  optional="true" flashonly="true" deprecated="This property is deprecated"/>
 	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>
+	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->
 
   </nestedPage>  
 

diff --git a/src/Nottingham/wizards/en-GB/template.xwd b/src/Nottingham/wizards/en-GB/template.xwd
@@ -168,6 +168,7 @@
     <tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
     <initObject label="Init Object" type="TextInput" optional="true" flashonly="true" deprecated="This property is deprecated"/>
 	<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true" deprecated="This property is deprecated"/>
+	<synch label="Synch Point" type="TextInput"/><!-- for backwards compatibility with templates that used to use nestedPage -->
 
   </nestedPage><annotatedDiagram menu="Interactivity" menuItem="Annotated Diagram" hint="An interaction for exploring labelled diagrams." icon="icPageWhiteStar" remove="true" thumb="thumbs/annotatedDiagram.jpg">