Fixed issue #14226: End Url don't display if survey not activated

Dev: submit_preview include submit Dev: submit use aSurveyInfo.surveyls_url Dev: put the warning at top
LimeSurvey · Nov 13, 2018 · a5e1648 · a5e1648 · Shnoulle · Nov 13, 2018
1 parent 6ba8438
commit a5e1648
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 38 deletions.
diff --git a/themes/survey/vanilla/views/subviews/content/submit.twig b/themes/survey/vanilla/views/subviews/content/submit.twig
@@ -27,10 +27,8 @@
 {# include the form opening tag #}
 <!-- main form -->
 {{ include('./subviews/header/start_form.twig') }}
-
     {# This will display the script and the hidden inputs needed for Expression Manager #}
     {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}
-
     <div class="{{ aSurveyInfo.class.submitwrapper }}" {{ aSurveyInfo.attr.submitwrapper }}>
         <div class='{{ aSurveyInfo.class.submitwrappertext }}' {{ aSurveyInfo.attr.submitwrappertext }}>
             {% if (aSurveyInfo.aCompleted.showDefault == true) %}
@@ -69,8 +67,8 @@
             {{ aSurveyInfo.aCompleted.sPluginHTML }}
 
             {# NOTE: not very clear what the old replacement keyword {URL} was doing  #}
-            {% if (aSurveyInfo.aCompleted.sSurveylsUrl) %}
-                <a href="{{ aSurveyInfo.aCompleted.sSurveylsUrl }}">{{ aSurveyInfo.aCompleted.sSurveylsUrlDescription }}</a>
+            {% if (aSurveyInfo.surveyls_url) %}
+                <a href="{{ aSurveyInfo.surveyls_url }}">{{ aSurveyInfo.surveyls_urldescription ?: aSurveyInfo.surveyls_url }}</a>
             {% endif %}
         </div>
     </div>

diff --git a/themes/survey/vanilla/views/subviews/content/submit_preview.twig b/themes/survey/vanilla/views/subviews/content/submit_preview.twig
@@ -17,39 +17,9 @@
     NOTE: This content is included inside mainrow.twig
     NOTE: see layout_global.twig for more infos
 #}
-
-
-
-{# include the form opening tag #}
 <!-- main form -->
-{{ include('./subviews/header/start_form.twig') }}
-
-
-    <div class="{{ aSurveyInfo.class.previewsubmit }}" {{ aSurveyInfo.attr.previewsubmit }}>
-        <div class='{{ aSurveyInfo.class.previewsubmittext }}' {{ aSurveyInfo.attr.previewsubmittext }}>
-            {% if (aSurveyInfo.aCompleted.showDefault == true) %}
-                <p {{ aSurveyInfo.attr.submitwrappertextpa }}>{{ gT("Thank you!") }}</p>
-                <p {{ aSurveyInfo.attr.submitwrappertextpb }}>{{ gT("Your survey responses have been recorded.") }}</p>
-            {% else %}
-                {{ aSurveyInfo.aCompleted.sEndText }}
-            {% endif %}
-
-            {# Assessments #}
-            {% if (aSurveyInfo.aAssessments.show) %}
-                {{ include('./subviews/messages/assessments.twig') }}
-            {% endif %}
-
-            <br /><br />
-            {# TODO: rewrite this before master #}
-            <strong >
-                <font size='2' color='red'>
-                    {{ gT("Did Not Save") }}
-                </font>
-            </strong>
-            <br /><br />
+<div class="alert alert-warning"><strong class="h4 text-danger">{{ gT("Did Not Save") }} </strong>
+    {{ gT("Your survey responses have not been recorded. This survey is not yet active.") }}
+</div>
+{{ include('./subviews/content/submit.twig') }}
 
-            {{ gT("Your survey responses have not been recorded. This survey is not yet active.") }}
-            <br /><br />
-        </div>
-    </div>
-</form> <!-- main form -->