From 8348f6b34a0134ee1a105eb6378d2eba79ccf92c Mon Sep 17 00:00:00 2001
From: mussaf <38488831+mussaf@users.noreply.github.com>
Date: Tue, 17 Jul 2018 16:59:08 +0200
Subject: [PATCH] Added topXQ page

---
 .../Nottingham/models_html5/topXQ.css         |  31 ++
 .../Nottingham/models_html5/topXQ.html        | 322 ++++++++++++++++++
 .../Nottingham/wizards/en-GB/data.xwd         |  60 +++-
 src/Nottingham/wizards/en-GB/template.xwd     |  60 +++-
 src/Nottingham/wizards/en-GB/topXQ.xwd        |  40 +++
 5 files changed, 509 insertions(+), 4 deletions(-)
 create mode 100644 modules/xerte/parent_templates/Nottingham/models_html5/topXQ.css
 create mode 100644 modules/xerte/parent_templates/Nottingham/models_html5/topXQ.html
 create mode 100644 src/Nottingham/wizards/en-GB/topXQ.xwd

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.css b/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.css
new file mode 100644
index 0000000000..3e8a2f6381
--- /dev/null
+++ b/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.css
@@ -0,0 +1,31 @@
+.answer{
+    width:      100%;
+}
+
+.answer input{
+    width:      90%;
+    margin-bottom: 5px;
+}
+
+#checkButton{
+    margin:     10px;
+    float:      right;
+}
+#pageContents #feedback {
+    clear:		both;
+}
+#pageContents #correctAnswer {
+    clear:		both;
+}
+#correctAnswer h3 {
+    border-top: 1px solid #ccc;
+    padding-top: 1em;
+}
+#feedback h3 {
+    border-top: 1px solid #ccc;
+    padding-top: 1em;
+}
+.correctOptions{
+    color: limegreen;
+}
+
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.html b/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.html
new file mode 100644
index 0000000000..640881a0b9
--- /dev/null
+++ b/modules/xerte/parent_templates/Nottingham/models_html5/topXQ.html
@@ -0,0 +1,322 @@
+<script type="text/javascript">
+    /**
+     * Licensed to The Apereo Foundation under one or more contributor license
+     * agreements. See the NOTICE file distributed with this work for
+     * additional information regarding copyright ownership.
+
+     * The Apereo Foundation licenses this file to you under the Apache License,
+     * Version 2.0 (the "License"); you may not use this file except in
+     * compliance with the License. You may obtain a copy of the License at:
+     *
+     * http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     */
+
+        // pageChanged & sizeChanged functions are needed in every model file
+        // other functions for model should also be in here to avoid conflicts
+    var TopXQ = new function () {
+            // function called every time the page is viewed after it has initially loaded
+            this.pageChanged = function () {
+
+            };
+
+            // function called every time the size of the LO is changed
+            this.sizeChanged = function () {
+                if (x_browserInfo.mobile == false) {
+                    var $panel = $("#pageContents .panel");
+                    $panel.height($x_pageHolder.height() - parseInt($x_pageDiv.css("padding-top")) * 2 - parseInt($panel.css("padding-top")) * 2 - 5);
+                }
+
+                if ($("#pageContents .audioHolder").length > 0) {
+                    var audioBarW = 0;
+                    $("#pageContents .audioHolder:eq(0) .mejs-inner .mejs-controls").children().each(function() {
+                        audioBarW += $(this).outerWidth();
+                    });
+                    if (audioBarW - $("#pageContents .audioHolder").parents("#mainPanel").width() < -2 || audioBarW - $("#pageContents .audioHolder").parents("#mainPanel").width() > 2) {
+                        $x_window.resize();
+                    }
+                }
+            };
+
+
+            this.init = function () {
+                var panelWidth = x_currentPageXML.getAttribute("panelWidth"),
+                    $splitScreen = $("#pageContents .splitScreen");
+                var $textHolder = $("#textHolder");
+
+                if (panelWidth == "Full") {
+                    $("#pageContents .panel").appendTo($("#pageContents"));
+                    $splitScreen.remove();
+                } else {
+                    $textHolder.html(x_addLineBreaks(x_currentPageXML.getAttribute("instruction")));
+
+                    var textAlign = x_currentPageXML.getAttribute("align");
+                    if (textAlign != "Right") {
+                        if (panelWidth == "Small") {
+                            $splitScreen.addClass("large");
+                        } else if (panelWidth == "Large") {
+                            $splitScreen.addClass("small");
+                        } else {
+                            $splitScreen.addClass("medium");
+                        }
+                    } else {
+                        $textHolder
+                            .removeClass("left")
+                            .addClass("right")
+                            .appendTo($splitScreen);
+                        $("#infoHolder")
+                            .removeClass("right")
+                            .addClass("left");
+                        if (panelWidth == "Small") {
+                            $splitScreen.addClass("medium");
+                        } else if (panelWidth == "Large") {
+                            $splitScreen.addClass("xlarge");
+                        } else {
+                            $splitScreen.addClass("large");
+                        }
+                    }
+                }
+
+                var instruction = x_currentPageXML.getAttribute("instruction");
+                $textHolder.html(instruction);
+
+                var $question = $("#question");
+                var prompt = x_currentPageXML.getAttribute("prompt");
+                $question.html(prompt);
+
+                var $panelWidth = x_currentPageXML.getAttribute("panelWidth");
+                var $optionHolder = $("#OptionHolder");
+
+                var elements = [];
+                $(x_currentPageXML).children().each(function (i) {
+                    elements.push(
+                        {
+                            label: this.getAttribute("name"),
+                            answer: this.getAttribute("answer"),
+                            correct: this.getAttribute("correct"),
+                            feedback: this.getAttribute("feedback")
+                        }
+                    );
+                });
+                this.optionElements = elements;
+                var j = 0;
+                var amountOfAnswers = x_currentPageXML.getAttribute("numberAnswers");
+
+                if (amountOfAnswers === "*") {
+                    amountOfAnswers = elements.length;
+                }
+                for (i = 0; i < amountOfAnswers; i++) {
+                    $optionHolder.append('<div class="answer"><input class="input-answer"/><span id="topXQ-result-' + i + '"></span></div>');
+                    j++;
+                }
+
+                var checkBtnTxt = x_currentPageXML.getAttribute("checkBtnTxt");
+                if (checkBtnTxt == undefined) {
+                    checkBtnTxt = "Check";
+                }
+                $("#checkButton")
+                    .button({
+                        label: checkBtnTxt
+                    })
+                    .click(function () {
+                        $(this).button("disable");
+
+
+                        var inputs = [];
+                        $('.input-answer').each(function () {
+                            inputs.push($(this).val());
+                        });
+                        var answers = [];
+                        for (i = 0; i < elements.length; i++) {
+                            var answer = elements[i].answer.split(",");
+                            answers.push({
+                                options: answer,
+                                counter: 0
+                            });
+                        }
+
+                        var checkAnswers = [];
+                        for (i = 0; i < inputs.length; i++) {
+                            checkAnswers.push({
+                                correct: false,
+                                comment: ""
+
+
+                            });
+                        }
+                        var amountOfGoodAnswers = 0;
+                        for (i = 0; i < inputs.length; i++) {
+                            var isCorrect = false;
+                            for (j = 0; j < answers.length; j++) {
+                                for (x = 0; x < answers[j].options.length; x++) {
+
+
+                                    var givenAnswer = inputs[i];
+                                    var correctAnswer = answers[j].options[x].trim();
+
+                                    if (givenAnswer === correctAnswer) {
+                                        isCorrect = true;
+                                        checkAnswers[i].correct = true;
+                                        answers[j].counter++;
+                                        amountOfGoodAnswers++;
+
+                                        if (answers[j].counter > 1) {
+                                            checkAnswers[i].correct = false;
+                                            checkAnswers[i].comment = "Duplicate";
+
+                                        }
+                                        break;
+
+
+                                    }
+
+
+                                }
+
+
+                            }
+                            if (!isCorrect) {
+                                checkAnswers[i].comment = "Wrong Answer";
+                            }
+
+                        }
+
+                        for(i = 0; i < answers.length; i++){
+                            $("#correctAnswer ul").append("<li>"  + answers[i].options + "<span id='topXQ-correctAnswer-" + i +  "'></span> </li>" /*<span id= 'topXQ-correctAnswer-" + i + "'></span>"*/);
+                        }
+
+                        var doneAnswers = [];
+                        for (i = 0; i < inputs.length; i++) {
+                            for (k = 0; k < answers.length; k++) {
+
+                                 for (j = 0; j < answers[k].options.length; j++) {
+                                    if (!doneAnswers.includes(k) && inputs[i] === answers[k].options[j].trim()) {
+                                        doneAnswers.push(k);
+                                       // answers[k].options[j] = "<span class='correctOptions'> "+answers[k].options[j]+" </span>"
+
+                                        $("#topXQ-correctAnswer-" + k).addClass("fa").addClass("fa-fw").addClass("fa-long-arrow-left")
+
+
+                                }
+                            }
+                        }
+
+                    }
+
+
+
+                for (i = 0; i < checkAnswers.length; i++) {
+                    if (checkAnswers[i].correct) {
+                        $("#topXQ-result-" + i).addClass("fa").addClass("fa-fw").addClass("fa-x-tick");
+
+                    } else {
+                        $("#topXQ-result-" + i).addClass("fa").addClass("fa-fw").addClass("fa-x-cross");
+                    }
+                }
+
+                var feedbackLabel = x_currentPageXML.getAttribute("feedbackLabel");
+
+
+                if (feedbackLabel === undefined) {
+                    feedbackLabel = "Feedback";
+                }
+                $("#feedback").html("<h3>" + feedbackLabel + "</h3>");
+
+
+                var correctAnswersLabel = x_currentPageXML.getAttribute("correctAnswersLabel");
+
+                $("#correctAnswer h3").html(correctAnswersLabel);
+
+                for(i =0; i < elements.length; i++)
+                {
+                    $("#feedbackAnswers ul").append("<li><div class='answerFeedback'>" + elements[i].answer+" :" + "</div></li>");
+                    $("#feedbackAnswers ul li:last").append("<div>"+  elements[i].feedback + "</div>");
+                }
+
+
+
+                var passedTxt = x_currentPageXML.getAttribute("passed");
+                     if (passedTxt == undefined) {
+                        passedTxt = "You passed the question";
+                        }
+
+
+                var failedTxt = x_currentPageXML.getAttribute("failed");
+                        if (failedTxt == undefined)
+                        {
+                            failedTxt = "You did not passed the question";
+                        }
+
+
+               var average = amountOfGoodAnswers/amountOfAnswers;
+
+               var passedOrFailed = "";
+
+               var mainFeedback = x_currentPageXML.getAttribute("feedback");
+               if(mainFeedback === null){
+                   mainFeedback = ""
+               }
+
+               if(average >= state.lo_passed){
+                   passedOrFailed = passedTxt
+               }else{
+                   passedOrFailed = failedTxt
+               }
+               $("#mainFeedback").append("<div>"+ passedOrFailed+mainFeedback+ "</div>")
+
+            }
+        );
+
+
+    // call this function in every model once everything's loaded
+    x_pageLoaded();
+    }
+    }
+    ;
+
+    TopXQ.init();
+
+</script>
+
+
+<div id="pageContents">
+    <div class="splitScreen">
+        <div id="textHolder" class="left"></div>
+        <div id="infoHolder" class="right">
+            <div id="mainPanel" class="panel">
+                <fieldset class="noStyle">
+                    <h3 class="titleQuestion">
+                        <legend id="question"></legend>
+                    </h3>
+                    <div id="OptionHolder">
+
+                    </div>
+                    <button id="checkButton"></button>
+                    <div id="correctAnswer" aria-live="polite">
+                        <h3></h3>
+                        <ul>
+
+                        </ul>
+                    </div>
+                    <div id="feedback" aria-live="polite"></div>
+                    <div id = "feedbackAnswers" aria-live="polite">
+                        <ul>
+
+                        </ul>
+
+                    </div>
+                    <div id="mainFeedback" aria-live="polite">
+
+                    </div>
+                </fieldset>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd b/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
index 7e987ee3ec..5497f967a4 100644
--- a/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
+++ b/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
@@ -164,7 +164,8 @@
       PersonalAvgLabel = "Avg. of your attempts"
       PersonalLastLabel = "Your last attempt"
       AvgLabel = "Avg. of all attempts"
