pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/v2' into v2_fix_material

Browse Source 
# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
This commit is contained in:
Alexandr Danilov
2015-08-10 12:27:12 +03:00
parent 946d6a5124 47cadf36c8
commit 4919584b87
6 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig Normal file
View File

@ -0,0 +1,13 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title "Tags" %}
{% block content %}
{% if tags is empty %}
<div class="messages warning"><p>{% trans %}No tags found.{% endtrans %}</p></div>
{% else %}
{% for tag in tags %}
{{tag.label}}
{% endfor %}
{% endif %}
{% endblock %}

2
src/Wallabag/CoreBundle/Resources/views/base.html.twig
View File

@ -71,7 +71,7 @@
<li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
<li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
<li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
<li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
<li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li>
<li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
<li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
<div id="search-form" class="messages info popup-form">