Skip to content

Commit

Permalink
#500 Changed questions in various pages to use p tags instead of h3 f…
Browse files Browse the repository at this point in the history 
…or questions (styled so they look the same)
  • Loading branch information
@FayCross
FayCross committed Mar 15, 2024
1 parent 322cabc commit e815065
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 29 deletions.
13 changes: 12 additions & 1 deletion modules/xerte/parent_templates/Nottingham/models_html5/cMcq.css
View file
Expand Up @@ -34,4 +34,15 @@
#feedback {
clear: both;
}


legend#question {
width: 100%;
font-weight: bold;
padding-left: 0.3em;
padding-right: 0.3em;
}

legend#question p {
padding-left: 0;
padding-right: 0;
}
18 changes: 10 additions & 8 deletions modules/xerte/parent_templates/Nottingham/models_html5/cMcq.html
View file
Expand Up @@ -182,15 +182,17 @@

<div id="infoHolder" class="right">
<div class="panel">
<h3 id="question"></h3>
<div id="optionHolder">
<div class="optionGroup">
<input type="radio" name="option" />
<label class="optionTxt"></label>
<fieldset class="noStyle">
<legend id="question"></legend>
<div id="optionHolder">
<div class="optionGroup">
<input type="radio" name="option" />
<label class="optionTxt"></label>
</div>
</div>
</div>
<button id="confirmBtn"></button>
<div id="feedback" class="alert"></div>
<button id="confirmBtn"></button>
<div id="feedback" aria-live="polite" class="alert"></div>
</fieldset>
</div>
</div>

Expand Down
9 changes: 9 additions & 0 deletions modules/xerte/parent_templates/Nottingham/models_html5/inventory.css
View file
Expand Up @@ -54,3 +54,12 @@
.fbBlock h3 {
padding-top: .5em;
}

#qNo {
font-weight: bold;
padding-top: 0;
}

#qTxt {
padding: 0;
}
16 changes: 10 additions & 6 deletions modules/xerte/parent_templates/Nottingham/models_html5/inventory.html
View file
Expand Up @@ -631,22 +631,26 @@

<div id="infoHolder" class="right">
<div class="panel">

<div class="quiz">
<h3 id="qNo"></h3>

<fieldset class="quiz noStyle">

<p id="qNo" aria-live="polite"></p>

<div class="qContent">
<div id="qTxt"></div>
<span><legend id="qTxt"></legend></span>
<div id="optionHolder"></div>
<div id="buttonHolder">
<button id="checkBtn"></button>
<button id="nextBtn"></button>
</div>
<div id="qFeedback">
<div id="qFeedback" aria-live="polite">
<h3 id="qFeedbackTitle"></h3>
<p id="qFeedbackTxt"></p>
</div>
</div>
</div>


</fieldset>

<div class="chart">
<h3 id="chartTitle"></h3>
Expand Down
7 changes: 7 additions & 0 deletions modules/xerte/parent_templates/Nottingham/models_html5/mcq.css
View file
Expand Up @@ -50,5 +50,12 @@

legend#question {
width: 100%;
font-weight: bold;
padding-left: 0.3em;
padding-right: 0.3em;
}

legend#question p {
padding-left: 0;
padding-right: 0;
}
4 changes: 1 addition & 3 deletions modules/xerte/parent_templates/Nottingham/models_html5/mcq.html
View file
Expand Up @@ -457,9 +457,7 @@
<div id="infoHolder" class="right">
<div id="mainPanel" class="panel">
<fieldset class="noStyle">
<h3>
<legend id="question"></legend>
</h3>
<legend id="question"></legend>
<div id="optionHolder">
<div class="optionGroup">
<input type="radio" name="option" />
Expand Down
7 changes: 5 additions & 2 deletions modules/xerte/parent_templates/Nottingham/models_html5/opinion.css
View file
Expand Up @@ -100,11 +100,12 @@

.qTxt {
width: 100%;
padding: 0;
}

#qNo {
padding-top: 5px;
padding-bottom: 10px;
padding-top: 0;
font-weight: bold;
}
#buttonHolder
{
Expand Down Expand Up @@ -160,3 +161,5 @@
#x_mainHolder.x_opinion_page .fbBlock:not(:first-child) h3 {
padding-top: .5em;
}


8 changes: 4 additions & 4 deletions modules/xerte/parent_templates/Nottingham/models_html5/opinion.html
View file
Expand Up @@ -1057,14 +1057,14 @@

<div id="mainPanel" class="panel qPanel">

<h3 id="qNo" aria-live="polite"></h3>
<p id="qNo" aria-live="polite"></p>

<fieldset class="noStyle">

<div id="feedback" aria-live="polite"></div>
<div id="canvas-container">
<canvas id="diagram" aria-live="polite"></canvas>
</div>
<div id="canvas-container">
<canvas id="diagram" aria-live="polite"></canvas>
</div>

<div id="wrapper">
<div id="qHolder"></div>
Expand Down
6 changes: 6 additions & 0 deletions modules/xerte/parent_templates/Nottingham/models_html5/quiz.css
View file
Expand Up @@ -79,6 +79,7 @@

#qTxt {
width: 100%;
padding: 0;
}

#feedbackGroup .feedbackBlock {
Expand All @@ -87,4 +88,9 @@

#mainPanel {
overflow: auto;
}

