Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
More flashonly attributes plus a flag in the optional parameter list
  • Loading branch information
torinfo committed Jun 10, 2015
1 parent 1291e15 commit 7c12fbe
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 30 deletions.
12 changes: 9 additions & 3 deletions editor/js/tree.js
Expand Up @@ -622,7 +622,10 @@ var EDITOR = (function ($, parent) {
var html = $('<div>')
.addClass("optButtonContainer");
var table = $('<table>');

var flashonly = $('<img>')
.attr('src', 'editor/img/flashonly.png')
.attr('title', 'Flash only attribute');

// Sort into alphabetical order
node_options['optional'].sort(function(a,b) {
var aN = a.value.label.toLowerCase();
Expand Down Expand Up @@ -650,8 +653,11 @@ var EDITOR = (function ($, parent) {
function (event) {
parent.toolbox.insertOptionalProperty(event.data.key, event.data.attribute, event.data.default);
})
.append($('<i>').addClass('fa').addClass('fa-plus-circle').addClass('fa-lg').addClass("xerte-icon").height(14))
.append(attribute_label);
.append($('<i>').addClass('fa').addClass('fa-plus-circle').addClass('fa-lg').addClass("xerte-icon").height(14));
if (node_options['optional'][i].value.flashonly) {
button.append(flashonly);
}
button.append(attribute_label);
if (node_options['optional'][i].value.tooltip)
{
button.attr('title', node_options['optional'][i].value.tooltip);
Expand Down
12 changes: 6 additions & 6 deletions modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
Expand Up @@ -165,7 +165,7 @@

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

</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 @@ -1693,8 +1693,8 @@
<url label="FLV, SWF or Image File" type="media" optional="true"/>
<reset label="Reset on Completion" type="Checkbox" defaultValue="true" optional="true"/>
<movieSize label="Video Size" type="textInput" defaultValue="320,240" optional="true"/>
<controls label="Interactivity" options="Control Bar,Native SWF" type="ComboBox" data="Control Bar,Native SWF" defaultValue="Control Bar" width="100" optional="true"/>
<initObject label="Init Object" type="TextArea" height="60" optional="true"/>
<controls label="Interactivity" options="Control Bar,Native SWF" type="ComboBox" data="Control Bar,Native SWF" defaultValue="Control Bar" width="100" optional="true" flashonly="true"/>
<initObject label="Init Object" type="TextArea" height="60" optional="true" flashonly="true"/>
<playNarration label="Auto-play narration" type="CheckBox" defaultValue="false" optional="true"/>
<narration label="Narration" type="media" optional="true"/>
<info><![CDATA[<b>For full details on how to use the Scenario Connector Page. <u><a href="http://xerte.org.uk/docs/xot/help/ScenarioConnectorPageGuide.pdf" target="_blank">Click here</a></u></b>]]></info>
Expand Down Expand Up @@ -2036,8 +2036,8 @@
<pageID label="Page ID" defaultValue="Unique ID for this page" type="TextInput" optional="true"/>

<movieSize label="Movie Size" type="textInput" optional="true"/>
<controls label="Interactivity" options="Control Bar,Native SWF" type="ComboBox" data="Control Bar,Native SWF" defaultValue="Control Bar" width="100" optional="true"/>
<initObject label="Init Object" type="TextArea" height="60" optional="true"/>
<controls label="Interactivity" options="Control Bar,Native SWF" type="ComboBox" data="Control Bar,Native SWF" defaultValue="Control Bar" width="100" optional="true" flashonly="true"/>
<initObject label="Init Object" type="TextArea" height="60" optional="true" flashonly="true"/>

</textSWF><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">

Expand Down Expand Up @@ -2216,7 +2216,7 @@
<name type="TextInput" wysiwyg="true" label="Page Title"/>
<modelFile type="media" label="Xerte Model"/>

<initObject type="TextInput" label="InitObject" optional="true"/>
<initObject type="TextInput" label="InitObject" optional="true" flashonly="true"/>
<errorTxt label="Error Text" type="TextInput" wysiwyg="true" divider="true" language="true"/>

<narrationNavigate label="Navigate on Narration" type="CheckBox" defaultValue="false" optional="true"/>
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"/> <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"/> <movieSize label="Video Size (w,h)" type="textInput" defaultValue="300,300" optional="true"/> </nestedPage> </wizard>
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/buttonNav.xwd
Expand Up @@ -32,7 +32,7 @@

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

</nestedPage>
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/cTabNav.xwd
@@ -1 +1 @@
<wizard menus="Connectors" restrict="develop"> <pageWizard remove="true" duplicate="false"> <newNodes> <cTabNav><![CDATA[<cTabNav name="Enter Page Title" pageID="Unique ID for this page" text="Enter text for the page here" panelWidth="full" tabWidth="110" navSetting="none" confirmBtnTxt="Confirm" confirmBtnTip="Confirm Selection" confirmBtnWidth="100" reportTitle="List of page titles and matching pageIDs" pageLabel="Page No" titleLabel="Title:" idLabel="pageID:" notFoundMessage="could not be found in this project." notSetMessage="A destination page has not been set for this Connection" />]]></cTabNav> </newNodes> </pageWizard> <!-- TABBED NAVIGATOR CONNECTOR ======================================= --> <cTabNav menu="Connectors" menuItem="Tabbed Navigator Connector" icon="icConTabbedNav" hint="The page allows you to create a series of tabbed pages to present related text and graphical content, with options that link to other pages in your project." thumb="thumbs/connectorTabNav.jpg" remove="true"> <name label="Page Title" type="TextInput" /> <pageID label="Page ID" type="TextInput" defaultValue="Unique ID for this page" /> <text label="Text" type="TextArea" height="250"/> <panelWidth label="Panel Width" options="Small (300),Medium (450),Large (600),Full (760)" type="ComboBox" data="small,medium,large,full" defaultValue="full" width="100"/> <tabWidth label="Tab Width" type="NumericStepper" min="20" max="250" step="10" width="100"/> <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" /> <confirmBtnTxt label="Check Button Label" type="textInput" divider="true" language="true" /> <confirmBtnTip label="Check Button Tip" type="textInput" language="true" /> <confirmBtnWidth label="Check Button Width" type="NumericStepper" min="100" max="250" step="10" width="100" defaultValue="100" language="true" /> <reportTitle label="Report Title" type="TextInput" language="true"/> <pageLabel label="Page Label" type="TextInput" language="true"/> <titleLabel label="Title Label" type="TextInput" language="true"/> <idLabel label="PageID Label" type="TextInput" language="true"/> <notFoundMessage label="Not Found Message" type="TextInput" language="true"/> <notSetMessage label="Not Set Message" type="TextInput" language="true"/> <listToClip label="Output Check List" options="Don't send Page Title and IDs data to clipboard,Send Text Title and IDs List to Clipboard (Developer mode only),Send HTML Title and IDs Table to Clipboard (Developer mode only)" type="ComboBox" data="no,text,html" defaultValue="html" width="380" optional="true"/> <playNarration label="Auto-Play Narration" type="CheckBox" defaultValue="false" optional="true"/> <narration label="Narration" type="media" optional="true"/> <info><![CDATA[<b>For full details on how to use the Tabbed Navigator Connector Page. <u><a href="http://xerte.org.uk/docs/xot/help/TabbedNavigatorConnectorPageGuide.pdf" target="_blank">Click here</a></u></b>]]></info> <newNodes> <cTabScreen><![CDATA[<cTabScreen name="Tab Label" text="Content for the pane" />]]></cTabScreen> </newNodes> </cTabNav> <cTabScreen menuItem="Tab Panel" icon="icBullet" remove="true"> <name label="Tab Label" type="TextInput"/> <text label="Tab Text" type="TextArea" height="250"/> <textOffset label="Tab Text x,y,w" type="TextInput" optional="true"/> <optionVOffset label="Text to Option Gap" type="NumericStepper" min="0" max="400" step="5" width="100" defaultValue="20" optional="true"/> <url label="Image" type="media" optional="true"/> <tip label="Image Tooltip" type="TextInput" optional="true"/> <initObject label="Init Object" type="TextInput" optional="true"/> <controls label="Interactivity" options="Control Bar,Native SWF" type="ComboBox" data="Control Bar,Native SWF" defaultValue="Control Bar" width="100" optional="true"/> <movieSize label="Image x,y,w,h" type="TextInput" optional="true"/> <movieTransition label="Image transition" options="blinds,dissolve,fade,fly,iris,squeeze,wipe,zoom" type="ComboBox" data="blinds,dissolve,fade,fly,iris,squeeze,wipe,zoom" defaultValue="wipe" width="100" optional="true"/> <isFlashPaper label="Is image flashPaper" options="false,true" type="ComboBox" data="false,true" defaultValue="false" width="100" optional="true"/> <newNodes> <cTabExit><![CDATA[<cTabExit name="name" destination="pageID of destination page" text="here is an option" />]]></cTabExit> </newNodes> </cTabScreen> <cTabExit menuItem="Exit option" icon="icBullet" remove="true"> <name label="Option Title" type="TextInput"/> <text label="Text for option" type="TextArea" height="100"/> <destination label="Go to Page ID" type="TextInput"/> </cTabExit> </wizard>
<wizard menus="Connectors" restrict="develop"> <pageWizard remove="true" duplicate="false"> <newNodes> <cTabNav><![CDATA[<cTabNav name="Enter Page Title" pageID="Unique ID for this page" text="Enter text for the page here" panelWidth="full" tabWidth="110" navSetting="none" confirmBtnTxt="Confirm" confirmBtnTip="Confirm Selection" confirmBtnWidth="100" reportTitle="List of page titles and matching pageIDs" pageLabel="Page No" titleLabel="Title:" idLabel="pageID:" notFoundMessage="could not be found in this project." notSetMessage="A destination page has not been set for this Connection" />]]></cTabNav> </newNodes> </pageWizard> <!-- TABBED NAVIGATOR CONNECTOR ======================================= --> <cTabNav menu="Connectors" menuItem="Tabbed Navigator Connector" icon="icConTabbedNav" hint="The page allows you to create a series of tabbed pages to present related text and graphical content, with options that link to other pages in your project." thumb="thumbs/connectorTabNav.jpg" remove="true"> <name label="Page Title" type="TextInput" /> <pageID label="Page ID" type="TextInput" defaultValue="Unique ID for this page" /> <text label="Text" type="TextArea" height="250"/> <panelWidth label="Panel Width" options="Small (300),Medium (450),Large (600),Full (760)" type="ComboBox" data="small,medium,large,full" defaultValue="full" width="100"/> <tabWidth label="Tab Width" type="NumericStepper" min="20" max="250" step="10" width="100"/> <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" /> <confirmBtnTxt label="Check Button Label" type="textInput" divider="true" language="true" /> <confirmBtnTip label="Check Button Tip" type="textInput" language="true" /> <confirmBtnWidth label="Check Button Width" type="NumericStepper" min="100" max="250" step="10" width="100" defaultValue="100" language="true" /> <reportTitle label="Report Title" type="TextInput" language="true"/> <pageLabel label="Page Label" type="TextInput" language="true"/> <titleLabel label="Title Label" type="TextInput" language="true"/> <idLabel label="PageID Label" type="TextInput" language="true"/> <notFoundMessage label="Not Found Message" type="TextInput" language="true"/> <notSetMessage label="Not Set Message" type="TextInput" language="true"/> <listToClip label="Output Check List" options="Don't send Page Title and IDs data to clipboard,Send Text Title and IDs List to Clipboard (Developer mode only),Send HTML Title and IDs Table to Clipboard (Developer mode only)" type="ComboBox" data="no,text,html" defaultValue="html" width="380" optional="true"/> <playNarration label="Auto-Play Narration" type="CheckBox" defaultValue="false" optional="true"/> <narration label="Narration" type="media" optional="true"/> <info><![CDATA[<b>For full details on how to use the Tabbed Navigator Connector Page. <u><a href="http://xerte.org.uk/docs/xot/help/TabbedNavigatorConnectorPageGuide.pdf" target="_blank">Click here</a></u></b>]]></info> <newNodes> <cTabScreen><![CDATA[<cTabScreen name="Tab Label" text="Content for the pane" />]]></cTabScreen> </newNodes> </cTabNav> <cTabScreen menuItem="Tab Panel" icon="icBullet" remove="true"> <name label="Tab Label" type="TextInput"/> <text label="Tab Text" type="TextArea" height="250"/> <textOffset label="Tab Text x,y,w" type="TextInput" optional="true"/> <optionVOffset label="Text to Option Gap" type="NumericStepper" min="0" max="400" step="5" width="100" defaultValue="20" optional="true"/> <url label="Image" type="media" optional="true"/> <tip label="Image Tooltip" type="TextInput" optional="true"/> <initObject label="Init Object" type="TextInput" optional="true" flashonly="true"/> <controls label="Interactivity" options="Control Bar,Native SWF" type="ComboBox" data="Control Bar,Native SWF" defaultValue="Control Bar" width="100" optional="true" flashonly="true"/> <movieSize label="Image x,y,w,h" type="TextInput" optional="true"/> <movieTransition label="Image transition" options="blinds,dissolve,fade,fly,iris,squeeze,wipe,zoom" type="ComboBox" data="blinds,dissolve,fade,fly,iris,squeeze,wipe,zoom" defaultValue="wipe" width="100" optional="true"/> <isFlashPaper label="Is image flashPaper" options="false,true" type="ComboBox" data="false,true" defaultValue="false" width="100" optional="true"/> <newNodes> <cTabExit><![CDATA[<cTabExit name="name" destination="pageID of destination page" text="here is an option" />]]></cTabExit> </newNodes> </cTabScreen> <cTabExit menuItem="Exit option" icon="icBullet" remove="true"> <name label="Option Title" type="TextInput"/> <text label="Text for option" type="TextArea" height="100"/> <destination label="Go to Page ID" type="TextInput"/> </cTabExit> </wizard>
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/columnPage.xwd
Expand Up @@ -31,7 +31,7 @@

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

</nestedPage>
Expand Down

0 comments on commit 7c12fbe

Please sign in to comment.