fixes for inges tests 22-04

thexerteproject · Apr 23, 2021 · e85978f · e85978f
1 parent 6151b2d
commit e85978f
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 17 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.mcq.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.mcq.js
@@ -553,8 +553,8 @@ optional: feedback page synch play enable
 						$target.parent().addClass("qWindow").addClass("panel");
 						$target.parent().css({
 							"width" : options._w + "%",
+							"overflow-x": "hidden"
 						});
-						$target.css("overflow-x", "hidden")
 						$optHolder.show();
 						$checkBtn.show();
 					}
@@ -566,7 +566,7 @@ optional: feedback page synch play enable
 							"width"   :       (size * 0.008) * hh + "px",
 							"padding" :       (size * 0.001) * hh + "px",
 							"border-radius" : (size / 2 + 1) * 0.01 * hh + "px",
-							"font-size" : 	  (size * 0.008) * hh + "px",
+							"font-size" : 	  (size * 0.007) * hh + "px",
 						});
 						if(options.attrib.tooltip == "label") {	
 							// Cap the fontsize to reasonable values
@@ -575,7 +575,7 @@ optional: feedback page synch play enable
 								"padding": 5,
 								"padding-left": (size * 0.55) * 0.01 * hh + 5,
 								"left": (size * 0.005) * hh + 5,
-								"top": (size * 0.005) * hh,
+								"top": (size * 0.005) * hh - 2,
 								"font-size": fs
 							});
 						}
@@ -619,6 +619,7 @@ optional: feedback page synch play enable
 						"top": 0,
 						"left": 0,
 						"padding": 0,
+						"height": "auto",
 						"margin-right" : 0,
 						"overflow-x": ''
                 	}).hide();

diff --git a/...te/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.overlaygeneric.css b/...te/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.overlaygeneric.css
@@ -27,7 +27,7 @@
 /* OPTIONAL ELEMENT BUTTON */
 .showHotspot { 
     position      : absolute;
-    display       : table-cell;
+    display       : table;
     height        : auto;
     width         : auto;
     float         : left;
@@ -36,6 +36,11 @@
     text-align    : center;
     vertical-align: middle;
 }
+
+.showHotspot::before {
+    display: table-cell;
+    vertical-align: middle;
+}
 .showLabel {
     position: absolute;
     display: inline-block;

diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.slides.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.slides.js
@@ -169,7 +169,7 @@ optional: caption captionPosV captionPosH
 								"width"   :       (size * 0.008) * hh + "px",
 								"padding" :       (size * 0.001) * hh + "px",
 								"border-radius" : (size / 2 + 1) * 0.01 * hh + "px",
-								"font-size" : 	  (size * 0.008) * hh + "px",
+								"font-size" : 	  (size * 0.007) * hh + "px",
 							});
 							if(options.attrib.tooltip == "label") {	
 								// Cap the fontsize to reasonable values
@@ -178,7 +178,7 @@ optional: caption captionPosV captionPosH
 									"padding": 5,
 									"padding-left": (size * 0.55) * 0.01 * hh + 5,
 									"left": (size * 0.005) * hh,
-									"top": (size * 0.005) * hh,
+									"top": (size * 0.005) * hh - 2,
 									"font-size": fs
 								});
 							}

diff --git a/...les/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.textplus.js b/...les/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.textplus.js
@@ -93,8 +93,7 @@ optional: end position* line
                         	    $showHolder.hide();
 								$target.prepend(txt);
 								$target.parent().addClass("qWindow").addClass("panel");
