From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Thu, 4 Feb 2016 16:46:02 +0000 (+0100)
Subject: Merge pull request #1642 from wallabag/v2-escape-preview
X-Git-Tag: 2.0.0-beta.1~55
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=27c837dcd1640a7f5f0ed197e882eefd53ba8273;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1642 from wallabag/v2-escape-preview

Unescape content for Material card
---

27c837dcd1640a7f5f0ed197e882eefd53ba8273
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index c86b8d88,0c35de2d..8ad24fbf
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@@ -46,16 -46,17 +46,17 @@@
                                  <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i>
                              {% endif %}
  
-                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw|striptags|slice(0, 42) }}</a></span>
+                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
  
-                             {% if entry.readingTime > 0 %}
-                                 <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div>
-                             {% else %}
-                                 <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur">&lt;</small> 1 min</span></div>
-                             {% endif %}
+                             <div class="estimatedTime grey-text">
+                                 <span class="tool reading-time">
+                                     {% trans %}estimated reading time{% endtrans %}:
+                                     {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min
+                                 </span>
+                             </div>
  
                              {% if entry.previewPicture is null %}
-                                 <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                                 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
                              {% endif %}
                          </div>
                      </div>
@@@ -65,13 -66,14 +66,14 @@@
                              <i class="card-title grey-text text-darken-4 mdi-card-close right"></i>
                              <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
  
-                             {% if entry.readingTime > 0 %}
-                                 <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div>
-                             {% else %}
-                                 <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur">&lt;</small> 1 min</span></div>
-                             {% endif %}
+                             <div class="estimatedTime grey-text">
+                                 <span class="tool reading-time">
+                                     {% trans %}estimated reading time{% endtrans %}:
+                                     {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min
+                                 </span>
+                             </div>
  
-                             <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
                          </div>
                      {% endif %}
  
@@@ -99,13 -101,13 +101,13 @@@
      {% endif %}
          <h4 class="center">{% trans %}Export{% endtrans %}</h4>
          <ul>
 -            {% if export_epub %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">{% trans %}EPUB{% endtrans %}</a></li>{% endif %}
 -            {% if export_mobi %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">{% trans %}MOBI{% endtrans %}</a></li>{% endif %}
 -            {% if export_pdf %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">{% trans %}PDF{% endtrans %}</a></li>{% endif %}
 -            {% if export_xml %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">{% trans %}XML{% endtrans %}</a></li>{% endif %}
 -            {% if export_csv %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">{% trans %}JSON{% endtrans %}</a></li>{% endif %}
 -            {% if export_json %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">{% trans %}CSV{% endtrans %}</a></li>{% endif %}
 -            {% if export_txt %}<li class="bold"><del><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">{% trans %}TXT{% endtrans %}</a></del></li>{% endif %}
 +            {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">{% trans %}EPUB{% endtrans %}</a></li>{% endif %}
 +            {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">{% trans %}MOBI{% endtrans %}</a></li>{% endif %}
 +            {% if craue_setting('export_pdf') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'pdf' }) }}">{% trans %}PDF{% endtrans %}</a></li>{% endif %}
 +            {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">{% trans %}XML{% endtrans %}</a></li>{% endif %}
 +            {% if craue_setting('export_csv') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'json' }) }}">{% trans %}JSON{% endtrans %}</a></li>{% endif %}
 +            {% if craue_setting('export_json') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'csv' }) }}">{% trans %}CSV{% endtrans %}</a></li>{% endif %}
 +            {% if craue_setting('export_txt') %}<li class="bold"><del><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'txt' }) }}">{% trans %}TXT{% endtrans %}</a></del></li>{% endif %}
          </ul>
      </div>