Dev: removed nav_bar and other Bootstrap elements

LimeSurvey · Oct 16, 2017 · 59b0524 · 59b0524
1 parent 3fbe61b
commit 59b0524
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 374 deletions.
diff --git a/templates/nobootstrap/views/layout_global.twig b/templates/nobootstrap/views/layout_global.twig
@@ -27,11 +27,6 @@
             <div id="{{ aSurveyInfo.id.dynamicreload }}">
             {% block body %}
 
-                {# Bootstrap Navigation Bar: the top menu #}
-                {% block nav_bar %}
-                    {{ include('./subviews/nav_bar.twig') }}
-                {% endblock %}
-
                 {# Top Container: in this template, it contains only  #}
                 {% block progress %}
                     {{ include('./subviews/progess_bar.twig') }}

diff --git a/templates/nobootstrap/views/layout_printanswers.twig b/templates/nobootstrap/views/layout_printanswers.twig
@@ -21,16 +21,12 @@
 {# Replace the content block #}
 {% block body %}
 
-    {% if (aSurveyInfo.printPdf != 1) %} 
-        {% block nav_bar %} 
-        {% endblock %} 
-    {% endif %} 
 
     <section>
-        {% if (aSurveyInfo.printPdf != 1) %} 
+        {% if (aSurveyInfo.printPdf != 1) %}
             {# This will display the script and the hidden inputs needed for Expression Manager #}
             {{ aSurveyInfo.EM.ScriptsAndHiddenInputs  }}
-        {% endif %} 
+        {% endif %}
 
         {{ include('./subviews/printanswers/printanswers_head.twig') }}
         {{ include('./subviews/printanswers/printanswers_table.twig') }}

diff --git a/templates/nobootstrap/views/layout_user_forms.twig b/templates/nobootstrap/views/layout_user_forms.twig
@@ -25,10 +25,6 @@ TODO: register
 
     <body class="{{ aSurveyInfo.class.body }} lang-{{surveylanguage}} {{surveyformat}}">
 
-        {# Bootstrap Navigation Bar: the top menu #}
-        {{ include('./subviews/nav_bar.twig') }}
-
-
         <!-- Outer Frame Container -->
         <div class="{{ aSurveyInfo.class.outerframe }}" id="{{ aSurveyInfo.id.outerframe }}">
 

diff --git a/templates/nobootstrap/views/subviews/LEMDebug.twig b/templates/nobootstrap/views/subviews/LEMDebug.twig
diff --git a/templates/nobootstrap/views/subviews/bootstrap_alert_modal.twig b/templates/nobootstrap/views/subviews/bootstrap_alert_modal.twig
diff --git a/templates/nobootstrap/views/subviews/head.twig b/templates/nobootstrap/views/subviews/head.twig
@@ -18,8 +18,6 @@
 {% if(aSurveyInfo.jYesNo) %}
     {{ registerScript('activateConfirmLanguage',"$.extend(LSvar.lang," ~ aSurveyInfo.jYesNo ~ ")", "POS_BEGIN") }}
 {% endif %}
-{{ registerScript('activateActionLink',"activateActionLink();", "POS_END") }}
-{{ registerScript('activateConfirmButton',"activateConfirmButton();", "POS_END") }}
 
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />

diff --git a/templates/nobootstrap/views/subviews/nav_bar.twig b/templates/nobootstrap/views/subviews/nav_bar.twig
diff --git a/templates/nobootstrap/views/subviews/navigation/clearall_links.twig b/templates/nobootstrap/views/subviews/navigation/clearall_links.twig
diff --git a/templates/nobootstrap/views/subviews/navigation/language_changer_top_menu.twig b/templates/nobootstrap/views/subviews/navigation/language_changer_top_menu.twig
diff --git a/templates/nobootstrap/views/subviews/navigation/question_index_menu.twig b/templates/nobootstrap/views/subviews/navigation/question_index_menu.twig