-								$target.parent().css({"padding": 5});
-								$target.css("overflow-x", "hidden");
+								$target.parent().css({"padding": 5, "overflow-x": "hidden"});
                         	});
 					// If not optional
                		} else {
@@ -115,8 +114,7 @@ optional: end position* line
 					if (options.optional == undefined || options.optional === "false")
 					{
 						$target.parent().addClass("qWindow").addClass("panel");
-						$target.parent().css({"width" : options._w + "%"});
-						$target.css("overflow-x", "hidden");
+						$target.parent().css({"width" : options._w + "%", "overflow-x": "hidden"});
 					}
 					else {
 						var hh = $(".mainMedia").height();
@@ -126,7 +124,7 @@ optional: end position* line
 							"width"   :       (size * 0.008) * hh + "px",
 							"padding" :       (size * 0.001) * hh + "px",
 							"border-radius" : (size / 2 + 1) * 0.01 * hh + "px",
-							"font-size" : 	  (size * 0.008) * hh + "px",
+							"font-size" : 	  (size * 0.007) * hh + "px",
 						});
 						if(options.attrib.tooltip == "label") {	
 							// Cap the fontsize to reasonable values
@@ -135,7 +133,7 @@ optional: end position* line
 								"padding": 5,
 								"padding-left": (size * 0.55) * 0.01 * hh + 5,
 								"left": (size * 0.005) * hh,
-								"top": (size * 0.005) * hh,
+								"top": (size * 0.005) * hh - 2,
 								"font-size": fs
 							});
 						}

diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.xot.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/popcorn/plugins/popcorn.xot.js
@@ -269,7 +269,7 @@ optional: pauseMedia*
 							"width"   :       (size * 0.008) * hh + "px",
 							"padding" :       (size * 0.001) * hh + "px",
 							"border-radius" : (size / 2 + 1) * 0.01 * hh + "px",
-							"font-size" : 	  (size * 0.008) * hh + "px",
+							"font-size" : 	  (size * 0.007) * hh + "px",
 						});
 						if(options.attrib.tooltip == "label") {	
 							// Cap the fontsize to reasonable values
@@ -278,7 +278,7 @@ optional: pauseMedia*
 								"padding": 5,
 								"padding-left": (size * 0.55) * 0.01 * hh + 5,
 								"left": (size * 0.005) * hh,
-								"top": (size * 0.005) * hh,
+								"top": (size * 0.005) * hh - 2,
 								"font-size": fs
 							});
 						}

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/mediaLesson.css b/modules/xerte/parent_templates/Nottingham/models_html5/mediaLesson.css
@@ -130,6 +130,7 @@
 		display: inline-block;
 		z-index: 3;
 	}
+
 
 	#panelHolder .panel.tileH {
 		display:	inline-block;

