From 5de27e59a155566c2ff1d31fd5f5d1472260bcd2 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Mon, 4 Dec 2017 18:38:53 +0100
Subject: [PATCH] Dev: few fixes on vanilla to prepare fruity extension

---
 themes/survey/vanilla/config.xml                 |  5 +++++
 themes/survey/vanilla/views/layout_global.twig   |  2 +-
 .../views/subviews/header/custom_header.twig     | 16 ++++++++++++++++
 .../vanilla/views/subviews/header/head.twig      |  2 ++
 .../{progess_bar.twig => progress_bar.twig}      |  0
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 themes/survey/vanilla/views/subviews/header/custom_header.twig
 rename themes/survey/vanilla/views/subviews/header/{progess_bar.twig => progress_bar.twig} (100%)

diff --git a/themes/survey/vanilla/config.xml b/themes/survey/vanilla/config.xml
index 117863a3075..b834b980e89 100644
--- a/themes/survey/vanilla/config.xml
+++ b/themes/survey/vanilla/config.xml
@@ -88,6 +88,7 @@
                     <file type="view" role="subview">./subviews/survey/group_subviews/group_desc.twig</file>
                     <file type="view" role="subview">./subviews/survey/group_subviews/group_name.twig</file>
                     <file type="view" role="subview">./subviews/survey/question.twig</file>
+                    <file type="view" role="subview">./subviews/survey/question_container.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_subviews/question_text_container.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_subviews/question_text_content.twig</file>
                     <file type="view" role="subview">./subviews/survey/question_subviews/answers.twig</file>
@@ -115,6 +116,10 @@
                     <file type="view" role="subview">./subviews/content/mainrow.twig</file>
                     <file type="view" role="subview">./subviews/content/outerframe.twig</file>
                     <file type="view" role="content">./subviews/content/firstpage.twig</file>
+                    <file type="view" role="subview">./subviews/header/head.twig</file>
+                    <file type="view" role="subview">./subviews/header/custom_header.twig</file>
+                    <file type="view" role="subview">./subviews/header/nav_bar.twig</file>
+                    <file type="view" role="subview">./subviews/header/progress_bar.twig</file>
                     <file type="view" role="subview">./subviews/messages/welcome.twig</file>
                     <file type="view" role="subview">./subviews/messages/warnings.twig</file>
                     <file type="view" role="subview">./subviews/messages/no_js_alert.twig</file>
diff --git a/themes/survey/vanilla/views/layout_global.twig b/themes/survey/vanilla/views/layout_global.twig
index 969c7dab93f..9f1a56b56d5 100644
--- a/themes/survey/vanilla/views/layout_global.twig
+++ b/themes/survey/vanilla/views/layout_global.twig
@@ -97,7 +97,7 @@
 
                 {# Top Container: in this template, it contains only  #}
                 {% block progress %}
-                    {{ include('./subviews/header/progess_bar.twig') }}
+                    {{ include('./subviews/header/progress_bar.twig') }}
                 {% endblock %}
 
                 <!-- Outer Frame Container -->
diff --git a/themes/survey/vanilla/views/subviews/header/custom_header.twig b/themes/survey/vanilla/views/subviews/header/custom_header.twig
new file mode 100644
index 00000000000..6d7c523f823
--- /dev/null
+++ b/themes/survey/vanilla/views/subviews/header/custom_header.twig
@@ -0,0 +1,16 @@
+{#
+    LimeSurvey
+    Copyright (C) 2007-2017 The LimeSurvey Project Team / Louis Gac
+    All rights reserved.
+    License: GNU/GPL License v2 or later, see LICENSE.php
+    LimeSurvey is free software. This version may have been modified pursuant
+    to the GNU General Public License, and as distributed it includes or
+    is derivative of works licensed under the GNU General Public License or
+    other free or open source software licenses.
+    See COPYRIGHT.php for copyright notices and details.
+
+    (¯`·._.·(¯`·._.· Custom Header  ·._.·´¯)·._.·´¯)
+
+    If you extend a template, and want to add custom headers (js, css, scripts, meta etc), you'd rather do it here.
+    This file is empty in vanilla
+#}
diff --git a/themes/survey/vanilla/views/subviews/header/head.twig b/themes/survey/vanilla/views/subviews/header/head.twig
index 3c69bf75b91..dc553e97179 100644
--- a/themes/survey/vanilla/views/subviews/header/head.twig
+++ b/themes/survey/vanilla/views/subviews/header/head.twig
@@ -45,5 +45,7 @@
         </script>
     {% endif %}
 
+    {{ include('./subviews/header/custom_header.twig') }}
+
     {{ include('./subviews/header/google_analytics.twig') }}
 </head>
diff --git a/themes/survey/vanilla/views/subviews/header/progess_bar.twig b/themes/survey/vanilla/views/subviews/header/progress_bar.twig
similarity index 100%
rename from themes/survey/vanilla/views/subviews/header/progess_bar.twig
rename to themes/survey/vanilla/views/subviews/header/progress_bar.twig