aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2020-03-04 12:00:21 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2020-03-04 12:00:21 +0100
commit0fbc770bb252425791a24f26ac76762133f024b4 (patch)
tree672c8fd242bf2930bdc00f937970fd8dd5203945
parentUpdated some strings in the user data management template. (diff)
downloadnewspipe-0fbc770bb252425791a24f26ac76762133f024b4.tar.gz
newspipe-0fbc770bb252425791a24f26ac76762133f024b4.tar.bz2
newspipe-0fbc770bb252425791a24f26ac76762133f024b4.zip
Improved bookmarks template.
-rw-r--r--newspipe/web/templates/bookmarks.html24
-rw-r--r--newspipe/web/views/bookmark.py2
2 files changed, 16 insertions, 10 deletions
diff --git a/newspipe/web/templates/bookmarks.html b/newspipe/web/templates/bookmarks.html
index a3ec4580..88b31abb 100644
--- a/newspipe/web/templates/bookmarks.html
+++ b/newspipe/web/templates/bookmarks.html
@@ -2,10 +2,10 @@
{% block content %}
<div class="container">
<div class="row">
- <div class="col-md-6">
+ <div class="col-6">
{{ pagination.info }}
</div>
- <div class="col-md-6 text-right">
+ <div class="col-6 text-right">
{% if current_user.is_authenticated %}
<a class="text-muted" href="{{ url_for('bookmarks.list_') }}">all</a>&nbsp;⸱&nbsp;
<a class="text-muted" href="{{ url_for('bookmarks.list_') + 'private' }}">private</a>&nbsp;⸱&nbsp;
@@ -16,7 +16,7 @@
</div>
<br />
<div class="row">
- <div class="col-md-6">
+ <div class="col-6">
{% if tag %}
<span class="glyphicon glyphicon-tags" aria-hidden="true"></span>&nbsp;&nbsp;{{ tag }}
{% endif %}
@@ -24,24 +24,30 @@
<span class="glyphicon glyphicon-search" aria-hidden="true"></span>&nbsp;&nbsp;{{ query }}
{% endif %}
</div>
- <div class="col-md-6 text-right">
+ <div class="col-6 text-right pull-right">
<form method="GET">
- <div class="form-inline">
- <input type="text" name="query" class="form-control" />
- <button type="submit" class="btn btn-default">Search</button>
+ <div class="form-row align-items-center pull-right">
+ <div class="col-auto">
+ <div class="input-group">
+ <input type="text" name="query" class="form-control" />
+ <div class="input-group-append">
+ <button type="submit" class="btn btn-primary">Search</button>
+ </div>
+ </div>
+ </div>
</div>
</form>
</div>
</div>
<br />
<div class="row">
- <div class="col-md-8">
+ <div class="col-8">
{{ pagination.links }}
</div>
</div>
<div class="row">
- <div class="col-md-8">
+ <div class="col">
<ul class="list-group">
{% for bookmark in bookmarks %}
<li class="list-group-item">
diff --git a/newspipe/web/views/bookmark.py b/newspipe/web/views/bookmark.py
index 6b370658..c7b4e623 100644
--- a/newspipe/web/views/bookmark.py
+++ b/newspipe/web/views/bookmark.py
@@ -106,7 +106,7 @@ def list_(per_page, status="all"):
pagination = Pagination(
page=page,
total=bookmarks.count(),
- css_framework="bootstrap3",
+ css_framework="bootstrap4",
search=False,
record_name="bookmarks",
per_page=per_page,
bgstack15