Skip to content

Commit

Permalink
Grouping of related optional properties in all page types
Browse files Browse the repository at this point in the history
  • Loading branch information
@FayCross
FayCross committed Mar 24, 2017
1 parent 2d0c653 commit c00a3fd
Show file tree
Hide file tree
Showing 24 changed files with 544 additions and 287 deletions.
242 changes: 159 additions & 83 deletions modules/xerte/parent_templates/Nottingham/data.xwd
View file

Large diffs are not rendered by default.

242 changes: 159 additions & 83 deletions modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/accNav.xwd
View file
@@ -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"/> <panelHeight label="Panel Height" options="Fill Space,Fit Content" type="ComboBox" data="fill,fit" defaultValue="fill" width="100" 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>
<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"/> <panelHeight label="Panel Height" options="Fill Space,Fit Content" type="ComboBox" data="fill,fit" defaultValue="fill" width="100" 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"/> <imgInfo type="group" label="Image" optional="true"> <url label="Image" type="media" optional="true" defaultValue="Select an Image"/> <tip label="Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/> </imgInfo> <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>
Expand Down
9 changes: 6 additions & 3 deletions src/Nottingham/wizards/en-GB/bleedingImage.xwd
View file
Expand Up @@ -14,9 +14,12 @@
<url label="Image" type="media" />
<tip label="Image Description" type="TextInput" />

<linktarget label="Link Target" type="textInput" width="70" defaultValue="e.g. _blank" optional="true" />
<link label="Link URL" type="textInput" optional="true"/>
<linkIntro label="Link Description" type="textInput" optional="true"/>
<linkInfo type="group" label="Link" optional="true">
<link label="URL" type="textInput" optional="true" defaultValue="Enter Link Address"/>
<linkIntro label="Description" type="textInput" optional="true" defaultValue="Enter Link Description"/>
<linktarget label="Target" type="textInput" width="70" defaultValue="_blank" optional="true" />
</linkInfo>

<sound label="Sound" type="media" optional="true"/>
<magnifier label="Magnifier" type="checkBox" defaultValue="false" optional="true"/>
<addmargin label="Image Margin" type="Checkbox" defaultValue="false" optional="true"/>
Expand Down
7 changes: 5 additions & 2 deletions src/Nottingham/wizards/en-GB/buttonNav.xwd
View file
Expand Up @@ -24,8 +24,11 @@
<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"/>
<imgInfo type="group" label="Image" optional="true">
<url label="Image" type="media" optional="true" defaultValue="Select an Image"/>
<tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
</imgInfo>

<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 -->
Expand Down
7 changes: 5 additions & 2 deletions src/Nottingham/wizards/en-GB/columnPage.xwd
View file
Expand Up @@ -25,8 +25,11 @@
<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"/>
<imgInfo type="group" label="Image" optional="true">
<url label="Image" type="media" optional="true" defaultValue="Select an Image"/>
<tip label="Image Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/>
</imgInfo>

