Skip to content

Commit

Permalink
Removed fixed string from iPad PDF link
Browse files Browse the repository at this point in the history
  • Loading branch information
@FayCross
FayCross committed Jul 17, 2015
1 parent 033a676 commit f0717c7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion modules/xerte/parent_templates/Nottingham/data.xwd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="Enter Page Text" url="Select Image" tip1="Enter a Description for Accessibility" url2="Select Image" tip2="Enter a Description for Accessibility" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><newWindow><![CDATA[<newWindow name="Enter Page Title" text="Enter text for the page" url="Enter a URL to launch" descrip="Enter link text" previewImage="Select a preview image" tip="Enter a Description for Accessibility" windowWidth="550" windowHeight="400"/>]]></newWindow><orient><![CDATA[<orient name="Enter Page Title" goalsHeader="Aims and Objectives" goals="Outline the goals for this content"
audienceHeader="Target Audience" audience="Describe the target audience"
prereqHeader="Pre-requisites" prereq="State any pre-requisite knowledge or experience"
howtoHeader="How to use this resource" howto="Describe how the user can best use the resource"/>]]></orient><pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File"/>]]></pdf><perspectives><![CDATA[<perspectives name="Enter Page Title" backBtnTip="Back" nextBtnTip="Forward" videoTip="Video Clip" soundTip="Sound Clip"/>]]></perspectives><quiz><![CDATA[<quiz name="Enter Page Title" order="random" numQuestions="*" align="left" panelWidth="Medium" instructions="Provide instructions here" judge="true" showfeedback="true" feedback="Provide feedback here"
howtoHeader="How to use this resource" howto="Describe how the user can best use the resource"/>]]></orient><pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File" open="Open PDF"/>]]></pdf><perspectives><![CDATA[<perspectives name="Enter Page Title" backBtnTip="Back" nextBtnTip="Forward" videoTip="Video Clip" soundTip="Sound Clip"/>]]></perspectives><quiz><![CDATA[<quiz name="Enter Page Title" order="random" numQuestions="*" align="left" panelWidth="Medium" instructions="Provide instructions here" judge="true" showfeedback="true" feedback="Provide feedback here"
quesCount="Question {i} of {n}" feedbackLabel="Feedback"
singleRight="Your answer is correct!" singleWrong="Your answer is incorrect" multiRight="You have selected all the correct answers"
multiWrong="You have not selected the correct combination of answers"
Expand Down Expand Up @@ -1528,6 +1528,7 @@

<name label="Page Title" type="TextInput" wysiwyg="true"/>
<url label="PDF File" type="media"/>
<open label="Open PDF" 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"/>
Expand Down
2 changes: 1 addition & 1 deletion modules/xerte/parent_templates/Nottingham/models_html5/pdf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
width: $("#pdfPage").width(),
height: $("#pdfPage").height()
});
$("#pdfPage").append('<div id="link"><hr/><a id="pdfLink" href="' + x_evalURL(x_currentPageXML.getAttribute("url")) + '" target="_blank">Open PDF</a></div>');
$("#pdfPage").append('<div id="link"><hr/><a id="pdfLink" href="' + x_evalURL(x_currentPageXML.getAttribute("url")) + '" target="_blank">' + (x_currentPageXML.getAttribute("open") == "" || x_currentPageXML.getAttribute("open") == undefined ? x_currentPageXML.getAttribute("open") : "Open PDF") + '</a></div>');
}, 1);
}

