X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2Flayout.html.twig;h=2a14e5b0cda4ea461545bebecc4d6766daa6f009;hb=8abb6c13219c7125f57667c9272db0a5c5d2bcb7;hp=9437a2a85c736a497395c61a2c362e097bb7c478;hpb=ee122a7528f55dfb5f02e351c509d00b756fedaa;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 9437a2a8..2a14e5b0 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 %}
@@ -19,8 +21,6 @@
Materialize.toast('{{ flashMessage|trans }}', 4000);
{% endfor %}
-
- {{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
{% endblock %}
{% block menu %}
@@ -29,23 +29,35 @@
{% block logo %}
-
+
{% endblock %}
{% set currentRoute = app.request.attributes.get('_route') %}
+ {% set currentRouteFromQueryParams = app.request.query.get('currentRoute') %}
+
+ {% 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 }} {{ count_entries('starred') }}
-
+
{{ 'menu.left.archive'|trans }} {{ count_entries('archive') }}
-
+
{{ 'menu.left.all_articles'|trans }} {{ count_entries('all') }}
@@ -54,6 +66,11 @@
{{ 'menu.left.config'|trans }}
+ {% if craue_setting('restricted_access') %}
+
+ {{ 'menu.left.site_credentials'|trans }}
+
+ {% endif %}
{% if is_granted('ROLE_SUPER_ADMIN') %}
{{ 'menu.left.users_management'|trans }}
@@ -82,38 +99,36 @@
{% block title %}
{% endblock %}
-
+
- {{ render(controller("WallabagCoreBundle:Entry:searchForm")) }}
-
+ {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
+
clear
{{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
-
+
clear