X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2Flayout.html.twig;h=95d7da9a36cb2b95ae44dde9bb82c70c25150551;hb=eb7b632ee6f898dbe5c861623f59fa62fc4d5235;hp=cb6fd58ae3d768add4eac32d3306225d51932997;hpb=77a53ea7244a5483e57f657e8f53bf45f226c581;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 cb6fd58a..95d7da9a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -29,7 +29,7 @@
             {% block logo %}
                 <li class="logo border-bottom">
                     <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
-                        <img src="{{ asset('wallassets/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
+                        <img src="{{ asset('wallassets/themes/_global/img/logo-square.svg') }}" alt="wallabag logo" />
                     </a>
                 </li>
             {% endblock %}
@@ -46,6 +46,8 @@
                {% set activeRoute = 'starred' %}
             {% elseif currentRoute == 'unread' or currentRoute == 'homepage' or currentRouteFromQueryParams == 'unread' %}
                {% set activeRoute = 'unread' %}
+            {% elseif currentRoute == 'untagged' %}
+               {% set activeRoute = 'untagged' %}
             {% endif %}
 
             <li class="bold {% if activeRoute == 'unread' %}active{% endif %}">
@@ -60,77 +62,81 @@
             <li class="bold {% if activeRoute == 'all' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }} <span class="numberItems grey-text">{{ count_entries('all') }}</span></a>
             </li>
-            <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
+            <li class="bold {% if currentRoute == 'tags' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }} <span class="numberItems grey-text">{{ count_tags() }}</span></a>
             </li>
-            <li class="bold {% if currentRoute == 'config' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
-            </li>
-            {% if craue_setting('restricted_access') %}
-            <li class="bold {% if currentRoute starts with 'site_credentials_' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('site_credentials_index') }}">{{ 'menu.left.site_credentials'|trans }}</a>
-            </li>
-            {% endif %}
-            {% if is_granted('ROLE_SUPER_ADMIN') %}
-                <li class="bold {% if currentRoute starts with 'user_' %}active{% endif %}">
-                    <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a>
-                </li>
-
-                <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}">
-                    <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a>
-                </li>
-            {% endif %}
-            <li class="bold {% if currentRoute == 'import' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a>
-            </li>
-            <li class="bold {% if currentRoute == 'developer' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a>
-            </li>
-            <li class="bold {% if currentRoute == 'howto' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a>
-            </li>
-            <li class="bold">
-                <a class="waves-effect icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
-            </li>
         </ul>