Expand Down
3 changes: 2 additions & 1 deletion modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="Enter Page Text" url="Select Image" tip1="Enter a Description for Accessibility" url2="Select Image" tip2="Enter a Description for Accessibility" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><newWindow><![CDATA[<newWindow name="Enter Page Title" text="Enter text for the page" url="Enter a URL to launch" descrip="Enter link text" previewImage="Select a preview image" tip="Enter a Description for Accessibility" windowWidth="550" windowHeight="400"/>]]></newWindow><orient><![CDATA[<orient name="Enter Page Title" goalsHeader="Aims and Objectives" goals="Outline the goals for this content"
audienceHeader="Target Audience" audience="Describe the target audience"
prereqHeader="Pre-requisites" prereq="State any pre-requisite knowledge or experience"
howtoHeader="How to use this resource" howto="Describe how the user can best use the resource"/>]]></orient><pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File"/>]]></pdf><perspectives><![CDATA[<perspectives name="Enter Page Title" backBtnTip="Back" nextBtnTip="Forward" videoTip="Video Clip" soundTip="Sound Clip"/>]]></perspectives><quiz><![CDATA[<quiz name="Enter Page Title" order="random" numQuestions="*" align="left" panelWidth="Medium" instructions="Provide instructions here" judge="true" showfeedback="true" feedback="Provide feedback here"
howtoHeader="How to use this resource" howto="Describe how the user can best use the resource"/>]]></orient><pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File" open="Open PDF"/>]]></pdf><perspectives><![CDATA[<perspectives name="Enter Page Title" backBtnTip="Back" nextBtnTip="Forward" videoTip="Video Clip" soundTip="Sound Clip"/>]]></perspectives><quiz><![CDATA[<quiz name="Enter Page Title" order="random" numQuestions="*" align="left" panelWidth="Medium" instructions="Provide instructions here" judge="true" showfeedback="true" feedback="Provide feedback here"
quesCount="Question {i} of {n}" feedbackLabel="Feedback"
singleRight="Your answer is correct!" singleWrong="Your answer is incorrect" multiRight="You have selected all the correct answers"
multiWrong="You have not selected the correct combination of answers"
Expand Down Expand Up @@ -1528,6 +1528,7 @@

<name label="Page Title" type="TextInput" wysiwyg="true"/>
<url label="PDF File" type="media"/>
<open label="Open PDF" 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"/>
Expand Down
3 changes: 2 additions & 1 deletion src/Nottingham/wizards/en-GB/pdf.xwd
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<wizard menus="Media">
<pageWizard remove="true" duplicate="false">
<newNodes>
<pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File"/>]]></pdf>
<pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File" open="Open PDF"/>]]></pdf>
</newNodes>
</pageWizard>

Expand All @@ -10,6 +10,7 @@

<name label="Page Title" type="TextInput" wysiwyg="true"/>
<url label="PDF File" type="media"/>
<open label="Open PDF" 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"/>
Expand Down
3 changes: 2 additions & 1 deletion src/Nottingham/wizards/en-GB/template.xwd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="Enter Page Text" url="Select Image" tip1="Enter a Description for Accessibility" url2="Select Image" tip2="Enter a Description for Accessibility" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><newWindow><![CDATA[<newWindow name="Enter Page Title" text="Enter text for the page" url="Enter a URL to launch" descrip="Enter link text" previewImage="Select a preview image" tip="Enter a Description for Accessibility" windowWidth="550" windowHeight="400"/>]]></newWindow><orient><![CDATA[<orient name="Enter Page Title" goalsHeader="Aims and Objectives" goals="Outline the goals for this content"
audienceHeader="Target Audience" audience="Describe the target audience"
prereqHeader="Pre-requisites" prereq="State any pre-requisite knowledge or experience"
howtoHeader="How to use this resource" howto="Describe how the user can best use the resource"/>]]></orient><pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File"/>]]></pdf><perspectives><![CDATA[<perspectives name="Enter Page Title" backBtnTip="Back" nextBtnTip="Forward" videoTip="Video Clip" soundTip="Sound Clip"/>]]></perspectives><quiz><![CDATA[<quiz name="Enter Page Title" order="random" numQuestions="*" align="left" panelWidth="Medium" instructions="Provide instructions here" judge="true" showfeedback="true" feedback="Provide feedback here"
howtoHeader="How to use this resource" howto="Describe how the user can best use the resource"/>]]></orient><pdf><![CDATA[<pdf name="Enter Page Title" url="Select a PDF File" open="Open PDF"/>]]></pdf><perspectives><![CDATA[<perspectives name="Enter Page Title" backBtnTip="Back" nextBtnTip="Forward" videoTip="Video Clip" soundTip="Sound Clip"/>]]></perspectives><quiz><![CDATA[<quiz name="Enter Page Title" order="random" numQuestions="*" align="left" panelWidth="Medium" instructions="Provide instructions here" judge="true" showfeedback="true" feedback="Provide feedback here"
quesCount="Question {i} of {n}" feedbackLabel="Feedback"
singleRight="Your answer is correct!" singleWrong="Your answer is incorrect" multiRight="You have selected all the correct answers"
multiWrong="You have not selected the correct combination of answers"
Expand Down Expand Up @@ -1528,6 +1528,7 @@

<name label="Page Title" type="TextInput" wysiwyg="true"/>
<url label="PDF File" type="media"/>
<open label="Open PDF" 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"/>
Expand Down

0 comments on commit f0717c7

Please sign in to comment.