#qNo {
font-weight: bold;
padding-top: 0;
}
4 changes: 2 additions & 2 deletions modules/xerte/parent_templates/Nottingham/models_html5/quiz.html
View file
Expand Up @@ -747,10 +747,10 @@
<div id="infoHolder" class="right">

<div id="mainPanel" class="panel ">

<h3 id="qNo" aria-live="polite"></h3>

<fieldset class="noStyle">

<p id="qNo" aria-live="polite"></p>

<span><legend id="qTxt"></legend></span>

Expand Down
2 changes: 1 addition & 1 deletion modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
View file
Expand Up @@ -368,7 +368,7 @@
copypasteinfo="Note: Click the 'Select Text' button to highlight the text on the right and then Ctrl + C to copy this text to the clipboard. You can then paste (Ctrl + V) into another application such as Open Office, Word or an email to save for future reference."
></modelAnswerResults>]]></modelAnswerResults><modify><![CDATA[<modify name="Enter Page Title" instruction="" text="" prompt="" answer="" answerType="true"
answerHeaderTxt="Write your answer here:" feedbackBtnTxt="Feedback" answerFieldLabel="Answer"
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="" url="" tip1="" url2="" tip2="" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><nav><![CDATA[<nav name="Enter Page Title" text="" type="Tab" nextBtnTip="Next" prevBtnTip="Previous" slideCount="Slide {i} of {n}"/>]]></nav><newWindow><![CDATA[<newWindow name="Enter Page Title" text="" url="" descrip="" target="new" previewImage="" tip="" windowWidth="550" windowHeight="400"/>]]></newWindow><opinion><![CDATA[<opinion name="Enter Page Title" order="sequence" align="left" panelWidth="Medium" instructions="" showfeedback="true" feedback=""
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="" url="" tip1="" url2="" tip2="" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><nav><![CDATA[<nav name="Enter Page Title" text="" type="Tab" nextBtnTip="Next" prevBtnTip="Previous" slideCount="Slide {i} of {n}"/>]]></nav><newWindow><![CDATA[<newWindow name="Enter Page Title" text="" url="" descrip="" target="new" previewImage="" tip="" windowWidth="550" windowHeight="400"/>]]></newWindow><opinion><![CDATA[<opinion name="Enter Page Title" order="sequence" align="left" panelWidth="Medium" instructions="" feedback=""
quesCount="Question {i} of {n}"
onCompletion="You have completed the questionnaire" score="You answered {i} / {n}"
submitBtnText="Submit"
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/opinion.xwd
View file
@@ -1,7 +1,7 @@
<wizard menus="Interactivity">
<pageWizard remove="true" duplicate="false">
<newNodes>
<opinion><![CDATA[<opinion name="Enter Page Title" order="sequence" align="left" panelWidth="Medium" instructions="" showfeedback="true" feedback=""
<opinion><![CDATA[<opinion name="Enter Page Title" order="sequence" align="left" panelWidth="Medium" instructions="" feedback=""
quesCount="Question {i} of {n}"
onCompletion="You have completed the questionnaire" score="You answered {i} / {n}"
submitBtnText="Submit"
Expand Down
2 changes: 1 addition & 1 deletion src/Nottingham/wizards/en-GB/template.xwd
View file
Expand Up @@ -368,7 +368,7 @@
copypasteinfo="Note: Click the 'Select Text' button to highlight the text on the right and then Ctrl + C to copy this text to the clipboard. You can then paste (Ctrl + V) into another application such as Open Office, Word or an email to save for future reference."
></modelAnswerResults>]]></modelAnswerResults><modify><![CDATA[<modify name="Enter Page Title" instruction="" text="" prompt="" answer="" answerType="true"
answerHeaderTxt="Write your answer here:" feedbackBtnTxt="Feedback" answerFieldLabel="Answer"
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="" url="" tip1="" url2="" tip2="" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><nav><![CDATA[<nav name="Enter Page Title" text="" type="Tab" nextBtnTip="Next" prevBtnTip="Previous" slideCount="Slide {i} of {n}"/>]]></nav><newWindow><![CDATA[<newWindow name="Enter Page Title" text="" url="" descrip="" target="new" previewImage="" tip="" windowWidth="550" windowHeight="400"/>]]></newWindow><opinion><![CDATA[<opinion name="Enter Page Title" order="sequence" align="left" panelWidth="Medium" instructions="" showfeedback="true" feedback=""
/>]]></modify><morphImages><![CDATA[<morphImages name="Enter Page Title" text="" url="" tip1="" url2="" tip2="" zoomSpeed="3" buttonLabel="Zoom"><hotspot name="Zoom Region" x="0" y="0" w="100" h="100" /></morphImages>]]></morphImages><nav><![CDATA[<nav name="Enter Page Title" text="" type="Tab" nextBtnTip="Next" prevBtnTip="Previous" slideCount="Slide {i} of {n}"/>]]></nav><newWindow><![CDATA[<newWindow name="Enter Page Title" text="" url="" descrip="" target="new" previewImage="" tip="" windowWidth="550" windowHeight="400"/>]]></newWindow><opinion><![CDATA[<opinion name="Enter Page Title" order="sequence" align="left" panelWidth="Medium" instructions="" feedback=""
quesCount="Question {i} of {n}"
onCompletion="You have completed the questionnaire" score="You answered {i} / {n}"
submitBtnText="Submit"
Expand Down

0 comments on commit e815065

Please sign in to comment.