From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Fri, 7 Aug 2015 20:59:11 +0000 (+0300)
Subject: Title in navigation bar
X-Git-Tag: 2.0.0-alpha.0~50^2~6
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0e7650683d86413feeae07b99b1525c0e2089dcb;p=github%2Fwallabag%2Fwallabag.git

Title in navigation bar
---

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
index a767f8cf..773a3729 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@@ -80,6 +80,13 @@
                     </ul>
                     <div class="nav-wrapper nav-panels">
                         <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
+                        <div class="left action">
+                            {% if currentRoute == 'unread' or currentRoute == 'homepage' %}{% trans %}Unread{% endtrans %}{% endif %}
+                            {% if currentRoute == 'starred' %}{% trans %}Starred{% endtrans %}{% endif %}
+                            {% if currentRoute == 'archive' %}{% trans %}Archive{% endtrans %}{% endif %}
+                            {% if currentRoute == 'tags' %}{% trans %}Tags{% endtrans %}{% endif %}
+                            {% if currentRoute == 'config' %}{% trans %}Config{% endtrans %}{% endif %}
+                        </div>
                         <div class="input-field nav-panel-buttom">
                             <ul>
                                 <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 3815ff3c..d5f03c91 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -88,6 +88,12 @@ nav, main, footer {
     color: #444 !important;
 }
 
+.nav-panels .action {
+    padding-left: 0.75rem;
+    font-size: 2.1rem;
+    white-space: nowrap;
+}
+
 /* ==========================================================================
    2 = Side-nav
    ========================================================================== */
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index ff8bba7b..6f5db066 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -15,6 +15,7 @@ $(document).ready(function(){
     $('#nav-btn-search').click(function(){
         $(".nav-panel-buttom").hide(100);
         $(".nav-panel-search").show(100);
+        $(".nav-panels .action").hide(100);
         $(".nav-panel-menu").addClass('hidden');
         $(".nav-panels").css('background', 'white');
         return false;
@@ -23,6 +24,7 @@ $(document).ready(function(){
         $(".nav-panel-add").hide(100);
         $(".nav-panel-search").hide(100);
         $(".nav-panel-buttom").show(100);
+        $(".nav-panels .action").show(100);
         $(".nav-panel-menu").removeClass('hidden');
         $(".nav-panels").css('background', 'transparent');
         return false;