# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1463484051 -3600
# Node ID c341b59a99bb287816c0bf367a5daed7dbbc1c96
# Parent  5586b16870883eb090a6965f219b554101cc737d# Parent  c0b34fa375251d4f7fd3205557c5c703a724ef7b
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 5586b1687088 -r c341b59a99bb test_create/interface-specs.xml
--- a/test_create/interface-specs.xml	Tue May 17 01:20:39 2016 +0100
+++ b/test_create/interface-specs.xml	Tue May 17 12:20:51 2016 +0100
@@ -207,6 +207,8 @@
         </interface>
     </interfaces>
     <scaledefinitions>
+        <scale name="(Blank)">
+        </scale>
         <scale name="Likert">
             <scalelabel position="0">Strongly Disagree</scalelabel>
             <scalelabel position="25">Disagree</scalelabel>
diff -r 5586b1687088 -r c341b59a99bb test_create/test_core.js
--- a/test_create/test_core.js	Tue May 17 01:20:39 2016 +0100
+++ b/test_create/test_core.js	Tue May 17 12:20:51 2016 +0100
@@ -1369,6 +1369,9 @@
                 this.specification.exitText = this.inputDOM.value;
             }
         }
+        var exitWarning = document.createElement("div");
+        obj.rootDOM.appendChild(exitWarning);
+        exitWarning.textContent = "Only visible when the above 'On complete redirect URL' field is empty.";
         obj.rootDOM.appendChild(obj.labelDOM);
         obj.rootDOM.appendChild(obj.inputDOM);
         obj.labelDOM.textContent = "Text: ";
diff -r 5586b1687088 -r c341b59a99bb tests/examples/mushra_example.xml
--- a/tests/examples/mushra_example.xml	Tue May 17 01:20:39 2016 +0100
+++ b/tests/examples/mushra_example.xml	Tue May 17 12:20:51 2016 +0100
@@ -15,7 +15,7 @@
 				<option name="researcher">Research in the field of audio</option>
 			</surveyentry>
 			<surveyentry type="statement" id="test-intro">
-				<statement>This is an example of an 'APE'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
+				<statement>This is an example of an 'MUSHRA'-style test, with two pages, using the test stimuli in 'example_eval/'.</statement>
 			</surveyentry>
 		</survey>
 		<survey location="after">