-        <div class="nav-wrapper nav-panels">
-            <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></a>
-            <div class="left action">
-                {% block title %}
-                {% endblock %}
-            </div>
-            <ul class="input-field nav-panel-buttom">
-                <li class="bold">
-                    <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add">
-                        <i class="material-icons">add</i>
-                    </a>
-                </li>
-                <li>
-                    <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search">
-                        <i class="material-icons">search</i>
-                    </a>
-                </li>
-                <li id="button_filters">
-                    <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
-                        <i class="material-icons">filter_list</i>
-                    </a>
-                </li>
-                <li id="button_export">
-                    <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
-                        <i class="material-icons">file_download</i>
-                    </a>
-                </li>
-            </ul>
-            <div class="input-field nav-panel-search" style="display: none">
-                {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': app.request.attributes.get('_route')})) }}
-                <label for="search"><i class="material-icons search">search</i></label>
-                <i class="material-icons close">clear</i>
-            </div>
-            <div class="input-field nav-panel-add" style="display: none">
-                {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
-                <label for="add"><i class="material-icons add">add</i></label>
-                <i class="material-icons close">clear</i>
+        <div class="nav-panels">
+            <div class="nav-panel-actions nav-panel-item">
+                <div class="nav-panel-top">
+                    <button data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="material-icons">menu</i></button>
+                    <h1 class="left action">
+                        {% block title %}
+                        {% endblock %}
+                    </h1>
+                </div>
+                <ul class="input-field nav-panel-buttom">
+                    <li class="bold">
+                        <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add">
+                            <i class="material-icons">add</i>
+                        </a>
+                    </li>
+                    <li>
+                        <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.search'|trans }}" href="javascript: void(null);" id="nav-btn-search">
+                            <i class="material-icons">search</i>
+                        </a>
+                    </li>
+                    {% if activeRoute %}
+                    <li id="button_random">
+                        <a class="waves-effect tooltipped js-random-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.random_entry'|trans }}" href="{{ path('random_entry', { 'type': activeRoute }) }}">
+                            <i class="material-icons">casino</i>
+                        </a>
+                    </li>
+                    <li id="button_sort">
+                        <a title="{{ 'menu.top.sort_entries'|trans }}" href="#" data-activates="sort" class="nav-panel-menu button-collapse-right">
+                            <i class="material-icons">sort_by_alpha</i>
+                        </a>
+                    </li>
+                    <li id="button_filters">
+                        <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
+                            <i class="material-icons">filter_list</i>
+                        </a>
+                    </li>
+                    <li id="button_export">
+                        <a class="nav-panel-menu button-collapse-right tooltipped js-export-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
+                            <i class="material-icons">file_download</i>
+                        </a>
+                    </li>
+                    {% endif %}
+                    <li class="bold">
+                        <a class="wave-effect tooltipped dropdown-button" data-beloworigin="true" data-constrainwidth="false" data-activates="dropdown-account" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.account'|trans }}" href="#" id="news_menu">
+                            <i class="material-icons" id="news_link">account_circle</i>
+                        </a>
+                    </li>
+                </ul>
+                <ul id="dropdown-account" class="dropdown-content">
+                    <li><a href="{{ path('config') }}"><i class="material-icons">settings</i> {{ 'menu.left.config'|trans }}</a></li>
+                    <li><a href="{{ path('developer') }}"><i class="material-icons">smartphone</i> {{ 'menu.left.developer'|trans }}</a></li>
+                    <li><a href="{{ path('import') }}"><i class="material-icons">import_export</i> {{ 'menu.left.import'|trans }}</a></li>
+                    {% if craue_setting('restricted_access') %}
+                        <li><a href="{{ path('site_credentials_index') }}"><i class="material-icons">vpn_key</i> {{ 'menu.left.site_credentials'|trans }}</a></li>
+                    {% endif %}
+                    <li class="divider"></li>
+                    {% if is_granted('ROLE_SUPER_ADMIN') %}
+                        <li><a href="{{ path('user_index') }}"><i class="material-icons">people</i>{{ 'menu.left.users_management'|trans }}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}"><i class="material-icons">settings</i> {{ 'menu.left.internal_settings'|trans }}</a></li>
+                        <li><a href="{{ path('ignore_origin_instance_rules_index') }}"><i class="material-icons">build</i> {{ 'menu.left.ignore_origin_instance_rules'|trans }}</a></li>
+                    {% endif %}
+                    <li class="divider"></li>
+                    <li><a href="{{ path('howto') }}"><i class="material-icons">live_help</i> {{ 'menu.left.howto'|trans }}</a></li>
+                    <li><a href="{{ path('quickstart') }}"><i class="material-icons">assistant_photo</i> {{ 'menu.left.quickstart'|trans }}</a></li>
+                    <li class="divider"></li>
+                    <li><a href="{{ path('fos_user_security_logout') }}"><i class="material-icons">input</i> {{ 'menu.left.logout'|trans }}</a></li>
+                </ul>
+
             </div>
+            {{ render(controller("WallabagCoreBundle:Entry:searchForm", {'currentRoute': currentRoute})) }}
+            {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
         </div>
     </nav>
 {% endblock %}
@@ -147,7 +153,7 @@
                     </div>
                     <div class="col s12 l4">
                         <p class="footer-text">
-                            {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> –
+                            {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" rel="noopener" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> –
                             <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a>
                         </p>
                     </div>