From 77d7373a471dc98f2c32c1e4b624f4d693622fdd Mon Sep 17 00:00:00 2001
From: FayCross <cross.fay@gmail.com>
Date: Wed, 8 Mar 2023 12:40:13 +0000
Subject: [PATCH] #1199 Change show hints label and added tooltips

---
 .../parent_templates/Nottingham/wizards/en-GB/data.xwd    | 8 ++++----
 src/Nottingham/wizards/en-GB/gapFill.xwd                  | 8 ++++----
 src/Nottingham/wizards/en-GB/template.xwd                 | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

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 77a539eed..9ec2d9ce3 100644
--- a/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
+++ b/modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
@@ -3590,7 +3590,7 @@
 
     <trackingWeight label="Tracking Score Weight (0=Off)" optional="true" type="textInput" width="120" defaultValue="1.0"/>
     <noise label="Distractors" type="TextInput" height="50" optional="true" wysiwyg="false" defaultValue="Add list of distractor words separated by spaces" tooltip="A list of incorrect words to be used in Drop Down Menu or Drag Drop exercises"/>
-	<markEnd label="Mark at End" type="CheckBox" defaultValue="true" optional="true"/>
+	<markEnd label="Mark at End" type="CheckBox" defaultValue="true" optional="true" conditionTrigger="true" condition="interactivity!='Drop Down Menu'" tooltip="Allow incorrect answers to be entered or dragged before marking when the check button is clicked"/>
 	
 	<audioGroup type="group" label="Audio Feedback" optional="true" tooltip="Include an audio player below the written feedback">
 		<audioFeedback label="File" type="media" optional="true"/>
@@ -3599,9 +3599,9 @@
 	
 	<spaceLines label="Space Lines Evenly" type="CheckBox" defaultValue="true" optional="true"/>
 
-    <hints type="group" label="Hints" optional="true">
-		<showHint label="Show Hint/Correct Answers Button" type="CheckBox" defaultValue="true" optional="true"/>
-    	<attemptsBeforeHint label="Attempts Before Hint" defaultValue="2" type="NumericStepper" min="0" max="10" step="1" width="100" optional="true"/>
+    <hints type="group" label="Hints" optional="true" tooltip="Show a hint tooltip (fill in blank) or show answers button (drag drop/drop down menu) if answered incorrectly">
+		<showHint label="Show Hint/Correct Answers" type="CheckBox" defaultValue="true" optional="true" condition="interactivity!='Drag Drop'||markEnd=='true'"/>
+    	<attemptsBeforeHint label="Attempts Before Hint" defaultValue="2" type="NumericStepper" min="0" max="10" step="1" width="100" optional="true" condition="interactivity!='Drag Drop'||markEnd=='true'"/>
     </hints>
 	
 	<casesensitive label="Case Sensitive" defaultValue="false" type="CheckBox" condition="interactivity=='Fill in Blank'" optional="true" tooltip="Treat fill in the gap exercise answers as case sensitive"/>
diff --git a/src/Nottingham/wizards/en-GB/gapFill.xwd b/src/Nottingham/wizards/en-GB/gapFill.xwd
index b303f5eb3..1ea913895 100644
--- a/src/Nottingham/wizards/en-GB/gapFill.xwd
+++ b/src/Nottingham/wizards/en-GB/gapFill.xwd
@@ -36,7 +36,7 @@
 
     <trackingWeight label="Tracking Score Weight (0=Off)" optional="true" type="textInput" width="120" defaultValue="1.0" />
     <noise label="Distractors" type="TextInput" height="50" optional="true" wysiwyg="false" defaultValue="Add list of distractor words separated by spaces" tooltip="A list of incorrect words to be used in Drop Down Menu or Drag Drop exercises"/>
-	<markEnd label="Mark at End" type="CheckBox" defaultValue="true" optional="true"/>
+	<markEnd label="Mark at End" type="CheckBox" defaultValue="true" optional="true" conditionTrigger="true" condition="interactivity!='Drop Down Menu'" tooltip="Allow incorrect answers to be entered or dragged before marking when the check button is clicked"/>
 	
 	<audioGroup type="group" label="Audio Feedback" optional="true" tooltip="Include an audio player below the written feedback">
 		<audioFeedback label="File" type="media" optional="true"/>
