From c54ea989a3cadf49dbb991a4a270ebee38ac18d9 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Sat, 8 Aug 2015 00:08:29 +0300
Subject: fix #1281 (notifications when we star articles are buggy) All
 notification corrected

---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig   | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig')

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 54bba9a6..632f8c8b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -51,4 +51,12 @@
             </div>
         </div>
     </footer>
+{% endblock %}
+
+{% block messages %}
+    {% for flashMessage in app.session.flashbag.get('notice') %}
+        <script>
+            Materialize.toast('{{ flashMessage }}', 4000);
+        </script>
+    {% endfor %}
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From a6523cfe86a4555df4f02622db74e4df77f895c2 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Sat, 8 Aug 2015 00:16:14 +0300
Subject: fix #1281

---
 .../views/themes/material/layout.html.twig         | 69 +++++++++++++++++++---
 1 file changed, 61 insertions(+), 8 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig')

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 632f8c8b..8a49190e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -18,6 +18,67 @@
 {% block header %}
 {% endblock %}
 
+{% block messages %}
+    {% for flashMessage in app.session.flashbag.get('notice') %}
+        <script>
+            Materialize.toast('{{ flashMessage }}', 4000);
+        </script>
+    {% endfor %}
+{% endblock %}
+
+{% block menu %}
+    <nav class="cyan darken-1">
+        <ul id="slide-out" class="side-nav fixed">
+            {% block logo %}
+                <li class="logo border-bottom">
+                    <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
+                        <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
+                    </a>
+                </li>
+            {% endblock %}
+
+            {% set currentRoute = app.request.attributes.get('_route') %}
+
+            <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
+            <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
+            <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
+            <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
+            <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
+            <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+        </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>
+                    <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
+                </ul>
+            </div>
+            <form method="get" action="index.php">
+                <div class="input-field nav-panel-search" style="display: none">
+                    <input name="search" id="searchfield" type="search" required placeholder="{% trans %}Enter your search here{% endtrans %}">
+                    <label for="search"><i class="mdi-action-search"></i></label>
+                    <i class="mdi-navigation-close"></i>
+                </div>
+            </form>
+            <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
+                <div class="input-field nav-panel-add" style="display: none">
+                    <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
+                    <label for="add"><i class="mdi-content-add"></i></label>
+                    <i class="mdi-navigation-close"></i>
+                </div>
+            </form>-->
+        </div>
+    </nav>
+{% endblock %}
+
 {% block footer %}
     <footer class="page-footer cyan darken-2">
         <div class="container">
@@ -51,12 +112,4 @@
             </div>
         </div>
     </footer>
-{% endblock %}
-
-{% block messages %}
-    {% for flashMessage in app.session.flashbag.get('notice') %}
-        <script>
-            Materialize.toast('{{ flashMessage }}', 4000);
-        </script>
-    {% endfor %}
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3