-      ></showGraph>]]></showGraph><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><stopTracking><![CDATA[<stopTracking name="Enter Page Title" textIntro="Instruction" buttonLbl="Stop and finish tracking of this session" textAfter="You can now close the window">Enter text for the page here</stopTracking>]]></stopTracking><summary><![CDATA[<summary name="Enter Page Title" summaryHeader="Summary" summary="Summarise the key points" nextstepsHeader="Next Steps" nextsteps="Suggest how the knowledge can be applied and any useful next steps"/>]]></summary><tabNav><![CDATA[<tabNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></tabNav><tabNavExtra><![CDATA[<tabNavExtra name="Enter Page Title" panelWidth="Large"/>]]></tabNavExtra><table><![CDATA[<table name="Enter Page Title" text="Enter text for the page here" align="left"><tableData name="Table Name" data="data|data" size="medium" borders="simple" header="header" shadeHeader="true" shade="true"/></table>]]></table><text><![CDATA[<text name="Enter Page Title">Enter text for the page here</text>]]></text><textDrawing><![CDATA[<textDrawing name="Enter Page Title" desc="Enter a description" align="left" interactivity="off"> </textDrawing>]]></textDrawing><textGraphics><![CDATA[<textGraphics name="Enter Page Title" align="Left" imagesize="auto" url="Select an Image" tip="Enter a Description for Accessibility" transcriptbuttonlabel="Transcript">Enter text for the page here</textGraphics>]]></textGraphics><textMatch><![CDATA[<textMatch name="Enter Page Title" text="Provide Instructions here" maxAttempts="3" correctMessage="Correct answers are shown" submitBtnTxt="Submit" feedback="Enter feedback here" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></textMatch><textSWF><![CDATA[<textSWF name="Enter Page Title" align="Left" url="Select a SWF File" tip="Enter a Description for Accessibility" >Enter text for the page here</textSWF>]]></textSWF><textVideo><![CDATA[<textVideo name="Enter Page Title" align="Left" url="Select a Video" tip="Enter a Description for Accessibility" transcriptTabTxt="Transcript" >Enter text for the page here</textVideo>]]></textVideo><thumbnailViewer><![CDATA[<thumbnailViewer name="Enter Page Title" text="Enter text for the page" nextBtnTip="Next" priorBtnTip="Previous"/>]]></thumbnailViewer><timeline><![CDATA[<timeline name="Enter Page Title" text="Enter text for the page here" interactivity="Timeline" feedback="Enter feedback here" checkBtnTxt="Check Answers" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></timeline><title><![CDATA[<title name="Enter Page Title" size="30">Enter title here</title>]]></title><transcriptReader><![CDATA[<transcriptReader name="Enter Page Title" sound="Select a Sound File" text="Enter text for the page here" panelWidth="Medium"/>]]></transcriptReader><videoSynch><![CDATA[<videoSynch name="Enter Page Title" url="Select a Video" text="Enter text for the page here" pause="True" erase="True"/>]]></videoSynch><wiki><![CDATA[<wiki name="Enter Page Title" text="Enter Page text" url="Enter Article URL" align="Left"/>]]></wiki><wordsearch><![CDATA[<wordsearch name="Enter Page Title" text="Enter Page text" words="Enter words here, placing each on a new line" solveBtnTxt="Solve Puzzle" retryBtnTxt="Restart Puzzle"
+      ></showGraph>]]></showGraph><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><stopTracking><![CDATA[<stopTracking name="Enter Page Title" textIntro="Instruction" buttonLbl="Stop and finish tracking of this session" textAfter="You can now close the window">Enter text for the page here</stopTracking>]]></stopTracking><summary><![CDATA[<summary name="Enter Page Title" summaryHeader="Summary" summary="Summarise the key points" nextstepsHeader="Next Steps" nextsteps="Suggest how the knowledge can be applied and any useful next steps"/>]]></summary><tabNav><![CDATA[<tabNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></tabNav><tabNavExtra><![CDATA[<tabNavExtra name="Enter Page Title" panelWidth="Large"/>]]></tabNavExtra><table><![CDATA[<table name="Enter Page Title" text="Enter text for the page here" align="left"><tableData name="Table Name" data="data|data" size="medium" borders="simple" header="header" shadeHeader="true" shade="true"/></table>]]></table><text><![CDATA[<text name="Enter Page Title">Enter text for the page here</text>]]></text><textDrawing><![CDATA[<textDrawing name="Enter Page Title" desc="Enter a description" align="left" interactivity="off"> </textDrawing>]]></textDrawing><textGraphics><![CDATA[<textGraphics name="Enter Page Title" align="Left" imagesize="auto" url="Select an Image" tip="Enter a Description for Accessibility" transcriptbuttonlabel="Transcript">Enter text for the page here</textGraphics>]]></textGraphics><textMatch><![CDATA[<textMatch name="Enter Page Title" text="Provide Instructions here" maxAttempts="3" correctMessage="Correct answers are shown" submitBtnTxt="Submit" feedback="Enter feedback here" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></textMatch><textSWF><![CDATA[<textSWF name="Enter Page Title" align="Left" url="Select a SWF File" tip="Enter a Description for Accessibility" >Enter text for the page here</textSWF>]]></textSWF><textVideo><![CDATA[<textVideo name="Enter Page Title" align="Left" url="Select a Video" tip="Enter a Description for Accessibility" transcriptTabTxt="Transcript" >Enter text for the page here</textVideo>]]></textVideo><thumbnailViewer><![CDATA[<thumbnailViewer name="Enter Page Title" text="Enter text for the page" nextBtnTip="Next" priorBtnTip="Previous"/>]]></thumbnailViewer><timeline><![CDATA[<timeline name="Enter Page Title" text="Enter text for the page here" interactivity="Timeline" feedback="Enter feedback here" checkBtnTxt="Check Answers" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></timeline><title><![CDATA[<title name="Enter Page Title" size="30">Enter title here</title>]]></title><topXQ><![CDATA[<tXQ name="Enter Page Title" instruction = "Enter Your Instruction" prompt= "Enter Your Question" align = "Left" panelWidth = "Medium" numberAnswers = "Enter amount of fields" feedbackLabel="Feedback" correctAnswersLabel="Correct answers" passed="You passed the question!" failed="You did not pass the question"
+	  checkBtnTxt="Check"/>]]></topXQ><transcriptReader><![CDATA[<transcriptReader name="Enter Page Title" sound="Select a Sound File" text="Enter text for the page here" panelWidth="Medium"/>]]></transcriptReader><videoSynch><![CDATA[<videoSynch name="Enter Page Title" url="Select a Video" text="Enter text for the page here" pause="True" erase="True"/>]]></videoSynch><wiki><![CDATA[<wiki name="Enter Page Title" text="Enter Page text" url="Enter Article URL" align="Left"/>]]></wiki><wordsearch><![CDATA[<wordsearch name="Enter Page Title" text="Enter Page text" words="Enter words here, placing each on a new line" solveBtnTxt="Solve Puzzle" retryBtnTxt="Restart Puzzle"
 	  />]]></wordsearch><xerteModel><![CDATA[<xerteModel name="Enter Page Title" modelFile="Select a Model" errorTxt="You can not view this type of content in the HTML viewer." />]]></xerteModel><youtube><![CDATA[<youtube name="Enter Page Title" text="Enter text for the page here" >Enter Embed Code Here</youtube>]]></youtube><youtuberss><![CDATA[<youtuberss name="Enter Page Title" text="Enter text for the page here" url="Enter Search Term" results="20" panelWidth="Medium" 
 	  resultsTxt="YouTube results for term"/>]]></youtuberss></newNodes>
 
@@ -4635,7 +4636,62 @@
 		<showTimer label="Show Timer" optional="true" type="CheckBox" defaultValue="true"/>
 		<timer label="Time Limit (seconds)" defaultValue="60" type="NumericStepper" min="0" max="1200" step="1" width="100" optional="true"/>
 		<timerLabel label="Time's Up Text" type="TextInput" optional="true" defaultValue="Time up"/>
-	</pageTimer></title><transcriptReader menu="Media" menuItem="Transcript Reader" hint="Synchronise a transcript to an audio file." icon="icTranscript2" thumb="thumbs/transcriptReader.jpg" remove="true">
+	</pageTimer></title><topXQ menu="Interactivity" menuItem="Top X Question " hint="pose a question with multiple answers" icon="icComments" remove="true">
+    <name label="Page Title" type="TextInput" wysiwyg="true"/>
+    <align label="Align Text" options="Left,Right" type="ComboBox" data="Left,Right" defaultValue="Left" width="100"/>
+    <instruction label="instruction" type="TextArea" height="100"/>
+    <prompt label="Question" type="TextArea" height="100"/>
+    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>
+    <numberAnswers label="Amount of correct answers" type="TextInput" defaultValue="1"/>
+
+    <feedbackLabel label="Feedback Label" type="TextInput" wysiwyg="false" divider="true" language="true"/>
+    <correctAnswersLabel label="Correct Answers Label" type="TextInput" wysiwyg="false" language="true"/>
+    <passed label="Passed" type="TextInput" wysiwyg="false" language="true"/>
+    <failed label="Failed" type="TextInput" wysiwyg="false" language="true"/>
+
+    <checkBtnTxt label="Check Button Label" type="TextInput" wysiwyg="false" language="true"/>
+    <checkBtnTip label="Check Button Tip" type="textInput" language="false" deprecated="This property is no longer required"/>
+    <checkBtnWidth label="Check Button Width" type="NumericStepper" min="100" max="250" step="10" width="100" defaultValue="100" language="true" deprecated="Width is now set automatically"/>
+
+    <feedback type="TextArea" height="40" label="Feedback" optional="true"/>
+
+    <newNodes>
+        <optionXQ><![CDATA[<option answer = "Here is an option" name = "Answer" feedback = "Feedback for this option" correct = "false"/>]]></optionXQ>
+    </newNodes>
+<narrate type="group" label="Narration" optional="true" common="true">
+		<narration label="Audio File" type="media" defaultValue="Select an Audio File" optional="true"/>
+		<playNarration label="Auto-Play" type="CheckBox" defaultValue="false" optional="true"/>
+		<narrationNavigate label="Navigate at End" type="CheckBox" defaultValue="false" optional="true"/>
+	</narrate><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" deprecated="This property is deprecated. Use the new Navigation Buttons optional property group to specify which buttons are enabled." common="true"/><navBtns type="group" label="Navigation Buttons" optional="true" info="By default the navigation buttons available on every page will depend on the project's navigation setting. Deactivate buttons on individual pages by deselecting them here." common="true">
+		<home label="Home / Table of Contents Button" type="CheckBox" defaultValue="true" optional="true"/>
+		<back label="Back / Previous Button" type="CheckBox" defaultValue="true" optional="true"/>
+		<next label="Next Button" type="CheckBox" defaultValue="true" optional="true"/>
+	</navBtns><hideShow type="group" label="Hide/Show Page" optional="true" tooltip="Hide the page completely or hide/show the page between specified dates" common="true">
+		<hidePage label="Hide Page" type="CheckBox" defaultValue="false" optional="true"/>
+		<hideOnDate label="From (dd/mm/yyyy)" type="DateField" defaultValue="" optional="true"/>
+		<hideOnTime label="From (hh:mm)" type="TextInput" defaultValue="00:00" optional="true"/>
+		<hideUntilDate label="Until (dd/mm/yyyy)" type="DateField" defaultValue="" optional="true"/>
+		<hideUntilTime label="Until (hh:mm)" type="TextInput" defaultValue="00:00" optional="true"/>
+	</hideShow><pageID label="Page ID" defaultValue="Unique ID for this page" type="TextInput" optional="true" deprecated="This property is deprecated" common="true"/><unmarkForCompletion label="Completion Not Required" type="CheckBox" defaultValue="false" optional="true" common="true"/><disableGlossary label="Disable Glossary" defaultValue="false" type="CheckBox" optional="true" common="true"/><styles label="Styles" type="script" height="200" optional="true" common="true"/><tracking type="group" label="Tracking" optional="true" common="true">
+        <trackinglabel label="Tracking Label" type="TextInput" wysiwyg="false" optional="true" tooltip="Label to use instead of page number as tracking identifier (SCORM and xAPI)"/>
+        <grouping label="Tracking Grouping" type="Grouping" optional="true" tooltip="Label to use for grouping of xAPI events, to be used for grouping in xAPI reports"/>
+	</tracking><scripts type="group" label="Script" optional="true" common="true">
+		<script label="Script" type="script" height="200" defaultValue="// JavaScript / jQuery" optional="true"/>
+		<run label="Execute" options="First time page is viewed,Every time page is viewed" type="ComboBox" width="120" data="first,all" defaultValue="first" optional="true"/>
+	</scripts><background type="group" label="Background" optional="true" common="true">
+		<bgImage label="Image" type="media" optional="true" defaultValue="Select an Image"/>
+		<bgImageAlpha label="Opacity" type="NumericStepper" min="10" max="100" step="10" defaultValue="30" optional="true"/>
+		<bgImageDark optional="true" type="NumericStepper" min="0" max="100" step="1" defaultValue="0" label="Darkness"/>
+		<bgImageGrey optional="true" type="CheckBox" label="Greyscale" defaultValue="false"/>
+	</background><pageTimer type="group" label="Page Timer" optional="true" tooltip="Add a timer to the bottom of the page, counting down to zero" common="true">
+		<showTimer label="Show Timer" optional="true" type="CheckBox" defaultValue="true"/>
+		<timer label="Time Limit (seconds)" defaultValue="60" type="NumericStepper" min="0" max="1200" step="1" width="100" optional="true"/>
+		<timerLabel label="Time's Up Text" type="TextInput" optional="true" defaultValue="Time up"/>
+	</pageTimer></topXQ><optionXQ menuItem="Answer" icon="icBullet">
+        <answer label="Answer" type="TextInput" height="100" wysiwyg="false" mandatory="true"/>
+        <name label="Label" type="TextInput" hieght="100"/>
+        <feedback label="Feedback" type="TextArea" height="100" wysiwys="true"/>
+    </optionXQ><transcriptReader menu="Media" menuItem="Transcript Reader" hint="Synchronise a transcript to an audio file." icon="icTranscript2" thumb="thumbs/transcriptReader.jpg" remove="true">
 
     <name label="Page Title" type="TextInput" wysiwyg="true"/>
     <sound label="Sound" type="Media"/>
diff --git a/src/Nottingham/wizards/en-GB/template.xwd b/src/Nottingham/wizards/en-GB/template.xwd
index 7e987ee3ec..5497f967a4 100644
--- a/src/Nottingham/wizards/en-GB/template.xwd
+++ b/src/Nottingham/wizards/en-GB/template.xwd
@@ -164,7 +164,8 @@
       PersonalAvgLabel = "Avg. of your attempts"
       PersonalLastLabel = "Your last attempt"
       AvgLabel = "Avg. of all attempts"
-      ></showGraph>]]></showGraph><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><stopTracking><![CDATA[<stopTracking name="Enter Page Title" textIntro="Instruction" buttonLbl="Stop and finish tracking of this session" textAfter="You can now close the window">Enter text for the page here</stopTracking>]]></stopTracking><summary><![CDATA[<summary name="Enter Page Title" summaryHeader="Summary" summary="Summarise the key points" nextstepsHeader="Next Steps" nextsteps="Suggest how the knowledge can be applied and any useful next steps"/>]]></summary><tabNav><![CDATA[<tabNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></tabNav><tabNavExtra><![CDATA[<tabNavExtra name="Enter Page Title" panelWidth="Large"/>]]></tabNavExtra><table><![CDATA[<table name="Enter Page Title" text="Enter text for the page here" align="left"><tableData name="Table Name" data="data|data" size="medium" borders="simple" header="header" shadeHeader="true" shade="true"/></table>]]></table><text><![CDATA[<text name="Enter Page Title">Enter text for the page here</text>]]></text><textDrawing><![CDATA[<textDrawing name="Enter Page Title" desc="Enter a description" align="left" interactivity="off"> </textDrawing>]]></textDrawing><textGraphics><![CDATA[<textGraphics name="Enter Page Title" align="Left" imagesize="auto" url="Select an Image" tip="Enter a Description for Accessibility" transcriptbuttonlabel="Transcript">Enter text for the page here</textGraphics>]]></textGraphics><textMatch><![CDATA[<textMatch name="Enter Page Title" text="Provide Instructions here" maxAttempts="3" correctMessage="Correct answers are shown" submitBtnTxt="Submit" feedback="Enter feedback here" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></textMatch><textSWF><![CDATA[<textSWF name="Enter Page Title" align="Left" url="Select a SWF File" tip="Enter a Description for Accessibility" >Enter text for the page here</textSWF>]]></textSWF><textVideo><![CDATA[<textVideo name="Enter Page Title" align="Left" url="Select a Video" tip="Enter a Description for Accessibility" transcriptTabTxt="Transcript" >Enter text for the page here</textVideo>]]></textVideo><thumbnailViewer><![CDATA[<thumbnailViewer name="Enter Page Title" text="Enter text for the page" nextBtnTip="Next" priorBtnTip="Previous"/>]]></thumbnailViewer><timeline><![CDATA[<timeline name="Enter Page Title" text="Enter text for the page here" interactivity="Timeline" feedback="Enter feedback here" checkBtnTxt="Check Answers" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></timeline><title><![CDATA[<title name="Enter Page Title" size="30">Enter title here</title>]]></title><transcriptReader><![CDATA[<transcriptReader name="Enter Page Title" sound="Select a Sound File" text="Enter text for the page here" panelWidth="Medium"/>]]></transcriptReader><videoSynch><![CDATA[<videoSynch name="Enter Page Title" url="Select a Video" text="Enter text for the page here" pause="True" erase="True"/>]]></videoSynch><wiki><![CDATA[<wiki name="Enter Page Title" text="Enter Page text" url="Enter Article URL" align="Left"/>]]></wiki><wordsearch><![CDATA[<wordsearch name="Enter Page Title" text="Enter Page text" words="Enter words here, placing each on a new line" solveBtnTxt="Solve Puzzle" retryBtnTxt="Restart Puzzle"
+      ></showGraph>]]></showGraph><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><stopTracking><![CDATA[<stopTracking name="Enter Page Title" textIntro="Instruction" buttonLbl="Stop and finish tracking of this session" textAfter="You can now close the window">Enter text for the page here</stopTracking>]]></stopTracking><summary><![CDATA[<summary name="Enter Page Title" summaryHeader="Summary" summary="Summarise the key points" nextstepsHeader="Next Steps" nextsteps="Suggest how the knowledge can be applied and any useful next steps"/>]]></summary><tabNav><![CDATA[<tabNav name="Enter Page Title" text="Enter text for the page here" panelWidth="Medium"/>]]></tabNav><tabNavExtra><![CDATA[<tabNavExtra name="Enter Page Title" panelWidth="Large"/>]]></tabNavExtra><table><![CDATA[<table name="Enter Page Title" text="Enter text for the page here" align="left"><tableData name="Table Name" data="data|data" size="medium" borders="simple" header="header" shadeHeader="true" shade="true"/></table>]]></table><text><![CDATA[<text name="Enter Page Title">Enter text for the page here</text>]]></text><textDrawing><![CDATA[<textDrawing name="Enter Page Title" desc="Enter a description" align="left" interactivity="off"> </textDrawing>]]></textDrawing><textGraphics><![CDATA[<textGraphics name="Enter Page Title" align="Left" imagesize="auto" url="Select an Image" tip="Enter a Description for Accessibility" transcriptbuttonlabel="Transcript">Enter text for the page here</textGraphics>]]></textGraphics><textMatch><![CDATA[<textMatch name="Enter Page Title" text="Provide Instructions here" maxAttempts="3" correctMessage="Correct answers are shown" submitBtnTxt="Submit" feedback="Enter feedback here" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></textMatch><textSWF><![CDATA[<textSWF name="Enter Page Title" align="Left" url="Select a SWF File" tip="Enter a Description for Accessibility" >Enter text for the page here</textSWF>]]></textSWF><textVideo><![CDATA[<textVideo name="Enter Page Title" align="Left" url="Select a Video" tip="Enter a Description for Accessibility" transcriptTabTxt="Transcript" >Enter text for the page here</textVideo>]]></textVideo><thumbnailViewer><![CDATA[<thumbnailViewer name="Enter Page Title" text="Enter text for the page" nextBtnTip="Next" priorBtnTip="Previous"/>]]></thumbnailViewer><timeline><![CDATA[<timeline name="Enter Page Title" text="Enter text for the page here" interactivity="Timeline" feedback="Enter feedback here" checkBtnTxt="Check Answers" allWrong="You have not placed any labels correctly. Try again." allWrongTracking="You have not placed any labels correctly." score="You have scored {i} out of {n}. Try again." scoreTracking="You have scored {i} out of {n}." incomplete="Complete the exercise." />]]></timeline><title><![CDATA[<title name="Enter Page Title" size="30">Enter title here</title>]]></title><topXQ><![CDATA[<tXQ name="Enter Page Title" instruction = "Enter Your Instruction" prompt= "Enter Your Question" align = "Left" panelWidth = "Medium" numberAnswers = "Enter amount of fields" feedbackLabel="Feedback" correctAnswersLabel="Correct answers" passed="You passed the question!" failed="You did not pass the question"
+	  checkBtnTxt="Check"/>]]></topXQ><transcriptReader><![CDATA[<transcriptReader name="Enter Page Title" sound="Select a Sound File" text="Enter text for the page here" panelWidth="Medium"/>]]></transcriptReader><videoSynch><![CDATA[<videoSynch name="Enter Page Title" url="Select a Video" text="Enter text for the page here" pause="True" erase="True"/>]]></videoSynch><wiki><![CDATA[<wiki name="Enter Page Title" text="Enter Page text" url="Enter Article URL" align="Left"/>]]></wiki><wordsearch><![CDATA[<wordsearch name="Enter Page Title" text="Enter Page text" words="Enter words here, placing each on a new line" solveBtnTxt="Solve Puzzle" retryBtnTxt="Restart Puzzle"
 	  />]]></wordsearch><xerteModel><![CDATA[<xerteModel name="Enter Page Title" modelFile="Select a Model" errorTxt="You can not view this type of content in the HTML viewer." />]]></xerteModel><youtube><![CDATA[<youtube name="Enter Page Title" text="Enter text for the page here" >Enter Embed Code Here</youtube>]]></youtube><youtuberss><![CDATA[<youtuberss name="Enter Page Title" text="Enter text for the page here" url="Enter Search Term" results="20" panelWidth="Medium" 
 	  resultsTxt="YouTube results for term"/>]]></youtuberss></newNodes>
 
@@ -4635,7 +4636,62 @@
 		<showTimer label="Show Timer" optional="true" type="CheckBox" defaultValue="true"/>
 		<timer label="Time Limit (seconds)" defaultValue="60" type="NumericStepper" min="0" max="1200" step="1" width="100" optional="true"/>
 		<timerLabel label="Time's Up Text" type="TextInput" optional="true" defaultValue="Time up"/>
-	</pageTimer></title><transcriptReader menu="Media" menuItem="Transcript Reader" hint="Synchronise a transcript to an audio file." icon="icTranscript2" thumb="thumbs/transcriptReader.jpg" remove="true">
+	</pageTimer></title><topXQ menu="Interactivity" menuItem="Top X Question " hint="pose a question with multiple answers" icon="icComments" remove="true">
+    <name label="Page Title" type="TextInput" wysiwyg="true"/>
+    <align label="Align Text" options="Left,Right" type="ComboBox" data="Left,Right" defaultValue="Left" width="100"/>
+    <instruction label="instruction" type="TextArea" height="100"/>
+    <prompt label="Question" type="TextArea" height="100"/>
+    <panelWidth label="Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>
+    <numberAnswers label="Amount of correct answers" type="TextInput" defaultValue="1"/>
+
+    <feedbackLabel label="Feedback Label" type="TextInput" wysiwyg="false" divider="true" language="true"/>
+    <correctAnswersLabel label="Correct Answers Label" type="TextInput" wysiwyg="false" language="true"/>
+    <passed label="Passed" type="TextInput" wysiwyg="false" language="true"/>
+    <failed label="Failed" type="TextInput" wysiwyg="false" language="true"/>
+
+    <checkBtnTxt label="Check Button Label" type="TextInput" wysiwyg="false" language="true"/>
+    <checkBtnTip label="Check Button Tip" type="textInput" language="false" deprecated="This property is no longer required"/>
+    <checkBtnWidth label="Check Button Width" type="NumericStepper" min="100" max="250" step="10" width="100" defaultValue="100" language="true" deprecated="Width is now set automatically"/>
+
+    <feedback type="TextArea" height="40" label="Feedback" optional="true"/>
+
+    <newNodes>
+        <optionXQ><![CDATA[<option answer = "Here is an option" name = "Answer" feedback = "Feedback for this option" correct = "false"/>]]></optionXQ>
+    </newNodes>
+<narrate type="group" label="Narration" optional="true" common="true">
+		<narration label="Audio File" type="media" defaultValue="Select an Audio File" optional="true"/>
+		<playNarration label="Auto-Play" type="CheckBox" defaultValue="false" optional="true"/>
+		<narrationNavigate label="Navigate at End" type="CheckBox" defaultValue="false" optional="true"/>
+	</narrate><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" deprecated="This property is deprecated. Use the new Navigation Buttons optional property group to specify which buttons are enabled." common="true"/><navBtns type="group" label="Navigation Buttons" optional="true" info="By default the navigation buttons available on every page will depend on the project's navigation setting. Deactivate buttons on individual pages by deselecting them here." common="true">
+		<home label="Home / Table of Contents Button" type="CheckBox" defaultValue="true" optional="true"/>
+		<back label="Back / Previous Button" type="CheckBox" defaultValue="true" optional="true"/>
+		<next label="Next Button" type="CheckBox" defaultValue="true" optional="true"/>
+	</navBtns><hideShow type="group" label="Hide/Show Page" optional="true" tooltip="Hide the page completely or hide/show the page between specified dates" common="true">
+		<hidePage label="Hide Page" type="CheckBox" defaultValue="false" optional="true"/>
+		<hideOnDate label="From (dd/mm/yyyy)" type="DateField" defaultValue="" optional="true"/>
+		<hideOnTime label="From (hh:mm)" type="TextInput" defaultValue="00:00" optional="true"/>
+		<hideUntilDate label="Until (dd/mm/yyyy)" type="DateField" defaultValue="" optional="true"/>
+		<hideUntilTime label="Until (hh:mm)" type="TextInput" defaultValue="00:00" optional="true"/>
+	</hideShow><pageID label="Page ID" defaultValue="Unique ID for this page" type="TextInput" optional="true" deprecated="This property is deprecated" common="true"/><unmarkForCompletion label="Completion Not Required" type="CheckBox" defaultValue="false" optional="true" common="true"/><disableGlossary label="Disable Glossary" defaultValue="false" type="CheckBox" optional="true" common="true"/><styles label="Styles" type="script" height="200" optional="true" common="true"/><tracking type="group" label="Tracking" optional="true" common="true">
+        <trackinglabel label="Tracking Label" type="TextInput" wysiwyg="false" optional="true" tooltip="Label to use instead of page number as tracking identifier (SCORM and xAPI)"/>
+        <grouping label="Tracking Grouping" type="Grouping" optional="true" tooltip="Label to use for grouping of xAPI events, to be used for grouping in xAPI reports"/>
+	</tracking><scripts type="group" label="Script" optional="true" common="true">
+		<script label="Script" type="script" height="200" defaultValue="// JavaScript / jQuery" optional="true"/>
+		<run label="Execute" options="First time page is viewed,Every time page is viewed" type="ComboBox" width="120" data="first,all" defaultValue="first" optional="true"/>
+	</scripts><background type="group" label="Background" optional="true" common="true">
+		<bgImage label="Image" type="media" optional="true" defaultValue="Select an Image"/>
+		<bgImageAlpha label="Opacity" type="NumericStepper" min="10" max="100" step="10" defaultValue="30" optional="true"/>
+		<bgImageDark optional="true" type="NumericStepper" min="0" max="100" step="1" defaultValue="0" label="Darkness"/>
+		<bgImageGrey optional="true" type="CheckBox" label="Greyscale" defaultValue="false"/>
+	</background><pageTimer type="group" label="Page Timer" optional="true" tooltip="Add a timer to the bottom of the page, counting down to zero" common="true">
+		<showTimer label="Show Timer" optional="true" type="CheckBox" defaultValue="true"/>
+		<timer label="Time Limit (seconds)" defaultValue="60" type="NumericStepper" min="0" max="1200" step="1" width="100" optional="true"/>
+		<timerLabel label="Time's Up Text" type="TextInput" optional="true" defaultValue="Time up"/>
+	</pageTimer></topXQ><optionXQ menuItem="Answer" icon="icBullet">
+        <answer label="Answer" type="TextInput" height="100" wysiwyg="false" mandatory="true"/>
+        <name label="Label" type="TextInput" hieght="100"/>
+        <feedback label="Feedback" type="TextArea" height="100" wysiwys="true"/>
+    </optionXQ><transcriptReader menu="Media" menuItem="Transcript Reader" hint="Synchronise a transcript to an audio file." icon="icTranscript2" thumb="thumbs/transcriptReader.jpg" remove="true">
 
     <name label="Page Title" type="TextInput" wysiwyg="true"/>
     <sound label="Sound" type="Media"/>
diff --git a/src/Nottingham/wizards/en-GB/topXQ.xwd b/src/Nottingham/wizards/en-GB/topXQ.xwd
new file mode 100644
index 0000000000..f756d2ff71
--- /dev/null
+++ b/src/Nottingham/wizards/en-GB/topXQ.xwd
@@ -0,0 +1,40 @@
+<wizard menus="Interactivity">
+    <pageWizard remove="true" dublicate="false">
+        <newNodes>
+            <topXQ><![CDATA[<tXQ name="Enter Page Title" instruction = "Enter Your Instruction" prompt= "Enter Your Question" align = "Left" panelWidth = "Medium" numberAnswers = "Enter amount of fields" feedbackLabel="Feedback" correctAnswersLabel="Correct answers" passed="You passed the question!" failed="You did not pass the question"
+	  checkBtnTxt="Check"/>]]></topXQ>
+        </newNodes>
+    </pageWizard>
+
+    <!-- TXQ PAGE=============================-->
+<topXQ menu = "Interactivity" menuItem = "Top X Question " hint = "pose a question with multiple answers" icon = "icComments" remove = "true">
+    <name label = "Page Title" type = "TextInput" wysiwyg = "true"/>
+    <align label = "Align Text" options = "Left,Right" type = "ComboBox" data = "Left,Right" defaultValue = "Left" width = "100"/>
+    <instruction label = "instruction" type = "TextArea" height = "100"/>
+    <prompt label="Question" type="TextArea" height="100"/>
+    <panelWidth label=  "Panel Width" options="Small,Medium,Large,Full" type="ComboBox" data="Small,Medium,Large,Full" defaultValue="Medium" width="100"/>
+    <numberAnswers label="Amount of correct answers" type="TextInput" defaultValue="1"/>
+
+    <feedbackLabel label="Feedback Label" type="TextInput" wysiwyg="false" divider="true" language="true" />
+    <correctAnswersLabel label="Correct Answers Label" type="TextInput" wysiwyg="false" language="true"></correctAnswersLabel>
+    <passed label="Passed" type="TextInput" wysiwyg="false" language="true" />
+    <failed label="Failed" type="TextInput" wysiwyg="false" language="true" />
+
+    <checkBtnTxt label="Check Button Label" type="TextInput" wysiwyg="false" language="true" />
+    <checkBtnTip label="Check Button Tip" type="textInput" language="false" deprecated="This property is no longer required"/>
+    <checkBtnWidth label="Check Button Width" type="NumericStepper" min="100" max="250" step="10" width="100" defaultValue="100" language="true" deprecated="Width is now set automatically"/>
+
+    <feedback type="TextArea" height="40" label="Feedback" optional="true"/>
+
+    <newNodes>
+        <optionXQ><![CDATA[<option answer = "Here is an option" name = "Answer" feedback = "Feedback for this option" correct = "false"/>]]></optionXQ>
+    </newNodes>
+</topXQ>
+
+    <optionXQ menuItem = "Answer" icon = "icBullet">
+        <answer label = "Answer" type = "TextInput" height = "100" wysiwyg="false" mandatory="true"/>
+        <name label = "Label" type = "TextInput" hieght = "100"/>
+        <feedback label = "Feedback" type= "TextArea" height = "100" wysiwys="true"/>
+    </optionXQ>
+
+</wizard>