diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-05 22:20:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-05 22:20:27 +0200 |
commit | 6f23289e721bd14710af1acc23466432c1312850 (patch) | |
tree | 58ce6aa0cc70d0a101f3233ca2258592e6d08515 /src/Wallabag/CoreBundle/Resources | |
parent | e5b090960bed3eb4a70c29c4acbae2027e17f7d6 (diff) | |
parent | 5173fd1c3d05d1fadfbdd4db862cd744209e13ac (diff) | |
download | wallabag-6f23289e721bd14710af1acc23466432c1312850.tar.gz wallabag-6f23289e721bd14710af1acc23466432c1312850.tar.zst wallabag-6f23289e721bd14710af1acc23466432c1312850.zip |
Merge pull request #2266 from wallabag/add-tags-counter
Added tags counter in sidebar (material theme)
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 1c1457e7..e95ef452 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -81,8 +81,6 @@ services: | |||
81 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] | 81 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] |
82 | arguments: | 82 | arguments: |
83 | - WallabagCoreBundle:Entry | 83 | - WallabagCoreBundle:Entry |
84 | calls: | ||
85 | - [ setLifeTime, [ "%wallabag_core.cache_lifetime%" ] ] | ||
86 | 84 | ||
87 | wallabag_core.tag_repository: | 85 | wallabag_core.tag_repository: |
88 | class: Wallabag\CoreBundle\Repository\TagRepository | 86 | class: Wallabag\CoreBundle\Repository\TagRepository |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 06ecbf3d..b70198da 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -47,7 +47,7 @@ | |||
47 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a> | 47 | <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a> |
48 | </li> | 48 | </li> |
49 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> | 49 | <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"> |
50 | <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a> | 50 | <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a> |
51 | </li> | 51 | </li> |
52 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> | 52 | <li class="bold {% if currentRoute == 'config' %}active{% endif %}"> |
53 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> | 53 | <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a> |