diff --git a/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd b/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
@@ -4109,7 +4109,7 @@
 			--><!--<synchWebpage><![CDATA[<synchWebpage name="Enter Title" src="Enter URL" synchStart="0" clearpanel="true" pauseMedia="false" fullH="true"/>]]></synchWebpage>
 			--><!--<synchMediaPlus><![CDATA[<synchMediaPlus name="Enter Title" media="Select Media" width="800" height="600" tip="Enter a Description for Accessibility" synchStart="0" autoplay="false" clearpanel="true" pauseMedia="true" transcriptBtnTxt="Transcript"/>]]></synchMediaPlus>
 			--><synchMCQ><![CDATA[<synchMCQ name="Enter Title" text="Enter a Prompt" type="radio" answerType="single" synchStart="0" clearpanel="true" pauseMedia="true" disable="true" 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" checkBtnTxt="Check" continueBtnTxt="Continue" topOption="Select Answer..."/>]]></synchMCQ>
-			<synchSlides><![CDATA[<synchSlides name="Enter Title" synchStart="0" clearpanel="true" pauseMedia="false"><synchSlide name="Enter a Description for Accessibility" url="Select Image" synchStart="0" pauseMedia="false"/></synchSlides>]]></synchSlides>
+			<!--<synchSlides><![CDATA[<synchSlides name="Enter Title" synchStart="0" clearpanel="true" pauseMedia="false"><synchSlide name="Enter a Description for Accessibility" url="Select Image" synchStart="0" pauseMedia="false"/></synchSlides>]]></synchSlides>-->
 			<synchTextPlus><![CDATA[<synchTextPlus name="Enter Title" text="Enter Panel Contents" synchStart="0" clearpanel="true" pauseMedia="false"/>]]></synchTextPlus>
 			<!--<synchEmpty><![CDATA[<synchEmpty name="Clear Panel" synchStart="0"/>]]></synchEmpty>-->
 		</newNodes>

diff --git a/src/Nottingham/wizards/en-GB/mediaLesson.xwd b/src/Nottingham/wizards/en-GB/mediaLesson.xwd
@@ -90,7 +90,7 @@
 			--><!--<synchWebpage><![CDATA[<synchWebpage name="Enter Title" src="Enter URL" synchStart="0" clearpanel="true" pauseMedia="false" fullH="true"/>]]></synchWebpage>
 			--><!--<synchMediaPlus><![CDATA[<synchMediaPlus name="Enter Title" media="Select Media" width="800" height="600" tip="Enter a Description for Accessibility" synchStart="0" autoplay="false" clearpanel="true" pauseMedia="true" transcriptBtnTxt="Transcript"/>]]></synchMediaPlus>
 			--><synchMCQ><![CDATA[<synchMCQ name="Enter Title" text="Enter a Prompt" type="radio" answerType="single" synchStart="0" clearpanel="true" pauseMedia="true" disable="true" 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" checkBtnTxt="Check" continueBtnTxt="Continue" topOption="Select Answer..."/>]]></synchMCQ>
-			<synchSlides><![CDATA[<synchSlides name="Enter Title" synchStart="0" clearpanel="true" pauseMedia="false"><synchSlide name="Enter a Description for Accessibility" url="Select Image" synchStart="0" pauseMedia="false"/></synchSlides>]]></synchSlides>
+			<!--<synchSlides><![CDATA[<synchSlides name="Enter Title" synchStart="0" clearpanel="true" pauseMedia="false"><synchSlide name="Enter a Description for Accessibility" url="Select Image" synchStart="0" pauseMedia="false"/></synchSlides>]]></synchSlides>-->
 			<synchTextPlus><![CDATA[<synchTextPlus name="Enter Title" text="Enter Panel Contents" synchStart="0" clearpanel="true" pauseMedia="false"/>]]></synchTextPlus>
 			<!--<synchEmpty><![CDATA[<synchEmpty name="Clear Panel" synchStart="0"/>]]></synchEmpty>-->
 		</newNodes>

diff --git a/src/Nottingham/wizards/en-GB/template.xwd b/src/Nottingham/wizards/en-GB/template.xwd
@@ -4109,7 +4109,7 @@
 			--><!--<synchWebpage><![CDATA[<synchWebpage name="Enter Title" src="Enter URL" synchStart="0" clearpanel="true" pauseMedia="false" fullH="true"/>]]></synchWebpage>
 			--><!--<synchMediaPlus><![CDATA[<synchMediaPlus name="Enter Title" media="Select Media" width="800" height="600" tip="Enter a Description for Accessibility" synchStart="0" autoplay="false" clearpanel="true" pauseMedia="true" transcriptBtnTxt="Transcript"/>]]></synchMediaPlus>
 			--><synchMCQ><![CDATA[<synchMCQ name="Enter Title" text="Enter a Prompt" type="radio" answerType="single" synchStart="0" clearpanel="true" pauseMedia="true" disable="true" 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" checkBtnTxt="Check" continueBtnTxt="Continue" topOption="Select Answer..."/>]]></synchMCQ>
-			<synchSlides><![CDATA[<synchSlides name="Enter Title" synchStart="0" clearpanel="true" pauseMedia="false"><synchSlide name="Enter a Description for Accessibility" url="Select Image" synchStart="0" pauseMedia="false"/></synchSlides>]]></synchSlides>
+			<!--<synchSlides><![CDATA[<synchSlides name="Enter Title" synchStart="0" clearpanel="true" pauseMedia="false"><synchSlide name="Enter a Description for Accessibility" url="Select Image" synchStart="0" pauseMedia="false"/></synchSlides>]]></synchSlides>-->
 			<synchTextPlus><![CDATA[<synchTextPlus name="Enter Title" text="Enter Panel Contents" synchStart="0" clearpanel="true" pauseMedia="false"/>]]></synchTextPlus>
 			<!--<synchEmpty><![CDATA[<synchEmpty name="Clear Panel" synchStart="0"/>]]></synchEmpty>-->
 		</newNodes>