Merge branch 'release/1.7.1'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.7.1
+## 01/15/2021
+
+1. [](#improved)
+    * Fixed autoescaping in preparation for Grav 1.7
+
 # v1.7.0
 ## 03/21/2019
 

blueprints.yaml

@@ -1,5 +1,7 @@
 name: Deliver
-version: 1.7.0
+slug: deliver
+type: theme
+version: 1.7.1
 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
 icon: newspaper-o
 author:

templates/archive.html.twig

@@ -10,7 +10,7 @@
     {% if base_url == base_url_relative %}
         {% set feed_url = base_url~'/'~page.slug %}
     {% endif  %}
-    
+
 	{% block content %}
 		{% set blog_image = page.media.images|first %}
         {% if blog_image %}
@@ -18,15 +18,15 @@
         <h1>{{ page.title }}</h1>
         </div>
         {% endif %}
-        
+
 		<div class="content-wrapper archive-list g-grid pure-g-r">
 			<div id="listing" class="g-block pure-u-2-3">
-            {{ page.content }}
+            {{ page.content|raw }}
 			  {% if config.plugins.taxonomylist.enabled %}
              <h4>Archives by tags</h4>
              {% include 'partials/taxonomylist.html.twig' with {'taxonomy':'tag'} %}
              {% endif  %}
-             
+
              {% if config.plugins.archives.enabled %}
              <h4>Archives by month</h4>
 	         {% include 'partials/archives.html.twig' %}

templates/blog.html.twig

@@ -20,7 +20,7 @@
 	{% else %}
 	<div class="blog-header">
 		{% endif %}
-		{{ page.content }}
+		{{ page.content|raw }}
 	</div>
 
 	{% if config.plugins.breadcrumbs.enabled %}

templates/default.html.twig

@@ -1,5 +1,5 @@
 {% extends 'partials/base.html.twig' %}
 
 {% block content %}
-	<p>{{ page.content }}</p>
+	<p>{{ page.content|raw }}</p>
-{% endblock %}
+{% endblock %}

templates/error.html.twig

@@ -5,7 +5,7 @@
 		<div>
 			<h1>Error {{ page.header.http_response_code }}</h1>
 			<p>
-				{{ page.content }}
+				{{ page.content|raw }}
 			</p>
 		</div>
 	</div>

templates/formdata.html.twig

@@ -2,7 +2,7 @@
 
 {% block content %}
   <div class="modular-row bottom ">
-    {{ content }}
+    {{ content|raw }}
 
     <h2>{{ form.message }}</h2>
     <p>Here is the summary of what you wrote to us:</p>

templates/modular.html.twig

@@ -30,7 +30,7 @@
 {% block header_navigation %}
     {% if show_onpage_menu %}
         <ul class="navigation">
-        
+
         {% macro loop(page) %}
         {% for p in page.children %}
             {% if p.visible %}
@@ -74,7 +74,7 @@
                 </a>
             </li>
         {% endfor %}
-    
+
         {% for module in page.collection() %}
             {% set current_module = (module.active or module.activeChild) ? 'active' : '' %}
             <li class="{{ current_module }}"><a href="#{{ _self.pageLinkName(module.menu) }}">{{ module.menu }}</a></li>
@@ -86,9 +86,9 @@
 {% endblock %}
 
 {% block content %}
-    {{ page.content }}
+    {{ page.content|raw }}
     {% for module in page.collection() %}
         <div id="{{ _self.pageLinkName(module.menu) }}"></div>
-        {{ module.content }}
+        {{ module.content|raw }}
     {% endfor %}
 {% endblock %}

templates/modular/bottom.html.twig

@@ -1,5 +1,5 @@
 <div class="modular-row bottom {{ page.header.class }}">
-    {{ content }}
+    {{ content|raw }}
     {% for button in page.header.buttons %}
     <a class="button{% if button.primary %} primary{% endif %}" href="{{ button.url }}">{{ button.text }}</a>
     {% endfor %}
@@ -13,8 +13,8 @@
             <i class="fa fa-{{ service.icon }}"></i>
             <h4>{{ service.title }}</h4>
             <p>{{ service.desc }}</p>
-        </div>    
+        </div>
         {% endfor %}
-    </div>  
+    </div>
     {% endif %}
 </div>

templates/modular/contact.html.twig

@@ -1,4 +1,4 @@
-<div class="modular-row contact {{ page.header.class }}">    
+<div class="modular-row contact {{ page.header.class }}">
     <div class="g-grid pure-g-r">
         <div id="listing" class="g-block pure-u-2-3">
             {% if config.plugins.simple_form.enabled %}
@@ -7,7 +7,7 @@
                 {% endif %}
         </div>
         <div id="sidebar" class="g-block size-1-3 pure-u-1-3">
-            {{ content }}
+            {{ content|raw }}
         </div>
     </div>
 </div>

templates/modular/features.html.twig

@@ -1,5 +1,5 @@
 <div class="modular-row features {{ page.header.class}}">
-    {{ content }}
+    {{ content|raw }}
     {% for button in page.header.buttons %}
         <a class="button{% if button.primary %} primary{% endif %}" href="{{ button.url }}">{{ button.text }}</a>
     {% endfor %}

templates/modular/form.html.twig

@@ -4,7 +4,7 @@
             {% include "forms/form.html.twig" %}
         </div>
         <div id="sidebar" class="g-block size-1-3 pure-u-1-3">
-            {{ page.content }}
+            {{ page.content|raw }}
         </div>
     </div>
 </div>

templates/modular/portfolio.html.twig

@@ -1,5 +1,5 @@
 <div class="modular-row portfolio">
-    {{ content }}
+    {{ content|raw }}
     {% if page.header.portfolio %}
         <div class="notebooks">
             {% for row in page.header.portfolio|batch(4) %}

templates/modular/showcase.html.twig

@@ -2,7 +2,7 @@
   <div class="slideme">
     {% for slide in page.header.slides %}
        <div class="modular-row showcase flush-top" {% if page.media[slide.image] %}style="background-image: url({{ page.media[slide.image].url }});"{% endif %}>
-          <h1>{{ slide.heading }}</h1>
+          <h1>{{ slide.heading|raw }}</h1>
           <h2>{{ slide.subheading }}</h2>
           <a class="button" href="{{ slide.button_url }}">{{ slide.button_text }}</a>
       </div>
@@ -10,7 +10,7 @@
 </div>
 </div>
 
-{{ content }}
+{{ content|raw }}
 
 <script type="text/javascript">
 $('#content-slide').slideme({

templates/modular/team.html.twig

@@ -1,5 +1,5 @@
 <div class="modular-row team">
-    {{ content }}
+    {{ content|raw }}
     <div class="members">
         {% for member in page.header.members %}
         <div class="member">

templates/modular/text.html.twig

@@ -1,11 +1,11 @@
 <div class="modular-row callout">
- {{ content }}
+ {{ content|raw }}
  {% if page.header.pricing %}
     <div class="pricing-container">
         {% for item in page.header.pricing %}
             <div class="pricing-item">
                 <div class="name">{{ item.name }}</div>
-                <div class="price">{{ item.price }}</div>
+                <div class="price">{{ item.price|raw }}</div>
                 {% for line in item.options %}
                     <div class="info">
                         {{ line.line }}
@@ -16,7 +16,7 @@
                 </div>
             </div>
         {% endfor %}
-    </div>    
+    </div>
 {% endif %}
 {% if page.header.portfolio %}
     <div class="notebooks">
@@ -67,4 +67,4 @@
             </div>
         </div>
     </div>
-{% endfor %}
+{% endfor %}

templates/modular_alt.html.twig

@@ -56,7 +56,7 @@
                         <a href="{{ page.url }}" class="external">
                             {% if page.header.icon %}<i class="fa fa-{{ page.header.icon }}"></i>{% endif %}
                             {{ page.menu }}
-							
+
                         </a>
                     </li>
                 {% endif %}
@@ -70,7 +70,7 @@
                 </a>
             </li>
         {% endfor %}
-    
+
         {% for module in page.collection() %}
             {% set current_module = (module.active or module.activeChild) ? 'active' : '' %}
             <li class="{{ current_module }}"><a href="#{{ _self.pageLinkName(module.menu) }}">{{ module.menu }}</a></li>
@@ -88,9 +88,9 @@
     <h1>{{ page.title }}</h1>
     </div>
     {% endif %}
-    {{ page.content }}
+    {{ page.content|raw }}
     {% for module in page.collection() %}
         <div id="{{ _self.pageLinkName(module.menu) }}"></div>
-        {{ module.content }}
+        {{ module.content|raw }}
     {% endfor %}
 {% endblock %}

templates/partials/blog_item.html.twig

@@ -2,9 +2,9 @@
 
     <div class="list-blog-header">
         {% if big_header %}
-            {{ page.media.images|first.cropResize(900,600).html }}
+            {{ page.media.images|first.cropResize(900,600).html|raw }}
         {% else %}
-            {{ page.media.images|first.cropZoom(900,300).html }}
+            {{ page.media.images|first.cropZoom(900,300).html|raw }}
         {% endif %}
 
         {% if page.header.link %}
@@ -42,18 +42,18 @@
     <div class="list-blog-padding">
 
     {% if page.header.continue_link is sameas(false) %}
-        <p>{{ page.content }}</p>
+        <p>{{ page.content|raw }}</p>
         {% if not truncate %}
         {% set show_prev_next = true %}
         {% endif %}
     {% elseif truncate and page.summary != page.content %}
-        <p>{{ page.summary }}</p>
+        <p>{{ page.summary|raw }}</p>
         <p><a href="{{ page.url }}">Continue Reading...</a></p>
     {% elseif truncate %}
         <p>{{ page.content|truncate(550) }}</p>
         <p><a href="{{ page.url }}">Continue Reading...</a></p>
     {% else %}
-        <p>{{ page.content }}</p>
+        <p>{{ page.content|raw }}</p>
         {% set show_prev_next = true %}
     {% endif %}
 

templates/snipcart.html.twig

@@ -6,7 +6,7 @@
     {{ parent() }}
 
     <div class="content-wrapper">
-        {{ page.content }}
+        {{ page.content|raw }}
 
         <div class="snipcart-categories">
         {% for child in page.collection() %}