Fixed issue #14352: Multiple HTML open in printanswers view

Dev: extend 2 times layout_global
LimeSurvey · Dec 17, 2018 · a1b2972 · a1b2972
1 parent 188934c
commit a1b2972
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 27 deletions.
diff --git a/themes/survey/vanilla/views/layout_printanswers.twig b/themes/survey/vanilla/views/layout_printanswers.twig
@@ -15,18 +15,30 @@
 
 #}
 {% extends 'layout_global.twig' %}
-
-{% if aSurveyInfo.printPdf != 1 %}
-    {% block pjaxbegin %}<div></div>{% endblock %}
-{% endif %}
-
+{% block ajaxindicator %}{% endblock %}
+{% block pjaxbegin %}{% endblock %}
 {% block body %}
-
+    {% block nav_bar %}
+        {% if (not aSurveyInfo.printPdf) %} 
+            {{ parent() }}
+        {% endif %}
+    {% endblock %}
     {% block content %}
         {% set sViewContent =  './subviews/content/' ~ aSurveyInfo.include_content ~ '.twig' %}
         {% include './subviews/content/outerframe.twig' with {'include_content': sViewContent } %}
     {% endblock %}
-
+    {% if (not aSurveyInfo.printPdf) %} 
+        {{ registerScript("BasicThemeScripts", "
+        if(window.basicThemeScripts === undefined){ 
+            window.basicThemeScripts = new ThemeScripts(); 
+        } 
+        basicThemeScripts.initGlobal(); 
+        ", "POS_END") }}
+    {% endif %}
 {% endblock %}
-
-{% block pjaxend %}<div></div>{% endblock %}
+{% block footer %}
+    {% if (not aSurveyInfo.printPdf) %} 
+        {{ parent() }}
+    {% endif %}
+{% endblock %}
+{% block pjaxend %}{% endblock %}
diff --git a/themes/survey/vanilla/views/subviews/content/printanswers.twig b/themes/survey/vanilla/views/subviews/content/printanswers.twig
@@ -14,21 +14,7 @@
     This file displays the page shown to user when a participant registers for taking a survey. 
  
     NOTE: see layout_main.twig for more infos 
-#} 
-
-
-{# Call the global layout #} 
-{% extends "./layout_global.twig" %} 
-
-{# Replace the content block #} 
-{% block body %} 
-
-    {% if (aSurveyInfo.printPdf != 1) %} 
-        {% block nav_bar %} 
-        {% endblock %} 
-    {% endif %} 
-
-    <section> 
+#}<section> 
         {% if (aSurveyInfo.printPdf != 1) %} 
             {# This will display the script and the hidden inputs needed for Expression Manager #} 
             {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }} 
@@ -37,6 +23,4 @@
         {{ include('./subviews/printanswers/printanswers_head.twig') }} 
         {{ include('./subviews/printanswers/printanswers_table.twig') }} 
         {{ include('./subviews/printanswers/printanswers_foot.twig') }} 
-    </section> 
-
-{% endblock %} 
+    </section>