@@ -45,9 +45,9 @@
 	
 	<spaceLines label="Space Lines Evenly" type="CheckBox" defaultValue="true" optional="true"/>
 
-    <hints type="group" label="Hints" optional="true">
-		<showHint label="Show Hint/Correct Answers Button" type="CheckBox" defaultValue="true" optional="true"/>
-    	<attemptsBeforeHint label="Attempts Before Hint" defaultValue="2" type="NumericStepper" min="0" max="10" step="1" width="100" optional="true" />
+    <hints type="group" label="Hints" optional="true" tooltip="Show a hint tooltip (fill in blank) or show answers button (drag drop/drop down menu) if answered incorrectly">
+		<showHint label="Show Hint/Correct Answers" type="CheckBox" defaultValue="true" optional="true" condition="interactivity!='Drag Drop'||markEnd=='true'"/>
+    	<attemptsBeforeHint label="Attempts Before Hint" defaultValue="2" type="NumericStepper" min="0" max="10" step="1" width="100" optional="true" condition="interactivity!='Drag Drop'||markEnd=='true'"/>
     </hints>
 	
 	<casesensitive label="Case Sensitive" defaultValue="false" type="CheckBox" condition="interactivity=='Fill in Blank'" optional="true" tooltip="Treat fill in the gap exercise answers as case sensitive"/>
diff --git a/src/Nottingham/wizards/en-GB/template.xwd b/src/Nottingham/wizards/en-GB/template.xwd
index 77a539eed..9ec2d9ce3 100644
--- a/src/Nottingham/wizards/en-GB/template.xwd
+++ b/src/Nottingham/wizards/en-GB/template.xwd
@@ -3590,7 +3590,7 @@
 
     <trackingWeight label="Tracking Score Weight (0=Off)" optional="true" type="textInput" width="120" defaultValue="1.0"/>
     <noise label="Distractors" type="TextInput" height="50" optional="true" wysiwyg="false" defaultValue="Add list of distractor words separated by spaces" tooltip="A list of incorrect words to be used in Drop Down Menu or Drag Drop exercises"/>
-	<markEnd label="Mark at End" type="CheckBox" defaultValue="true" optional="true"/>
+	<markEnd label="Mark at End" type="CheckBox" defaultValue="true" optional="true" conditionTrigger="true" condition="interactivity!='Drop Down Menu'" tooltip="Allow incorrect answers to be entered or dragged before marking when the check button is clicked"/>
 	
 	<audioGroup type="group" label="Audio Feedback" optional="true" tooltip="Include an audio player below the written feedback">
 		<audioFeedback label="File" type="media" optional="true"/>
@@ -3599,9 +3599,9 @@
 	
 	<spaceLines label="Space Lines Evenly" type="CheckBox" defaultValue="true" optional="true"/>
 
-    <hints type="group" label="Hints" optional="true">
-		<showHint label="Show Hint/Correct Answers Button" type="CheckBox" defaultValue="true" optional="true"/>
-    	<attemptsBeforeHint label="Attempts Before Hint" defaultValue="2" type="NumericStepper" min="0" max="10" step="1" width="100" optional="true"/>
+    <hints type="group" label="Hints" optional="true" tooltip="Show a hint tooltip (fill in blank) or show answers button (drag drop/drop down menu) if answered incorrectly">
+		<showHint label="Show Hint/Correct Answers" type="CheckBox" defaultValue="true" optional="true" condition="interactivity!='Drag Drop'||markEnd=='true'"/>
+    	<attemptsBeforeHint label="Attempts Before Hint" defaultValue="2" type="NumericStepper" min="0" max="10" step="1" width="100" optional="true" condition="interactivity!='Drag Drop'||markEnd=='true'"/>
     </hints>
 	
 	<casesensitive label="Case Sensitive" defaultValue="false" type="CheckBox" condition="interactivity=='Fill in Blank'" optional="true" tooltip="Treat fill in the gap exercise answers as case sensitive"/>