<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 -->
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/dictation.xwd
View file
@@ -1 +1 @@
<wizard menus="Interactivity"> <pageWizard remove="true" duplicate="false"> <newNodes> <dictation><![CDATA[<dictation name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium" randomise="true" showText="Show Answer" trackedShowText="Submit" correctText="Correct!" incorrectText="Incorrect." nextText="Next" restartText="Restart" countText="Clip {i} of {n}"/>]]></dictation> </newNodes> </pageWizard> <!-- DICTATION============================================= --> <dictation menu="Interactivity" menuItem="Dictation" hint="An interaction for typing text from a series of audio files." icon="icTranscript" thumb="thumbs/dictation.jpg" remove="true"> <name label="Page Title" type="TextInput" wysiwyg="true" /> <text label="Page Text" type="TextArea" height="200"/> <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Small" width="100"/> <randomise label="Randomise" type="checkBox"/> <showText label="Show Button Text" type="TextInput" wysiwyg="true" language="true"/> <trackedShowText label="Show Button Text when tracked" type="TextInput" wysiwyg="true" language="true" /> <correctText label="Correct text" type="TextInput" wysiwyg="true" language="true" /> <incorrectText label="Incorrect text" type="TextInput" wysiwyg="true" language="true" /> <showCorrectness label="Mark Answers" type="checkBox" optional="true" defaultValue="false" tooltip="Mark answer as correct or incorrect."/> <nextText label="Next Button Text" type="TextInput" wysiwyg="true" language="true"/> <restartText label="Restart Button Text" type="TextInput" wysiwyg="true" language="true"/> <countText label="Clip {i} of {n}" type="TextInput" wysiwyg="true" language="true" /> <timedText label="Timed Text File" type="Media" optional="true"/> <sound label="Timed Text Audio File" type="Media" defaultValue="Select an Audio File" optional="true"/> <trackingWeight label="Tracking Score Weight (0=Off)" optional="true" type="textInput" width="120" defaultValue="1.0" /> <newNodes> <nestedDictation><![CDATA[<nestedDictation name="Sentence" prompt="Enter Text Here" audio="Select an Audio File" answer="Enter Answer Here"/>]]></nestedDictation> </newNodes> </dictation> <nestedDictation menuItem="Sentence" icon="icBullet" remove="true"> <name label="Label" type="TextInput" mandatory="true" defaultValue="Sentence" /> <prompt label="Prompt Text" type="TextArea" height="200" /> <audio label="Audio File" type="Media"/> <answer label="Answer Text" type="TextArea" height="200"/> </nestedDictation> </wizard>
<wizard menus="Interactivity"> <pageWizard remove="true" duplicate="false"> <newNodes> <dictation><![CDATA[<dictation name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium" randomise="true" showText="Show Answer" trackedShowText="Submit" correctText="Correct!" incorrectText="Incorrect." nextText="Next" restartText="Restart" countText="Clip {i} of {n}"/>]]></dictation> </newNodes> </pageWizard> <!-- DICTATION============================================= --> <dictation menu="Interactivity" menuItem="Dictation" hint="An interaction for typing text from a series of audio files." icon="icTranscript" thumb="thumbs/dictation.jpg" remove="true"> <name label="Page Title" type="TextInput" wysiwyg="true" /> <text label="Page Text" type="TextArea" height="200"/> <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Small" width="100"/> <randomise label="Randomise" type="checkBox"/> <showText label="Show Button Text" type="TextInput" wysiwyg="true" language="true"/> <trackedShowText label="Show Button Text when tracked" type="TextInput" wysiwyg="true" language="true" /> <correctText label="Correct text" type="TextInput" wysiwyg="true" language="true" /> <incorrectText label="Incorrect text" type="TextInput" wysiwyg="true" language="true" /> <showCorrectness label="Show correctness" type="checkBox" optional="true" defaultValue="false" tooltip="Mark answer as correct or incorrect."/> <nextText label="Next Button Text" type="TextInput" wysiwyg="true" language="true"/> <restartText label="Restart Button Text" type="TextInput" wysiwyg="true" language="true"/> <countText label="Clip {i} of {n}" type="TextInput" wysiwyg="true" language="true" /> <tt type="group" label="Timed Text" optional="true"> <timedText label="File" type="Media" defaultValue="Select a Timed Text File" optional="true"/> <sound label="Audio File" type="Media" defaultValue="Select an Audio File" optional="true"/> </tt> <trackingWeight label="Tracking Score Weight (0=Off)" optional="true" type="textInput" width="120" defaultValue="1.0" /> <newNodes> <nestedDictation><![CDATA[<nestedDictation name="Sentence" prompt="Enter Text Here" audio="Select an Audio File" answer="Enter Answer Here"/>]]></nestedDictation> </newNodes> </dictation> <nestedDictation menuItem="Sentence" icon="icBullet" remove="true"> <name label="Label" type="TextInput" mandatory="true" defaultValue="Sentence" /> <prompt label="Prompt Text" type="TextArea" height="200" /> <audio label="Audio File" type="Media"/> <answer label="Answer Text" type="TextArea" height="200"/> </nestedDictation> </wizard>
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/flashCards.xwd
View file
@@ -1 +1 @@
<wizard menus="Navigators"> <pageWizard remove="true" duplicate="false"> <newNodes> <flashCards><![CDATA[<flashCards name="Enter Page Title" text="Enter text for the page here" interactivity="flip" cardNoTxt="Card {i} of {n}" flipTxt="Flip Card" nextTxt="Next" prevTxt="Previous" />]]></flashCards> </newNodes> </pageWizard> <!-- FLASH CARDS=============================== --> <flashCards menu="Navigators" menuItem="Flash Cards" icon="icRefreshPage" remove="true" thumb="thumbs/flashCards.jpg" hint="A series of double sided flash cards containing text and media."> <name label="Page Title" type="TextInput" wysiwyg="true" /> <text label="Page Text" type="TextArea" height="120"/> <random label="Randomise Cards" type="Checkbox" optional="true" /> <amountToShow label="Cards To Show" type="NumericStepper" min="1" max="1000" step="1" defaultValue="1" optional="true" /> <!--<interactivity label="Interactivity" type="ComboBox" options="Flip,Reveal,None" data="flip,reveal,none" width="100"/>--> <cardNoTxt label="Card No. Text" type="TextInput" language="true" /> <flipTxt label="Flip Button Label" type="TextInput" language="true"/> <nextTxt label="Next Button Label" type="TextInput" language="true" /> <prevTxt label="Previous Button Label" type="TextInput" language="true" /> <newNodes> <card><![CDATA[<card name="Enter Title Here" side1="Content for side one of the card" side2="Content for side two of the card"/>]]></card> </newNodes> </flashCards> <card menuItem="Card" icon="icTwoPages" remove="true"> <name label="Title" type="TextInput" wysiwyg="true"/> <side1 label="Side 1 Text" type="TextArea" height="120"/> <side2 label="Side 2 Text" type="TextArea" height="120"/> <media1 label="Side 1 Media File" type="Media" optional="true"/> <media2 label="Side 2 Media File" type="Media" optional="true"/> <tip1 label="Side 1 Media Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/> <tip2 label="Side 2 Media Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/> <align1 label="Side 1 Media Position" options="Top,Bottom" type="ComboBox" optional="true" data="Top,Bottom" defaultValue="Bottom" width="100"/> <align2 label="Side 2 Media Position" options="Top,Bottom" type="ComboBox" optional="true" data="Top,Bottom" defaultValue="Bottom" width="100"/> </card></wizard>
<wizard menus="Navigators"> <pageWizard remove="true" duplicate="false"> <newNodes> <flashCards><![CDATA[<flashCards name="Enter Page Title" text="Enter text for the page here" interactivity="flip" cardNoTxt="Card {i} of {n}" flipTxt="Flip Card" nextTxt="Next" prevTxt="Previous" />]]></flashCards> </newNodes> </pageWizard> <!-- FLASH CARDS=============================== --> <flashCards menu="Navigators" menuItem="Flash Cards" icon="icRefreshPage" remove="true" thumb="thumbs/flashCards.jpg" hint="A series of double sided flash cards containing text and media."> <name label="Page Title" type="TextInput" wysiwyg="true" /> <text label="Page Text" type="TextArea" height="120"/> <random label="Randomise Cards" type="Checkbox" optional="true" /> <amountToShow label="Cards To Show" type="NumericStepper" min="1" max="1000" step="1" defaultValue="1" optional="true" /> <!--<interactivity label="Interactivity" type="ComboBox" options="Flip,Reveal,None" data="flip,reveal,none" width="100"/>--> <cardNoTxt label="Card No. Text" type="TextInput" language="true" /> <flipTxt label="Flip Button Label" type="TextInput" language="true"/> <nextTxt label="Next Button Label" type="TextInput" language="true" /> <prevTxt label="Previous Button Label" type="TextInput" language="true" /> <newNodes> <card><![CDATA[<card name="Enter Title Here" side1="Content for side one of the card" side2="Content for side two of the card"/>]]></card> </newNodes> </flashCards> <card menuItem="Card" icon="icTwoPages" remove="true"> <name label="Title" type="TextInput" wysiwyg="true"/> <side1 label="Side 1 Text" type="TextArea" height="120"/> <side2 label="Side 2 Text" type="TextArea" height="120"/> <side1Media type="group" label="Side 1 Media" optional="true"> <media1 label="File" type="Media" optional="true" defaultValue="Select an Image"/> <tip1 label="Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/> <align1 label="Position" options="Top,Bottom" type="ComboBox" optional="true" data="Top,Bottom" defaultValue="Bottom" width="100"/> </side1Media> <side2Media type="group" label="Side 2 Media" optional="true"> <media2 label="File" type="Media" optional="true" defaultValue="Select an Image"/> <tip2 label="Description" type="textInput" optional="true" defaultValue="Enter a Description for Accessibility"/> <align2 label="Position" options="Top,Bottom" type="ComboBox" optional="true" data="Top,Bottom" defaultValue="Bottom" width="100"/> </side2Media> </card></wizard>
Expand Down

0 comments on commit c00a3fd

Please sign in to comment.