From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 3 Apr 2016 20:11:17 +0000 (+0200)
Subject: Merge pull request #1835 from wallabag/v2-prepare-v2
X-Git-Tag: 2.0.0
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a119acd15d6cf1c4b216435bcad47b8604e15dad;hp=163517da79d027458d5cadaa736962f4b4df8ab2;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1835 from wallabag/v2-prepare-v2

:rocket: Prepare v2.0.0 :birthday:
---

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index bac92ffa..2c15ad95 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -39,7 +39,7 @@
         <li><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li>
         <li><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li>
         <li><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li>
-        <li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
+        <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a>
             <div id="search-form" class="messages info popup-form">
                 <form method="get" action="index.php">
                     <h2>{{ 'menu.left.search'|trans }}</h2>
@@ -49,7 +49,7 @@
                     <input id="submit-search" type="submit" value="{{ 'menu.left.search'|trans }}">
                 </form>
             </div>
-        </li>
+        </li>-->
         <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li>
         {% if is_granted('ROLE_SUPER_ADMIN') %}
             <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li>
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 48eaca81..75170f91 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -88,11 +88,11 @@
                             <i class="mdi-content-add"></i>
                         </a>
                     </li>
-                    <li>
+                    <!--<li>
                         <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search">
                             <i class="mdi-action-search"></i>
                         </a>
-                    </li>
+                    </li>-->
                     <li id="button_filters">
                         <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right">
                             <i class="mdi-content-filter-list"></i>