Permalink
Browse files

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
  • Loading branch information...
Shnoulle committed Nov 13, 2018
1 parent 6ba8438 commit a5e1648739e62eb3d6143b1fc6532c53b6de2905
@@ -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>
@@ -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 -->

1 comment on commit a5e1648

@Shnoulle

This comment has been minimized.

Copy link
Collaborator

Shnoulle commented on a5e1648 Nov 13, 2018

The travis issue is

W: The repository 'https://dl.hhvm.com/ubuntu trusty Release' does not have a Release file.
W: http://ppa.launchpad.net/couchdb/stable/ubuntu/dists/trusty/Release.gpg: Signature by key 15866BAFD9BCC4F3C1E0DFC7D69548E1C17EAB57 uses weak digest algorithm (SHA1)
E: Failed to fetch https://dl.hhvm.com/ubuntu/dists/trusty/main/binary-amd64/Packages  server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none

Not related to this commit

Please sign in to comment.