Browse Source

Add autoescape false , fix UI

jmontoyaa 8 years ago
parent
commit
ccc6760e02

+ 0 - 1
src/Chamilo/CoreBundle/Resources/views/default/layout/layout_2_col.html.twig

@@ -22,7 +22,6 @@
 
 	</div>
 	<div class="col-md-9">
-
         {% if home_page_block %}
             <section id="homepage-home">
                 {{ home_page_block }}

+ 6 - 2
src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -104,12 +104,15 @@
     {#%}#}
     {#<script type="text/javascript" src="{{ asset_url | replace({'/app_dev.php': ''}) }}"></script>#}
     {#{% endjavascripts %}#}
+    {% endblock %}
 </head>
 
 <body>
 <noscript>{{ "NoJavascript" | trans }}</noscript>
 {#{% if show_header == true %}#}
+
 {% block chamilo_wrap %}
+    {% autoescape false %}
     <div id="page-wrap">
         <!-- page section -->
         {# Bug and help notifications #}
@@ -179,7 +182,6 @@
                     </div>
                 </div>
             </section>
-
             <section id="menu-bar">
                 {# menu #}
                 {% block menu %}
@@ -263,16 +265,18 @@
         {#</div>#}
         {#<!-- /.right-side -->#}
 
-        {% endblock %}
         </div> {# end top_main_content #}
     </div> {# End page-wrap div #}
 
+
     {% block chamilo_footer %}
         {% include '@ChamiloTheme/Layout/footer.html.twig' %}
     {% endblock %}
     {% block chamilo_footer_js %}
         {% include '@ChamiloTheme/Layout/footer.js.twig' %}
     {% endblock %}
+{% endautoescape %}
 {% endblock %} {# End chamilo_wrap block #}
+
 </body>
 </html>

+ 2 - 2
src/Chamilo/ThemeBundle/Resources/views/Layout/layout_one_col.html.twig

@@ -1,12 +1,11 @@
 {% extends '@ChamiloTheme/Layout/base-layout.html.twig' %}
 
 {% block page_content %}
+    {% autoescape false %}
     {% if js is defined %}
-        {% autoescape false %}
         {% for item in js %}
             {{ item }}
         {% endfor %}
-        {% endautoescape %}
     {% endif %}
 
     {% if plugin_main_top %}
@@ -72,6 +71,7 @@
             {{ plugin_main_bottom }}
         </div>
     {% endif %}
+    {% endautoescape %}
 {% endblock %}
 
 

+ 2 - 3
src/Chamilo/ThemeBundle/Resources/views/Layout/layout_two_col.html.twig

@@ -6,6 +6,7 @@
 %}
 
 {% block page_content %}
+    {% autoescape false %}
     {% if plugin_main_top %}
     <div id="plugin_main_top" class="col-md-12">
         {{ plugin_main_top }}
@@ -43,7 +44,6 @@
 
     {#  Right column #}
     <div class="col-md-9">
-        {% autoescape false %}
         {% if plugin_content_top %}
             <div id="plugin_content_top">
                 {{ plugin_content_top }}
@@ -74,8 +74,6 @@
             {{plugin_content_bottom}}
         </div>
         {% endif %}
-
-        {% endautoescape %}
     </div>
 
     {% if plugin_main_bottom %}
@@ -83,4 +81,5 @@
         {{ plugin_main_bottom }}
     </div>
     {% endif %}
+    {% endautoescape %}
 {% endblock %}