From ecc89f710972f1901d139446ce92b0543849114f Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <cedric@cedricbonhomme.org>
Date: Fri, 26 May 2017 23:23:00 +0200
Subject: updated layout

---
 src/web/templates/layout.html     | 5 +++--
 src/web/templates/management.html | 2 +-
 src/web/views/bookmark.py         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index 26cd91b7..dc62104f 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -50,7 +50,7 @@
                         <div><span class="glyphicon glyphicon-bookmark"></span></div>
                     </a>
                     <ul class="dropdown-menu">
-                        <li><a href="{{ url_for('bookmarks.list') }}">{{ _('Your bookmarks') }}</a></li>
+                        <li><a href="{{ url_for('bookmarks.list_') }}">{{ _('Your bookmarks') }}</a></li>
                         <li><a href="{{ url_for('bookmark.form') }}">{{ _('Add a new bookmark') }}</a></li>
                     </ul>
                 </li>
@@ -114,7 +114,8 @@
                     </ul>
                 </li>
             {% else %}
-                <li><a href="{{ url_for("popular") }}"><span class="glyphicon glyphicon-bookmark"></span>&nbsp;{{ _('Popular') }}</a></li>
+                <li><a href="{{ url_for("bookmarks.list_") }}"><span class="glyphicon glyphicon-bookmark"></span>&nbsp;{{ _('Bookmarks') }}</a></li>
+                <li><a href="{{ url_for("popular") }}"><span class="glyphicon glyphicon-list"></span>&nbsp;{{ _('Popular') }}</a></li>
                 <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span>&nbsp;{{ _('About') }}</a></li>
             {% endif %}
           </ul>
diff --git a/src/web/templates/management.html b/src/web/templates/management.html
index 61eafe75..62e28dbe 100644
--- a/src/web/templates/management.html
+++ b/src/web/templates/management.html
@@ -12,7 +12,7 @@
             </div>
             <div class="col-md-6">
                 <h1>{{ _('Your bookmarks') }}</h1>
-                <p>{{ _('You have') }} {{ nb_bookmarks }} <a href="{{ url_for("bookmarks.list")}}">{{ _('bookmarks') }}</a>.</p>
+                <p>{{ _('You have') }} {{ nb_bookmarks }} <a href="{{ url_for("bookmarks.list_")}}">{{ _('bookmarks') }}</a>.</p>
                 <a href="{{ url_for("bookmarks.delete_all") }}" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete all bookmarks.') }}');">{{ _('Delete all bookmarks') }}</a>
             </div>
         </div>
diff --git a/src/web/views/bookmark.py b/src/web/views/bookmark.py
index 04e79c09..9263b49f 100644
--- a/src/web/views/bookmark.py
+++ b/src/web/views/bookmark.py
@@ -49,7 +49,7 @@ bookmark_bp = Blueprint('bookmark', __name__, url_prefix='/bookmark')
 
 
 @bookmarks_bp.route('/', defaults={'per_page': '50'}, methods=['GET'])
-def list(per_page):
+def list_(per_page):
     "Lists the bookmarks."
     head_titles = [gettext("Bookmarks")]
 
-- 
cgit