4 files changed, 34 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index 00480d1a..18cfd59d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -28,7 +28,8 @@
            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>
        </header>
        <aside class="tags">
-            tags: {% for tag in entry.tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.label }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id }}" title="{% trans %}Edit tags{% endtrans %}">✎</a>
+            {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %}
+            {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
        </aside>
        <article>
            {{ entry.content | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig
new file mode 100644
index 00000000..0b5a530d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig
@@ -0,0 +1,15 @@
+<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
+        {% if form_errors(form) %}
+            <span class="black-text">{{ form_errors(form) }}</span>
+        {% endif %}
+        {% if form_errors(form.label) %}
+            <span class="black-text">{{ form_errors(form.label) }}</span>
+        {% endif %}
+        {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
+        {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
+    <div class="hidden">{{ form_rest(form) }}</div>
+</form>
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 b92c41b6..31b2c664 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
@@ -137,7 +137,8 @@ main {
            <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.domainName }}</span></a>
        </header>
        <aside class="tags">
-            tags: {% for tag in entry.tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.label }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id }}" title="{% trans %}Edit tags{% endtrans %}">✎</a>
+            {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %}
+            {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
        </aside>
        <article>
            {{ entry.content | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
new file mode 100644
index 00000000..0b5a530d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
@@ -0,0 +1,15 @@
+<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
+        {% if form_errors(form) %}
+            <span class="black-text">{{ form_errors(form) }}</span>
+        {% endif %}
+        {% if form_errors(form.label) %}
+            <span class="black-text">{{ form_errors(form.label) }}</span>
+        {% endif %}
+        {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
+        {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
+    <div class="hidden">{{ form_rest(form) }}</div>
+</form>

diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig index 00480d1a..18cfd59d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -28,7 +28,8 @@
28	<h1>{{ entry.title\|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>	28	<h1>{{ entry.title\|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>
29	</header>	29	</header>
30	<aside class="tags">	30	<aside class="tags">
31	tags: {% for tag in entry.tags %}<a href="./?view=tag&id={{ tag.id }}">{{ tag.label }}</a> {% endfor %}<a href="./?view=edit-tags&id={{ entry.id }}" title="{% trans %}Edit tags{% endtrans %}">✎</a>	31	{% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %}
		32	{{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
32	</aside>	33	</aside>
33	<article>	34	<article>
34	{{ entry.content \| raw }}	35	{{ entry.content \| raw }}


diff --git a/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig new file mode 100644 index 00000000..0b5a530d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig
@@ -0,0 +1,15 @@
		1	<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
		2
		3	{% if form_errors(form) %}
		4	<span class="black-text">{{ form_errors(form) }}</span>
		5	{% endif %}
		6
		7	{% if form_errors(form.label) %}
		8	<span class="black-text">{{ form_errors(form.label) }}</span>
		9	{% endif %}
		10
		11	{{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
		12	{{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
		13
		14	<div class="hidden">{{ form_rest(form) }}</div>
		15	</form>


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 b92c41b6..31b2c664 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
@@ -137,7 +137,8 @@ main {
137	<a href="{{ entry.url\|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title\|e }}" class="tool link"><span>{{ entry.domainName }}</span></a>	137	<a href="{{ entry.url\|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title\|e }}" class="tool link"><span>{{ entry.domainName }}</span></a>
138	</header>	138	</header>
139	<aside class="tags">	139	<aside class="tags">
140	tags: {% for tag in entry.tags %}<a href="./?view=tag&id={{ tag.id }}">{{ tag.label }}</a> {% endfor %}<a href="./?view=edit-tags&id={{ entry.id }}" title="{% trans %}Edit tags{% endtrans %}">✎</a>	140	{% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %}
		141	{{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
141	</aside>	142	</aside>
142	<article>	143	<article>
143	{{ entry.content \| raw }}	144	{{ entry.content \| raw }}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig new file mode 100644 index 00000000..0b5a530d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
@@ -0,0 +1,15 @@
		1	<form name="tag" method="post" action="{{ path('new_tag', { 'entry': entry.id })}}">
		2
		3	{% if form_errors(form) %}
		4	<span class="black-text">{{ form_errors(form) }}</span>
		5	{% endif %}
		6
		7	{% if form_errors(form.label) %}
		8	<span class="black-text">{{ form_errors(form.label) }}</span>
		9	{% endif %}
		10
		11	{{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
		12	{{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }}
		13
		14	<div class="hidden">{{ form_rest(form) }}</div>
		15	</form>