diff options
| -rw-r--r-- | newspipe/web/templates/bookmarks.html | 5 | ||||
| -rw-r--r-- | newspipe/web/templates/layout.html | 2 | ||||
| -rw-r--r-- | newspipe/web/views/bookmark.py | 13 |
3 files changed, 8 insertions, 12 deletions
diff --git a/newspipe/web/templates/bookmarks.html b/newspipe/web/templates/bookmarks.html index 88b31abb..0f6e02c4 100644 --- a/newspipe/web/templates/bookmarks.html +++ b/newspipe/web/templates/bookmarks.html @@ -18,10 +18,11 @@ <div class="row"> <div class="col-6"> {% if tag %} - <span class="glyphicon glyphicon-tags" aria-hidden="true"></span> {{ tag }} + <i class="fa fa-tag" aria-hidden="true"></i> {{ tag }} {% endif %} {% if query %} - <span class="glyphicon glyphicon-search" aria-hidden="true"></span> {{ query }} + {% if tag %}<br />{% endif %} + <i class="fa fa-search" aria-hidden="true"></i> {{ query }} {% endif %} </div> <div class="col-6 text-right pull-right"> diff --git a/newspipe/web/templates/layout.html b/newspipe/web/templates/layout.html index c122bb46..b40b540c 100644 --- a/newspipe/web/templates/layout.html +++ b/newspipe/web/templates/layout.html @@ -79,7 +79,7 @@ <li class="nav-item dropdown"> <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownBookmark" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bookmark" aria-hidden="true"></i> {{ _('Bookmarks') }}</a> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownBookmark"> - <a class="dropdown-item" href="{{ url_for('bookmarks.list_') }}">{{ _('Your bookmarks') }}</a> + <a class="dropdown-item" href="{{ url_for('bookmarks.list_') }}">{{ _('Bookmarks') }}</a> <a class="dropdown-item" href="{{ url_for('bookmark.form') }}">{{ _('Add a new bookmark') }}</a> </div> </li> diff --git a/newspipe/web/views/bookmark.py b/newspipe/web/views/bookmark.py index 6e67716f..db15be42 100644 --- a/newspipe/web/views/bookmark.py +++ b/newspipe/web/views/bookmark.py @@ -94,15 +94,10 @@ def list_(per_page, status="all"): # query for the shared bookmarks (of all users) head_titles = [gettext("Recent bookmarks")] filters["shared"] = True - last_bookmark = ( - BookmarkController(user_id) - .read(**filters) - .order_by(desc("time")) - .limit(1)[0] - ) - not_created_before = last_bookmark.time - datetime.timedelta(days=365) - filters["time__gt"] = not_created_before # only "recent" bookmarks - bookmarks = BookmarkController(user_id).read(**filters).order_by(desc("time")) + + bookmarks = ( + BookmarkController(user_id).read(**filters).order_by(desc("time")).limit(100) + ) # tag_contr = BookmarkTagController(user_id) # tag_contr.read().join(bookmarks).all() |