Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix #334 - deprecated video dimensions optional property. I'll make a…
… new navigator page at some point and get media working properly in it.
  • Loading branch information
FayCross committed Jun 18, 2015
1 parent f47e955 commit a99b0af
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
20 changes: 10 additions & 10 deletions modules/xerte/parent_templates/Nottingham/data.xwd
Expand Up @@ -46,7 +46,7 @@
navSetting="none"
confirmBtnTxt="Confirm"
notFoundMessage="could not be found in this project."
notSetMessage="A destination page has not been set for this connection" />]]></cMcq><captivate><![CDATA[<captivate name="Enter Page Title" url="Select a Captivate SWF File"/>]]></captivate><categories><![CDATA[<categories name="Enter Page Title" text="Enter text for the page here" feedback="Enter feedback here" buttonLabel="Check Answers"/>]]></categories><chart><![CDATA[<chart name="Enter Page Title" chartTitle="Chart Title" chartType="line" text="Enter Page Text" align="left"/>]]></chart><columnPage><![CDATA[<columnPage name="Column Page"/>]]></columnPage><connectorHotspotImage><![CDATA[<connectorHotspotImage name="Enter Page Title" text="Enter text for the page here" textWidth="narrow" url="Select an Image" tip="Enter a Description for Accessibility" hidePanel="false" highlight="false" hicol="0xFFFF00" align="Left" navSetting="none"
notSetMessage="A destination page has not been set for this connection" />]]></cMcq><captivate><![CDATA[<captivate name="Enter Page Title" url="Select a Captivate SWF File"/>]]></captivate><categories><![CDATA[<categories name="Enter Page Title" text="Enter text for the page here" feedback="Enter feedback here" buttonLabel="Check Answers"/>]]></categories><chart><![CDATA[<chart name="Enter Page Title" chartTitle="Chart Title" chartType="line" text="Enter Page Text" align="left"/>]]></chart><columnPage><![CDATA[<columnPage name="Enter Page Title"/>]]></columnPage><connectorHotspotImage><![CDATA[<connectorHotspotImage name="Enter Page Title" text="Enter text for the page here" textWidth="narrow" url="Select an Image" tip="Enter a Description for Accessibility" hidePanel="false" highlight="false" hicol="0xFFFF00" align="Left" navSetting="none"
notFoundMessage="could not be found in this project." continueBtnTxt="Close" />]]></connectorHotspotImage><connectorMenu><![CDATA[<connectorMenu name="Enter Page Title" navSetting="none" reportTitle="List of page titles and matching pageIDs" pageLabel="Page No" titleLabel="Title:" idLabel="linkID:" />]]></connectorMenu><customHotspots><![CDATA[<customHotspots name="Enter Page Title" text="Enter text for the page here" highlightColour="0xFFFF00" lineWidth="1" interactivity="Hotspots" showShapes="true"
hotspotsTxt="Explore the diagram. Click on the various parts to learn more."
labelsTxt="Drag the pins for each label to the correct position in the diagram. You can re-position the labels if required."
Expand Down Expand Up @@ -165,8 +165,8 @@

<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"/>
<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true"/>
<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><annotatedDiagram menu="Interactivity" menuItem="Annotated Diagram" hint="An interaction for exploring labelled diagrams." icon="icPageWhiteStar" remove="true" thumb="thumbs/annotatedDiagram.jpg">

Expand Down Expand Up @@ -458,20 +458,20 @@
</connectorHotspotImage><cHotspot menuItem="Hotspot" label="Edit Hotspot" type="hotSpot" icon="icLayers" remove="true">
<name label="Title" type="TextInput" wysiwyg="true"/>

<destination label="Destination Page" type="pageList" defaultValue="" optional="true"/>
<destination label="Destination Page" type="pageList" defaultValue="" optional="true" tooltip="Go to a page with this object"/>
<hotspotSound label="Sound" type="media" optional="true"/>
<hotspotMovie label="Video" type="media" optional="true"/>
<startFrame label="Video Start Time" type="textInput" defaultValue="0" optional="true"/>
<endFrame label="Video End Time" type="textInput" defaultValue="0" optional="true"/>
<movieSize label="Video Size (w,h)" type="textInput" defaultValue="320,240" optional="true"/>
<tip label="Video Description" type="TextInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
<reset label="Video Reset at End" type="Checkbox" defaultValue="false" optional="true" deprecated="This property is no longer required"/>
<windowURL label="URL of External Page" type="TextInput" optional="true"/>
<windowWidth label="URL Window Width" type="NumericStepper" min="100" max="1030" step="10" defaultValue="550" width="100" optional="true"/>
<windowHeight label="URL Window Height" type="NumericStepper" min="100" max="1030" step="10" defaultValue="400" width="100" optional="true"/>
<htm label="URL HTML" type="textArea" height="150" optional="true"/>
<relNav label="Relative Connection" options="First Page,Previous Page,Next Page,Last Page" type="ComboBox" data="first,prev,next,last" defaultValue="next" width="200" optional="true"/>
<hotspotPopUp label="Text Pop-Up" type="TextArea" height="200" optional="true"/>
<windowURL label="New Window URL" type="TextInput" optional="true" tooltip="Open the given URL in a new window"/>
<windowWidth label="New Window Width" type="NumericStepper" min="100" max="1030" step="10" defaultValue="550" width="100" optional="true"/>
<windowHeight label="New Window Height" type="NumericStepper" min="100" max="1030" step="10" defaultValue="400" width="100" optional="true"/>
<htm label="New Window HTML" type="textArea" height="150" optional="true" tooltip="Display the given HTML in a new window"/>
<relNav label="Relative Destination Page" options="First Page,Previous Page,Next Page,Last Page" type="ComboBox" data="first,prev,next,last" defaultValue="next" width="200" optional="true" tooltip="Go to a relative page (i.e. next)"/>
<hotspotPopUp label="Pop-Up HTML" type="TextArea" height="200" optional="true" tooltip="Display the given HTML in a popup window"/>
</cHotspot><connectorMenu menu="Connectors" menuItem="Menu Connector" hint="A page that generates a menu of all or a selected range of the pages in a project" icon="icConMenu" thumb="thumbs/connectorMenu.jpg" remove="true">

<name label="Page Title" type="TextInput" wysiwyg="true"/>
Expand Down
Expand Up @@ -46,7 +46,7 @@
navSetting="none"
confirmBtnTxt="Confirm"
notFoundMessage="could not be found in this project."
notSetMessage="A destination page has not been set for this connection" />]]></cMcq><captivate><![CDATA[<captivate name="Enter Page Title" url="Select a Captivate SWF File"/>]]></captivate><categories><![CDATA[<categories name="Enter Page Title" text="Enter text for the page here" feedback="Enter feedback here" buttonLabel="Check Answers"/>]]></categories><chart><![CDATA[<chart name="Enter Page Title" chartTitle="Chart Title" chartType="line" text="Enter Page Text" align="left"/>]]></chart><columnPage><![CDATA[<columnPage name="Column Page"/>]]></columnPage><connectorHotspotImage><![CDATA[<connectorHotspotImage name="Enter Page Title" text="Enter text for the page here" textWidth="narrow" url="Select an Image" tip="Enter a Description for Accessibility" hidePanel="false" highlight="false" hicol="0xFFFF00" align="Left" navSetting="none"
notSetMessage="A destination page has not been set for this connection" />]]></cMcq><captivate><![CDATA[<captivate name="Enter Page Title" url="Select a Captivate SWF File"/>]]></captivate><categories><![CDATA[<categories name="Enter Page Title" text="Enter text for the page here" feedback="Enter feedback here" buttonLabel="Check Answers"/>]]></categories><chart><![CDATA[<chart name="Enter Page Title" chartTitle="Chart Title" chartType="line" text="Enter Page Text" align="left"/>]]></chart><columnPage><![CDATA[<columnPage name="Enter Page Title"/>]]></columnPage><connectorHotspotImage><![CDATA[<connectorHotspotImage name="Enter Page Title" text="Enter text for the page here" textWidth="narrow" url="Select an Image" tip="Enter a Description for Accessibility" hidePanel="false" highlight="false" hicol="0xFFFF00" align="Left" navSetting="none"
notFoundMessage="could not be found in this project." continueBtnTxt="Close" />]]></connectorHotspotImage><connectorMenu><![CDATA[<connectorMenu name="Enter Page Title" navSetting="none" reportTitle="List of page titles and matching pageIDs" pageLabel="Page No" titleLabel="Title:" idLabel="linkID:" />]]></connectorMenu><customHotspots><![CDATA[<customHotspots name="Enter Page Title" text="Enter text for the page here" highlightColour="0xFFFF00" lineWidth="1" interactivity="Hotspots" showShapes="true"
hotspotsTxt="Explore the diagram. Click on the various parts to learn more."
labelsTxt="Drag the pins for each label to the correct position in the diagram. You can re-position the labels if required."
Expand Down Expand Up @@ -165,8 +165,8 @@

<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"/>
<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true"/>
<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><annotatedDiagram menu="Interactivity" menuItem="Annotated Diagram" hint="An interaction for exploring labelled diagrams." icon="icPageWhiteStar" remove="true" thumb="thumbs/annotatedDiagram.jpg">

Expand Down
2 changes: 1 addition & 1 deletion 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="The accordion navigator allows you to create 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"/> <movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true"/> </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="The accordion navigator allows you to create 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>
Expand Down
4 changes: 2 additions & 2 deletions src/Nottingham/wizards/en-GB/buttonNav.xwd
Expand Up @@ -32,8 +32,8 @@

<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"/>
<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true"/>
<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>

Expand Down
6 changes: 3 additions & 3 deletions src/Nottingham/wizards/en-GB/columnPage.xwd
@@ -1,7 +1,7 @@
<wizard menus="Navigators">
<pageWizard remove="true" duplicate="false">
<newNodes>
<columnPage><![CDATA[<columnPage name="Column Page"/>]]></columnPage>
<columnPage><![CDATA[<columnPage name="Enter Page Title"/>]]></columnPage>
</newNodes>
</pageWizard>

Expand Down Expand Up @@ -31,8 +31,8 @@

<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"/>
<movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true"/>
<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>

Expand Down

0 comments on commit a99b0af

Please sign in to comment.