From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Fri, 8 Apr 2016 11:51:20 +0000 (+0200)
Subject: Merge pull request #1879 from wallabag/v2-tag-field-position
X-Git-Tag: 2.0.1~18
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e969c2a7efe1dd6c1dd13bd8726591f7163397d5;hp=5b732257db5349939268547b90d7631063cfa45b;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1879 from wallabag/v2-tag-field-position

Move tag form in Material theme
---

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 032d2d9b..66435699 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -192,14 +192,14 @@
                 {% endfor %}
             </div>
 
-            {% if entry.previewPicture is not null %}
-                <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
-            {% endif %}
-
             <div class="input-field nav-panel-add-tag" style="display: none">
                 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
             </div>
 
+            {% if entry.previewPicture is not null %}
+                <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
+            {% endif %}
+
         </aside>
         <article>
             {{ entry.content | raw }}