X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2Flayout.html.twig;h=2dab1c186d60e9fd6f2c9b372b2113f3f898928d;hb=64f81bc31699ed239e4becec1cfa7ebc0bef2b5a;hp=f64c3da281bf5e19edf6a3dad50a06ec567c3160;hpb=8315130a75c8f411f76134b6205a017409583d50;p=github%2Fwallabag%2Fwallabag.git
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 f64c3da2..2dab1c18 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -2,12 +2,14 @@
{% block css %}
{{ parent() }}
-
+ {% if not app.debug %}
+
+ {% endif %}
{% endblock %}
{% block scripts %}
{{ parent() }}
-
+
{% endblock %}
{% block header %}
@@ -33,26 +35,42 @@
{% endblock %}
{% set currentRoute = app.request.attributes.get('_route') %}
+ {% set currentRouteFromQueryParams = app.request.query.get('currentRoute') %}
-
- {{ 'menu.left.unread'|trans }} {{ unreadEntries }}
+ {% set activeRoute = null %}
+ {% if currentRoute == 'all' or currentRouteFromQueryParams == 'all' %}
+ {% set activeRoute = 'all' %}
+ {% elseif currentRoute == 'archive' or currentRouteFromQueryParams == 'archive' %}
+ {% set activeRoute = 'archive' %}
+ {% elseif currentRoute == 'starred' or currentRouteFromQueryParams == 'starred' %}
+ {% set activeRoute = 'starred' %}
+ {% elseif currentRoute == 'unread' or currentRoute == 'homepage' or currentRouteFromQueryParams == 'unread' %}
+ {% set activeRoute = 'unread' %}
+ {% endif %}
+
+
+ {{ 'menu.left.unread'|trans }} {{ count_entries('unread') }}
-
- {{ 'menu.left.starred'|trans }} {{ starredEntries }}
+
+ {{ 'menu.left.starred'|trans }} {{ count_entries('starred') }}
-
- {{ 'menu.left.archive'|trans }} {{ archivedEntries }}
+
+ {{ 'menu.left.archive'|trans }} {{ count_entries('archive') }}
-
- {{ 'menu.left.all_articles'|trans }} {{ allEntries }}
+
+ {{ 'menu.left.all_articles'|trans }} {{ count_entries('all') }}
- {{ 'menu.left.tags'|trans }}
+ {{ 'menu.left.tags'|trans }} {{ count_tags() }}
{{ 'menu.left.config'|trans }}
{% if is_granted('ROLE_SUPER_ADMIN') %}
+
+ {{ 'menu.left.users_management'|trans }}
+
+
{{ 'menu.left.internal_settings'|trans }}
@@ -67,7 +85,7 @@
{{ 'menu.left.howto'|trans }}
- {{ 'menu.left.logout'|trans }}
+ {{ 'menu.left.logout'|trans }}
@@ -76,40 +94,36 @@
{% block title %}
{% endblock %}
-
@@ -117,5 +131,23 @@
{% endblock %}
{% block footer %}
- {{ render(controller("WallabagCoreBundle:Footer:index")) }}
+
{% endblock %}