From fe990ecf637ed753eefaaf4320244ebf0c81c164 Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Tue, 27 Mar 2018 09:17:48 +0200
Subject: [PATCH] Implemented listing of bookmarks

---
 digimarks.py             |  8 +++++-
 templates/bookmarks.html | 11 ++++++-
 templates/list.html      | 62 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 templates/list.html

diff --git a/digimarks.py b/digimarks.py
index 2a3e442..3c07c47 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -566,7 +566,10 @@ def get_bookmarks(userkey, filtermethod=None, sortmethod=None):
 @app.route('/<userkey>', methods=['GET', 'POST'])
 @app.route('/<userkey>/filter/<filtermethod>', methods=['GET', 'POST'])
 @app.route('/<userkey>/sort/<sortmethod>', methods=['GET', 'POST'])
-def bookmarks_page(userkey, filtermethod=None, sortmethod=None):
+@app.route('/<userkey>/<show_as>', methods=['GET', 'POST'])
+@app.route('/<userkey>/<show_as>/filter/<filtermethod>', methods=['GET', 'POST'])
+@app.route('/<userkey>/<show_as>/sort/<sortmethod>', methods=['GET', 'POST'])
+def bookmarks_page(userkey, filtermethod=None, sortmethod=None, show_as='cards'):
     bookmarks, bookmarktags, filter_text, message = get_bookmarks(userkey, filtermethod, sortmethod)
     theme = get_theme(userkey)
     return render_template(
@@ -579,6 +582,9 @@ def bookmarks_page(userkey, filtermethod=None, sortmethod=None):
         theme=theme,
         editable=True,  # bookmarks can be edited
         showtags=True,  # tags should be shown with the bookmarks
+        filtermethod=filtermethod,
+        sortmethod=sortmethod,
+        show_as=show_as,  # show list of bookmarks instead of cards
     )
 
 
diff --git a/templates/bookmarks.html b/templates/bookmarks.html
index 485cbd5..76b9773 100644
--- a/templates/bookmarks.html
+++ b/templates/bookmarks.html
@@ -71,7 +71,16 @@
 </div>
 {% endif %}
 
-{% include 'cards.html' %}
+<div class="row">
+    <div><a href="{{ url_for('bookmarks_page', userkey=userkey, filtermethod=filtermethod, sortmethod=sortmethod, show_as='list') }}">list</a>
+    </div>
+</div>
+
+{% if show_as and show_as == 'list' %}
+    {% include 'list.html' %}
+{% else %}
+    {% include 'cards.html' %}
+{% endif %}
 
 <div class="fixed-action-btn" style="bottom: 20px; right: 20px;">
     <a class="btn-floating btn-large {{ theme.FAB }}" href="{{ url_for('addbookmark', userkey=userkey) }}">
diff --git a/templates/list.html b/templates/list.html
new file mode 100644
index 0000000..5439cae
--- /dev/null
+++ b/templates/list.html
@@ -0,0 +1,62 @@
+<div class="row">
+    <table>
+        <thead>
+            <tr>
+                <th>&nbsp;</th>
+                <th>Bookmark</th>
+                <th>Added</th>
+                {% if showtags %}
+                <th>Tags</th>
+                {% endif %}
+                <th>&nbsp;</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for bookmark in bookmarks %}
+            <tr>
+                <td>
+                {% if bookmark.favicon %}
+                    <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" class="favicon" />
+                {% else %}
+                    <img src="{{ url_for('static', filename='faviconfallback.png') }}" class="favicon" />
+                {% endif %}
+                {% if bookmark.http_status != 200 and bookmark.http_status != 304 %}
+                    <i class="small material-icons {{ theme.PROBLEM }}" title="HTTP status {{ bookmark.http_status }}">report_problem</i>
+                {% endif %}
+                {% if bookmark.starred == True %}
+                    <i class="small material-icons {{ theme.STAR }}">star</i>
+                {% endif %}
+                {% if bookmark.note %}
+                    <i class="small material-icons {{ theme.CARD_TEXT }}" title="{{ bookmark.note|truncate(100) }}">comment</i>
+                {% endif %}
+                </td>
+                <td>
+                    <a href="{{ bookmark.url }}" title="{{ bookmark.url }}" rel="noreferrer noopener" target="_blank">
+                        {% if bookmark.title %}
+                            {{ bookmark.title }}
+                        {% else %}
+                            {{ bookmark.get_uri_domain() }} (no title)
+                        {% endif %}
+                    </a>
+                </td>
+                <td>{{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}</td>
+                {% if showtags %}
+                <td>
+                {% for tag in bookmark.tags_list %}
+                    <div class="chip">
+                        <a href="{{ url_for('tag_page', userkey=userkey, tag=tag) }}">{{ tag }}</a>
+                    </div>
+                {% endfor %}
+                </td>
+                {% endif %}
+                <td>
+                    {% if editable %}
+                    <a href="{{ url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" style="padding: 3px"><i class="tiny material-icons">mode_edit</i> EDIT</a>
+                    <a href="{{ url_for('deletingbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" style="padding: 3px" class="red-text"><i class="tiny material-icons">delete</i> DELETE</a>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+</div>