diff --git a/src/Biopen/CoreBundle/Resources/views/base-layout.html.twig b/src/Biopen/CoreBundle/Resources/views/base-layout.html.twig
index 516c59365ed6be654b4c21337cab49462df172ac..edb035c1bd46c85867c21dd79a2e34a65ed30850 100755
--- a/src/Biopen/CoreBundle/Resources/views/base-layout.html.twig
+++ b/src/Biopen/CoreBundle/Resources/views/base-layout.html.twig
@@ -9,25 +9,24 @@
<head>
<title>{% block title %}GoGoCarto{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
+
{# gogocarto contains materializeCss lib, so we load it for all files #}
- <link rel="stylesheet" href="{{ asset('assets/css/gogocarto.min.css?ver=' ~ version) }}">
+ <link rel="stylesheet" href="{{ asset('assets/css/gogocarto.min.css?ver=' ~ version) }}">
{% block stylesheets %}
- {% endblock %}
+ {% endblock %}
{% if config is defined %}
{% include '@BiopenCoreBundle/custom-head.html.twig' %}
- {% endif %}
+ {% endif %}
<meta name="robots" content="index, follow, all" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>
-<body class="gogo-load-css {% if pageName is defined %}{{ pageName }}{% endif %}"> {# use this class to load the css vendors encapsulated inside gogocarto.css #}
+<body class="gogo-load-css {% if pageName is defined %}{{ pageName }}{% endif %} base-layout"> {# use this class to load the css vendors encapsulated inside gogocarto.css #}
{# All action from GoGoControllers give the config variable into the view to render the header.
- If not, we need to render manually the header via a dedicate action
+ If not, we need to render manually the header via a dedicate action
It occurs for sonata user routes, like register, resetting and so on #}
{% if config is defined %}
{% include '@BiopenCoreBundle/header.html.twig' %}
@@ -36,26 +35,26 @@
{% endif %}
{% block body %}
- {% endblock %}
+ {% endblock %}
{# Mains javascripts libs #}
- <script src="{{ asset('js/gogocarto.js?ver=' ~ version) }}"></script>
- <script src="{{ asset('js/libs.js?ver=' ~ version) }}"></script>
+ <script src="{{ asset('js/gogocarto.js?ver=' ~ version) }}"></script>
+ <script src="{{ asset('js/libs.js?ver=' ~ version) }}"></script>
{# Block to add custom javascript to each page #}
- {% block javascripts %}
- {% endblock %}
+ {% block javascripts %}
+ {% endblock %}
</body>
</html>
{% if config is defined %}
- {% block header_modals %}
+ {% block header_modals %}
{% include '@BiopenCoreBundle/modals/headerModals.html.twig' %}
{% include '@BiopenCoreBundle/modals/loginModal.html.twig' %}
{% endblock %}
{% endif %}
{% block modals %}
-
+
{% endblock %}
\ No newline at end of file
diff --git a/src/Biopen/SaasBundle/Resources/views/sass-layout.html.twig b/src/Biopen/SaasBundle/Resources/views/sass-layout.html.twig
index a1c527cb8f9adc54c202360f8ed0b3fa0ede97d2..3f8e61eff9eaa9544f4be0c173fb32e57fca2ac5 100755
--- a/src/Biopen/SaasBundle/Resources/views/sass-layout.html.twig
+++ b/src/Biopen/SaasBundle/Resources/views/sass-layout.html.twig
@@ -8,40 +8,44 @@
<!--[if !(IE)]><!--> <html class="no-js" lang="fr"> <!--<![endif]-->
<head>
<title>{% block title %}GoGoCarto{% endblock %}</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
{# gogocarto contains materializeCss lib, so we load it for all files #}
- <link rel="stylesheet" href="{{ asset('assets/css/gogocarto.min.css?ver=' ~ version) }}">
- <link rel="stylesheet" href="{{ asset('assets/css/saas.css?ver=' ~ version) }}">
+ <link rel="stylesheet" href="{{ asset('assets/css/gogocarto.min.css?ver=' ~ version) }}">
+ <link rel="stylesheet" href="{{ asset('assets/css/saas.css?ver=' ~ version) }}">
{% block stylesheets %}
- {% endblock %}
+ {% endblock %}
+
+ {% if config is defined %}
+ {% include '@BiopenCoreBundle/custom-head.html.twig' %}
+ {% endif %}
<meta name="robots" content="index, follow, all" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>
-<body class="gogo-load-css"> {# use this class to load the css vendors encapsulated inside gogocarto.css #}
-
+<body class="gogo-load-css saas-layout"> {# load the css vendors encapsulated inside gogocarto.css #}
+
{% include '@BiopenCoreBundle/custom-head.html.twig' %}
<div id="page-container" {% if pageName is defined %}class="{{ pageName }}"{% endif %}>
<div id="page-content" {% if pageName is defined %}class="{{ pageName }}"{% endif %}>
{% block body %}
- {% endblock %}
+ {% endblock %}
</div>
</div>
{# Mains javascripts libs #}
- <script src="{{ asset('js/libs.js?ver=' ~ version) }}"></script>
- <script src="{{ asset('js/gogocarto.js?ver=' ~ version) }}"></script>
+ <script src="{{ asset('js/libs.js?ver=' ~ version) }}"></script>
+ <script src="{{ asset('js/gogocarto.js?ver=' ~ version) }}"></script>
{# Block to add custom javascript to each page #}
- {% block javascripts %}
- {% endblock %}
+ {% block javascripts %}
+ {% endblock %}
- {% block modals %}
- {% endblock %}
+ {% block modals %}
+ {% endblock %}
</body>
</html>