Merge pull request #44 from trangthaonguyen/1.3.1

Added raw filter for Grav 1.7 compatibility

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.3.1
+## 03/25/2021
+
+1. [](#bugfix)
+    * Added raw filter for Grav 1.7 compatibility
+
 # v1.3.0
 ## 05/19/2018
 

blueprints.yaml

@@ -1,6 +1,6 @@
 name: X-Corporation
 description: "Grav Theme based on X-Corporation HTML theme of uiCookies."
-version: 1.3.0
+version: 1.3.1
 icon: briefcase
 author:
   name: Hung Tran

templates/default.html.twig

@@ -10,7 +10,7 @@
 <section class="ptb-100">
     <div class="container">
         <div class="row">
-            {{ content }}
+            {{ content|raw }}
         </div>
     </div>
 </section>

templates/error.html.twig

@@ -10,7 +10,7 @@
 <section class="ptb-100">
     <div class="container">
         <div class="row">
-            {{ page.content }}
+            {{ page.content|raw }}
         </div>
     </div>
 </section>

templates/home.html.twig

@@ -3,6 +3,6 @@
 {% block content %}
     {{ page.content }}
     {% for module in page.collection() %}
-        {{ module.content }}
+        {{ module.content|raw }}
     {% endfor %}
 {% endblock %}

templates/modular.html.twig

@@ -14,6 +14,6 @@
 
 {{ page.content }}
 {% for module in page.collection() %}
-    {{ module.content }}
+    {{ module.content|raw }}
 {% endfor %}
 {% endblock %}

templates/modular/about.html.twig

@@ -1,7 +1,7 @@
 <section class="about-text ptb-100">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
@@ -12,7 +12,7 @@
         <div class="row">
         {% endif %}
             <div class="col-md-6">
-                <p>{{ column.content }}</p>
+                <p>{{ column.content|raw }}</p>
             </div>
         {% if loop.index == page.header.columns.count or loop.index % 2 == 0 %}
         </div>

templates/modular/carousel.html.twig

@@ -10,12 +10,12 @@
         {% for slide in page.header.slides %}
         {% set slideClass = loop.index == 1 ? 'item active' : 'item' %}
         <div class="{{ slideClass }}">
-            {{ page.media.images[slide.background_image].html('', slide.background_image_description) }}
+            {{ page.media.images[slide.background_image].html('', slide.background_image_description)|raw }}
 
             <div class="carousel-caption">
-                <h1>{{ slide.heading }}</h1>
+                <h1>{{ slide.heading|raw }}</h1>
 
-                <p>{{ slide.description }}</p>
+                <p>{{ slide.description|raw }}</p>
             </div>
         </div>
         {% endfor %}

templates/modular/clients.html.twig

@@ -3,7 +3,7 @@
 <section class="client-logo ptb-100">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
@@ -13,7 +13,7 @@
                 {% for client in row %}
                     <div class="col-md-{{client_size}} col-sm-4 col-xs-6 section-margin client">
                         <a href="{{ client.url }}">
-                            {{ page.media.images[client.image].html('', client.name) }}
+                            {{ page.media.images[client.image].html('', client.name)|raw }}
                         </a>
                     </div>
                 {% endfor %}

templates/modular/contact.html.twig

@@ -1,6 +1,6 @@
 <section class="contact-form ptb-100">
     <div class="container text-center">
-        <h2>{{ page.title }}</h2>
+        <h2>{{ page.title|raw }}</h2>
 
         <div class="row">
             <div class="col-md-8 col-md-offset-2">

templates/modular/features.html.twig

@@ -1,15 +1,15 @@
 <section class="x-features">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
     <div class="container">
         <div class="row">
             <div class="col-md-6 img-left">
                 {% if page.header.image != '' %}
-                {{ page.media.images[page.header.image].html() }}
+                {{ page.media.images[page.header.image].html()|raw }}
                 {% endif %}
             </div>
             <div class="col-md-6">
@@ -21,9 +21,9 @@
                         {% endif %}
                     </div>
                     <div class="promo-content">
-                        <h3>{{ feature.title }}</h3>
+                        <h3>{{ feature.title|raw }}</h3>
 
-                        <p>{{ feature.description }}</p>
+                        <p>{{ feature.description|raw }}</p>
                     </div>
                 </div>
                 {% endfor %}

templates/modular/services.html.twig

@@ -2,7 +2,7 @@
 
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
@@ -15,13 +15,13 @@
             <div class="col-md-6">
                 <div class="thumbnail clearfix">
                     <a href="{{ service.url }}">
-                        {{ page.media.images[service.image].html('', service.title) }}
+                        {{ page.media.images[service.image].html('', service.title)|raw }}
                     </a>
 
                     <div class="caption">
-                        <h3><a href="{{ service.url }}">{{ service.title }}</a></h3>
+                        <h3><a href="{{ service.url }}">{{ service.title|raw }}</a></h3>
 
-                        <p>{{ service.description }}</p>
+                        <p>{{ service.description|raw }}</p>
                     </div>
                 </div>
             </div>

templates/modular/skills.html.twig

@@ -1,21 +1,21 @@
 <section class="skills ptb-100 gray-bg">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
 
     <div class="container">
         <div class="row">
             <div class="col-md-6">
-                {{ page.content }}
+                {{ page.content|raw }}
             </div>
             <div class="col-md-6 x-progress">
                 <div class="progress-wrapper">
                     {% for skill in page.header.skills %}
                     <div class="progress-item">
-                        <span class="progress-title">{{ skill.name }}</span>
+                        <span class="progress-title">{{ skill.name|raw }}</span>
 
                         <div class="progress">
                             <div class="progress-bar progress-bar-dealy" role="progressbar" aria-valuenow="{{ skill.percentage }}"

templates/modular/solutions.html.twig

@@ -1,7 +1,7 @@
 <section class="service-icon-style ptb-100">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
@@ -22,9 +22,9 @@
                     <i class="fa {{ solution.icon }}"></i>
                 </div>
                 <div class="promo-content">
-                    <h3>{{ solution.title }}</h3>
+                    <h3>{{ solution.title|raw }}</h3>
 
-                    <p>{{ solution.description }}</p>
+                    <p>{{ solution.description|raw }}</p>
                 </div>
             </div>
         </div>
@@ -46,20 +46,20 @@
             <div class="col-md-12 col-sm-12 x-accordion">
             {% endif %}
                 {% if page.header.hows|length > 0 %}
-                <h3>{{ page.header.how_heading }}</h3>
+                <h3>{{ page.header.how_heading|raw }}</h3>
                 <div class="panel-group" id="accordionHow">
                     {% for how in page.header.hows %}
                     <div class="panel panel-default">
                         <div class="panel-heading">
                             <h4 class="panel-title">
                                 <a data-toggle="collapse" data-parent="#accordionHow" href="#collapseHow{{ loop.index }}" aria-expanded="false" class="collapsed">
-                                    {{ how.title }}
+                                    {{ how.title|raw }}
                                 </a>
                             </h4>
                         </div>
                         <div id="collapseHow{{ loop.index }}" class="panel-collapse collapse" aria-expanded="false" style="height: 0px;">
                             <div class="panel-body">
-                                {{ how.description }}
+                                {{ how.description|raw }}
                             </div>
                         </div>
                     </div>
@@ -73,14 +73,14 @@
             {% elseif page.header.hows|length == 0 and page.header.whys|length > 0 %}
             <div class="col-md-12 col-sm-12 tabWhy">
             {% endif %}
-                <h3>{{ page.header.why_heading }}</h3>
+                <h3>{{ page.header.why_heading|raw }}</h3>
                 <div role="tabpanel">
                     <ul id="tabWhy" class="nav nav-tabs nav-justified">
                         {% for why in page.header.whys %}
                         {% set tabClass = loop.index == 1 ? 'active' : '' %}
                         <li class="{{ tabClass }}">
                             <a href="#tabWhy{{ loop.index }}" data-toggle="tab" aria-expanded="true">
-                                {{ why.title }}
+                                {{ why.title|raw }}
                             </a>
                         </li>
                         {% endfor %}
@@ -90,7 +90,7 @@
                         {% for why in page.header.whys %}
                         {% set tabClass = loop.index == 1 ? ' active in' : '' %}
                         <div class="tab-pane fade{{ tabClass }}" id="tabWhy{{ loop.index }}">
-                            {{ why.description }}
+                            {{ why.description|raw }}
                         </div>
                         {% endfor %}
                     </div>

templates/modular/team.html.twig

@@ -1,7 +1,7 @@
 <section class="team ptb-100">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
@@ -14,11 +14,11 @@
             <div class="col-md-4">
                 <figure class="thumbnail">
                     <a href="{{ member.url }}">
-                        {{ page.media.images[member.image].html('', member.name) }}
+                        {{ page.media.images[member.image].html('', member.name)|raw }}
                     </a>
                     <figcaption class="caption text-center">
-                        <h3>{{ member.name }} -
-                            <small>{{ member.position}}</small>
+                        <h3>{{ member.name|raw }} -
+                            <small>{{ member.position|raw }}</small>
                         </h3>
                     </figcaption>
                 </figure>

templates/modular/testimonials.html.twig

@@ -1,7 +1,7 @@
 <section class="testimonial">
     <section class="section-title">
         <div class="container text-center">
-            <h2>{{ page.title }}</h2>
+            <h2>{{ page.title|raw }}</h2>
             <span class="bordered-icon"><i class="fa fa-circle-thin"></i></span>
         </div>
     </section>
@@ -14,10 +14,10 @@
                 <div class="{{ slideClass }}">
                     <blockquote>
                         <ul>
-                            <li>{{ page.media.images[slide.image].html() }}</li>
-                            <li class="name">{{ slide.name }}</li>
+                            <li>{{ page.media.images[slide.image].html()|raw }}</li>
+                            <li class="name">{{ slide.name|raw }}</li>
                         </ul>
-                        <p>{{ slide.description }}</p>
+                        <p>{{ slide.description|raw }}</p>
                     </blockquote>
                 </div>
                 {% endfor %}

templates/partials/head.html.twig

@@ -17,7 +17,7 @@
 {% do assets.add('theme://css/style.css', 101) %}
 {% do assets.add('theme://css/mobile-menu.css', 101) %}
 {% do assets.add('theme://css/custom.css', 101) %}
- {{ assets.css() }}
+ {{ assets.css()|raw }}
 {% endblock %}
 
 {% block javascripts %}
@@ -31,7 +31,7 @@
     {% do assets.add('theme://js/flexSlider/jquery.flexslider-min.js') %}
     {% do assets.add('theme://js/scripts.js') %}
 
-    {{ assets.js() }}
+    {{ assets.js()|raw }}
 
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 {% endblock %}