Latest peewee

[Snyk] Security upgrade urllib3 from 2.4.0 to 2.5.0

.gitignore

@@ -87,3 +87,13 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# vim
+*.swp
+
+# digimarks
+static/favicons
+tags
+*.db_*
+*.db
+settings.py

CHANGELOG.md

@@ -1,18 +1,125 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
 ## TODO
 
 - Sorting of bookmarks
   - Sort by title
   - Sort by date
 - Logging of actions
-- json/rss views of public tag pages
+- Add new way of authentication and editing bookmark collections:
+  https://github.com/aquatix/digimarks/issues/8 and https://github.com/aquatix/digimarks/issues/9
+- Change adding tags to use the MaterializeCSS tags: https://materializecss.com/chips.html
+- Do calls to the API endpoint of an existing bookmark when editing properties
+  (for example to update tags, title and such, also to already suggest title)
+- Look into compatibility with del.icio.us, so we can make use of existing browser integration
+- Add unit tests
+
+
+## [Unreleased]
+
+### Added
+- 'lightblue' theme
+- 'black amoled' theme
+- Python 3 compatibility (tested with Python 3.5 and 3.6)
+- Accept 'HTTP 202' responses as 'OK'
+- API: Added endpoint for 'bookmarks', returning JSON
+- Top navigation items now have icons too, like the sidebar in mobile view
+- Download favicons from RealFaviconGenerator: https://realfavicongenerator.net/api/download_website_favicon
+- Added `/<systemkey>/findmissingfavicons` endpoint to fill in the blanks in the favicon collection
+- Added fallback favicon image (semitransparent digimarks 'M' logo) for bookmarks without a favicon. No more broken images.
+- Added theme support for buttons.
+- Autocompletion in bookmark search field
+- API: search endpoint
+- Redirect endpoint for a bookmark, de-referring to its url (`/r/<userkey>/<urlhash>`)
+
+### Changed
+- Fixed theming of browser chrome in mobile browsers
+- Changed link colour of 'dark' theme from blue to orange
+- Modified card padding so it fits more content
+- Fixed ability to select a checkbox in the add/edit bookmark form
+- Made the 404 page theme aware, falls back to default (green) theme
+- Fixed admin pages not working anymore due to `settings` object name clash
+- On Add/Edit bookmark and encountering a 301, show a better message about automatically changing the URL with the provided button
+- Switched to 1.0 (alpha 4) version of MaterializeCSS
+- jQuery-b-gone: changed all jQuery code to regular JavaScript code/MaterializeCSS framework
+- Fixed colour of filter text in search field for dark themes
+- Unified rendering of 'private' and 'public' views of bookmark cards
+- Code cleanups, readability fixes
+- digimarks User Agent string to correctly identify ourselves, also preventing servers blocking 'bots'
+- Text search now also finds matches in the 'note' and 'url' of a bookmark, aside from its title
+- Main navigation items ('tags' and 'add bookmark') are now buttons, better visible as action items.
+- Removed item limit for feeds
+- Form fields are now themed
+- Disabled browser autocomplete for forms, which generally interfered with editing bookmarks (e.g., tag field) and the search field,
+  which has its own autocomplete now
+- Changed default theme to the 'freshgreen' variant
+- Links are now themed in the proper colours everywhere
+
+### Removed
+- Removed dependency on jQuery
+
+
+## [1.1.0] - 2017-07-22
+
+### Added
+- Show 404 page if bookmark is not found when editing
+- Cache buster to force loading of the latest styling
+- Theming support, default is 'green'
+- Themes need an extra `theme` field in the User table
+- Added 'freshgreen' and 'dark' themes
+
+### Changed
+- Make running in a virtualenv optional
+- Fix for misalignment and size of hamburger icon
+- Updated Python (pip) dependencies
+- Updated MaterializeCSS and jQuery
+
+### Removed
+- Removed dependency on more_itertools
+- Removed dependency on utilkit
+
+
+## [1.0.0] - 2016-12-29
+
+- json view of public tag pages, returns all items
+- feed (rss/atom) view of public tag pages, returns latest 15
+- feed link on public tag page
+- Support for bookmarklets
+- UI tweaks
+- Redesigned cards with bigger favicon. Looks cleaner
+- Different favicon service with 60x60px icons
+- Prevent duplicate form submission on add/edit bookmark
+- Delete bookmark from bookmark card
+- Undo delete link in "Bookmark has been deleted" message
+- Delete public tag page
 - On tags overview page:
   - Show which tags have public pages, with link
   - How many bookmarks each tag has
+  - Statistics on:
+    - total tags
+    - number of public tag pages
+    - total number of bookmarks
+    - number of starred bookmarks
+    - number of bookmarks with a non-OK http status
+    - number of deleted bookmarks
+- Filter on 'star' status, 'broken' status (non-http-200-OK)
+- Bookmark can have a note now
+  - Note icon on card with text in title (desktop browser)
+  - Filter on bookmarks with a note
+- Show url domain name along with 'no title' for items without title
+- Catch connection timeouts and such
+- Open in new tab/window, prevent
+  http://davidebove.com/blog/2016/05/05/target_blank-the-vulnerability-in-your-browser/
+- Put the tag selection in a collapsible element to prevent clutter in edit window
+- Updated MaterializeCSS and jQuery
 
 
-## v0.2.0
-
-2016-08-02
+## [0.2.0] - 2016-08-02
 
 - Favicon courtesy Freepik on flaticon.com
 - Tag tags for easy adding of tags
@@ -23,9 +130,7 @@
 - Option to strip parameters from url (like '?utm_source=social')
 
 
-## v0.1.0
-
-2016-07-26
+## [0.1.0] - 2016-07-26
 
 - Initial release
 - Flask application with functionality to add users, add and edit bookmarks,

README.rst

@@ -1,7 +1,7 @@
 digimarks
 =========
 
-|PyPI version| |PyPI downloads| |PyPI license| |Code health|
+|PyPI version| |PyPI license| |Code health| |Codacy|
 
 Simple bookmarking service, using a SQLite database to store bookmarks, supporting tags and automatic title fetching.
 
@@ -39,12 +39,24 @@ Usage / example configuration
 Copy ``settings.py`` from example_config to the parent directory and
 configure to your needs (*at the least* change the value of `SYSTEMKEY`).
 
+Do not forget to fill in the `MASHAPE_API_KEY` value, which you [can request on the RapidAPI website](https://rapidapi.com/realfavicongenerator/api/realfavicongenerator).
+
 Run digimarks as a service under nginx or apache and call the appropriate
 url's when wanted.
 
 Url's are of the form https://marks.example.com/<userkey>/<action>
 
 
+Bookmarklet
+~~~~~~~~~~~
+
+To easily save a link from your browser, open its bookmark manager and create a new bookmark with as url:
+
+.. code-block:: javascript
+
+    javascript:location.href='http://marks.example.com/1234567890abcdef/add?url='+encodeURIComponent(location.href);
+
+
 Creating a new user
 -------------------
 
@@ -82,13 +94,14 @@ Attributions
 .. _webhook: https://en.wikipedia.org/wiki/Webhook
 .. |PyPI version| image:: https://img.shields.io/pypi/v/digimarks.svg
    :target: https://pypi.python.org/pypi/digimarks/
-.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/digimarks.svg
-   :target: https://pypi.python.org/pypi/digimarks/
 .. |PyPI license| image:: https://img.shields.io/github/license/aquatix/digimarks.svg
    :target: https://pypi.python.org/pypi/digimarks/
 .. |Code health| image:: https://landscape.io/github/aquatix/digimarks/master/landscape.svg?style=flat
    :target: https://landscape.io/github/aquatix/digimarks/master
    :alt: Code Health
+.. |Codacy| image:: https://api.codacy.com/project/badge/Grade/9a34319d917b43219a29e59e9ac75e3b
+   :alt: Codacy Badge
+   :target: https://app.codacy.com/app/aquatix/digimarks?utm_source=github.com&utm_medium=referral&utm_content=aquatix/digimarks&utm_campaign=badger
 .. _hook settings: https://github.com/aquatix/digimarks/blob/master/example_config/examples.yaml
 .. _vhost for Apache2.4: https://github.com/aquatix/digimarks/blob/master/example_config/apache_vhost.conf
 .. _uwsgi.ini: https://github.com/aquatix/digimarks/blob/master/example_config/uwsgi.ini

example_config/settings.py

@@ -1,4 +1,4 @@
-# Virtualenv to use with the wsgi file
+# Virtualenv to use with the wsgi file (optional)
 VENV = '/srv/marks.example.com/venv/bin/activate_this.py'
 
 PORT = 8086
@@ -10,6 +10,10 @@ DEBUG = False
 # echo -n "yourstring" | sha1sum
 SYSTEMKEY = 'S3kr1t'
 
+# RapidAPI key for favicons
+# https://rapidapi.com/realfavicongenerator/api/realfavicongenerator
+MASHAPE_API_KEY = 'your_MASHAPE_key'
+
 LOG_LOCATION = 'digimarks.log'
 #LOG_LOCATION = '/var/log/digimarks/digimarks.log'
 # How many logs to keep in log rotation:

requirements-dev.in

@@ -0,0 +1,3 @@
+-r requirements.in
+
+pylint

requirements-dev.txt

@@ -0,0 +1,61 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile requirements-dev.in
+astroid==3.3.10
+    # via pylint
+beautifulsoup4==4.13.4
+    # via bs4
+blinker==1.9.0
+    # via flask
+bs4==0.0.2
+    # via -r requirements.in
+certifi==2025.6.15
+    # via requests
+charset-normalizer==3.4.2
+    # via requests
+click==8.2.1
+    # via flask
+dill==0.4.0
+    # via pylint
+feedgen==1.0.0
+    # via -r requirements.in
+flask==3.1.1
+    # via -r requirements.in
+idna==3.10
+    # via requests
+isort==6.0.1
+    # via pylint
+itsdangerous==2.2.0
+    # via flask
+jinja2==3.1.6
+    # via flask
+lxml==6.0.0
+    # via feedgen
+markupsafe==3.0.2
+    # via
+    #   flask
+    #   jinja2
+    #   werkzeug
+mccabe==0.7.0
+    # via pylint
+peewee==3.18.2
+    # via -r requirements.in
+platformdirs==4.3.8
+    # via pylint
+pylint==3.3.7
+    # via -r requirements-dev.in
+python-dateutil==2.9.0.post0
+    # via feedgen
+requests==2.32.4
+    # via -r requirements.in
+six==1.17.0
+    # via python-dateutil
+soupsieve==2.7
+    # via beautifulsoup4
+tomlkit==0.13.3
+    # via pylint
+typing-extensions==4.14.1
+    # via beautifulsoup4
+urllib3==2.5.0
+    # via requests
+werkzeug==3.1.3
+    # via flask

requirements.in

@@ -0,0 +1,10 @@
+# Core application
+flask
+peewee
+
+# Fetch title etc from links
+bs4
+requests
+
+# Generate (atom) feeds for tags and such
+feedgen

requirements.txt

@@ -1,7 +1,47 @@
-flask
-peewee
-flask-peewee
-bs4
-more_itertools
-requests
-utilkit
+# This file was autogenerated by uv via the following command:
+#    uv pip compile requirements.in
+beautifulsoup4==4.13.4
+    # via bs4
+blinker==1.9.0
+    # via flask
+bs4==0.0.2
+    # via -r requirements.in
+certifi==2025.6.15
+    # via requests
+charset-normalizer==3.4.2
+    # via requests
+click==8.2.1
+    # via flask
+feedgen==1.0.0
+    # via -r requirements.in
+flask==3.1.1
+    # via -r requirements.in
+idna==3.10
+    # via requests
+itsdangerous==2.2.0
+    # via flask
+jinja2==3.1.6
+    # via flask
+lxml==6.0.0
+    # via feedgen
+markupsafe==3.0.2
+    # via
+    #   flask
+    #   jinja2
+    #   werkzeug
+peewee==3.18.2
+    # via -r requirements.in
+python-dateutil==2.9.0.post0
+    # via feedgen
+requests==2.32.4
+    # via -r requirements.in
+six==1.17.0
+    # via python-dateutil
+soupsieve==2.7
+    # via beautifulsoup4
+typing-extensions==4.14.1
+    # via beautifulsoup4
+urllib3==2.5.0
+    # via requests
+werkzeug==3.1.3
+    # via flask

setup.py

@@ -7,18 +7,18 @@ https://github.com/pypa/sampleproject
 
 from setuptools import setup
 # To use a consistent encoding
-from codecs import open
+from codecs import open as codecopen
 from os import path
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the relevant file
-with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
+with codecopen(path.join(here, 'README.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(
     name='digimarks', # pip install digimarks
-    description='Simple bookmarking service, using a SQLite database to store bookmarks, supporting tags and automatic title fetching.',
+    description='Simple bookmarking service, using a SQLite database to store bookmarks, supporting tags, automatic title fetching and REST API calls.',
     #long_description=open('README.md', 'rt').read(),
     long_description=long_description,
 
@@ -26,7 +26,7 @@ setup(
     # third part for minor release
     # second when api changes
     # first when it becomes stable someday
-    version='0.2.0',
+    version='1.1.99',
     author='Michiel Scholten',
     author_email='michiel@diginaut.net',
 
@@ -35,7 +35,7 @@ setup(
 
     # as a practice no need to hard code version unless you know program wont
     # work unless the specific versions are used
-    install_requires=['Flask', 'Peewee', 'Flask-Peewee', 'requests', 'utilkit'],
+    install_requires=['Flask', 'Peewee', 'Flask-Peewee', 'requests', 'bs4'],
 
     py_modules=['digimarks'],
 

static/css/digimarks.css

@@ -1,59 +1,67 @@
+/**
+ * digimarks styling
+ */
 
-  /* label color */
-   .input-field label {
-     color: #000;
-   }
-   /* label focus color */
-   .input-field input[type=text]:focus + label {
-     color: #000;
-   }
-   /* label underline focus color */
-   .input-field input[type=text]:focus {
-     border-bottom: 1px solid #000;
-     box-shadow: 0 1px 0 0 #000;
-   }
-   /* valid color */
-   .input-field input[type=text].valid {
-     border-bottom: 1px solid #000;
-     box-shadow: 0 1px 0 0 #000;
-   }
-   /* invalid color */
-   .input-field input[type=text].invalid {
-     border-bottom: 1px solid #000;
-     box-shadow: 0 1px 0 0 #000;
-   }
-   /* icon prefix focus color */
-   .input-field .prefix.active {
-     color: #000;
-   }
+/** Navigation **/
 
-
-   /* Card title anchor colour */
-   .white-text .card-title a,
-   .white-text a
+nav .sidenav-trigger
 {
-       color: #FFF;
+    /* Fix for misalignment of hamburger icon */
+    margin: 0;
 }
 
-   .chip a,
-   .white-text .chip a
+nav .sidenav-trigger i
 {
-       color: #1b5e20; /* green darken-4 */
+    /* Make the hamburger icon great again */
+    font-size: 2.7rem;
+}
+
+/** Cards and tags **/
+
+.card .card-content,
+.card .card-reveal
+{
+    padding: 12px;
 }
 
 .card.tiny
 {
     height: 140px;
+    overflow: hidden;
+}
+
+.card.tiny .card-title
+{
+    font-size: 18px;
 }
 
 .card .card-reveal .digimark-card-header,
-   .card .digimark-card-header.activator
+.card .digimark-card-header.activator,
+.chip.clickable
 {
     cursor: pointer;
     /*display: block;*/
 }
 
-   .card .digimark-card-content
+.card .digimark-card-header-tags
 {
     padding-top: 10px;
 }
+
+.card-image
+{
+    min-width: 60px;
+}
+
+.card-image i,
+.list-image i
+{
+    padding: 5px 0 0 15px;
+}
+
+.card.horizontal .card-image img.favicon,
+.list-image img.favicon
+{
+    height: 60px;
+    width: 60px;
+}

static/js/init.js

@@ -1,7 +1,11 @@
-(function($){
-  $(function(){
+/* global M */
 
-    $('.button-collapse').sideNav();
+var options = {};
+var elem = document.querySelector(".sidenav");
+var instance = M.Sidenav.init(elem, options);
 
-  }); // end of document ready
-})(jQuery); // end of jQuery name space
+elem = document.querySelector(".collapsible");
+instance = M.Collapsible.init(elem, {
+    // inDuration: 1000,
+    // outDuration: 1000
+});

templates/base.html

@@ -8,41 +8,104 @@
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"/>
 
         <!-- Chrome, Firefox OS and Opera -->
-        <meta name="theme-color" content="#2e7d32" />
+        <meta name="theme-color" content="{{ theme.BROWSERCHROME }}" />
         <!-- Windows Phone -->
-        <meta name="msapplication-navbutton-color" content="#2e7d32">
+        <meta name="msapplication-navbutton-color" content="{{ theme.BROWSERCHROME }}">
         <!-- iOS Safari -->
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
+        <meta name="referrer" content="never">
+        <meta name="referrer" content="no-referrer">
+
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
         <link href='https://fonts.googleapis.com/css?family=Roboto+Mono&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
-        <link href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.7/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/>
-        <link href="{{ url_for('static', filename='css/digimarks.css') }}" type="text/css" rel="stylesheet" media="screen,projection"/>
-        <script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/>
+        <style>
+            a
+            {
+                color: {{ theme.LINK_TEXT }};
+            }
+            .card-content a
+            {
+                color: {{ theme.CARD_LINK }};
+            }
+            .chip a
+            {
+                color: {{ theme.CHIP_TEXT }};
+            }
+            /* label color */
+            .input-field .prefix ~ input, .input-field .prefix ~ textarea, .input-field .prefix ~ label, .input-field .prefix ~ .validate ~ label, .input-field .prefix ~ .autocomplete-content, .input-field input[type=text]
+            {
+                color: {{ theme.TEXTHEX }};
+            }
+            /* label focus color */
+            .input-field input[type=text]:focus + label,
+            .input-field .prefix ~ input[type=text]:focus + label
+            {
+                color: {{ theme.BUTTON }};
+            }
+            /* label underline focus color */
+            .input-field input[type=text]:focus,
+            .input-field .prefix ~ input[type=text]:focus,
+            .input-field input[type=text].autocomplete:focus
+            {
+                border-bottom: 1px solid {{ theme.BUTTON }};
+                box-shadow: 0 1px 0 0 {{ theme.BUTTON }};
+            }
+            /* icon prefix focus color */
+            .input-field .prefix.active
+            {
+                color: {{ theme.BUTTON }};
+            }
+            .btn, .btn:visited
+            {
+                background-color: {{ theme.BUTTON }};
+            }
+            .btn:hover, .btn:active
+            {
+                background-color: {{ theme.BUTTON_ACTIVE }};
+            }
+            .deletebtn
+            {
+                background-color: red;
+            }
+            .deletebtn:hover
+            {
+                background-color: #ef5350; /* red lighten-1 */
+            }
+        </style>
+        <link href="{{ url_for('static', filename='css/digimarks.css') }}?20180330" type="text/css" rel="stylesheet" media="screen,projection"/>
+{% if not sortmethod %}
+    {% set sortmethod = None %}
+{% endif %}
+{% if not show_as %}
+    {% set show_as = None %}
+{% endif %}
     </head>
-    <body class="grey lighten-4">
-        <nav class="green darken-3" role="navigation">
-            <div class="nav-wrapper container"><a id="logo-container" href="{% if userkey %}{{ url_for('bookmarks', userkey=userkey) }}{% else %}{{ url_for('index') }}{% endif %}" class="brand-logo">digimarks</a>
+    <body class="{{ theme.BODY }} {{ theme.TEXT }}">
+        <nav class="{{ theme.NAV }}" role="navigation">
+            <div class="nav-wrapper container"><a id="logo-container" href="{% if userkey %}{{ url_for('bookmarks_page', userkey=userkey, sortmethod=sortmethod, show_as=show_as) }}{% else %}{{ url_for('index') }}{% endif %}" class="brand-logo">digimarks</a>
                 <ul class="right hide-on-med-and-down">
                     {% if userkey %}
-                    <li><a href="{{ url_for('tags', userkey=userkey) }}">Tags</a></li>
-                    <li><a href="{{ url_for('addbookmark', userkey=userkey) }}">Add bookmark</a></li>
+                    <li><a href="{{ url_for('tags_page', userkey=userkey) }}" class="waves-effect waves-light btn"><i class="material-icons left">label</i>Tags</a></li>
+                    <li><a href="{{ url_for('addbookmark', userkey=userkey) }}" class="waves-effect waves-light btn"><i class="material-icons left">add</i>Add bookmark</a></li>
                     {% endif %}
                 </ul>
 
-                <ul id="nav-mobile" class="side-nav">
                 {% if userkey %}
-                    <li><a href="{{ url_for('tags', userkey=userkey) }}">Tags</a></li>
-                    <li><a href="{{ url_for('addbookmark', userkey=userkey) }}">Add bookmark</a></li>
-                    {% endif %}
+                <ul id="nav-mobile" class="sidenav">
+                    <li><a class="waves-effect" href="{{ url_for('bookmarks_page', userkey=userkey) }}"><i class="material-icons left">turned_in</i>Home</a></li>
+                    <li><a class="waves-effect" href="{{ url_for('tags_page', userkey=userkey) }}"><i class="material-icons left">label</i>Tags</a></li>
+                    <li><a class="waves-effect" href="{{ url_for('addbookmark', userkey=userkey) }}"><i class="material-icons left">add</i>Add bookmark</a></li>
                 </ul>
-                <a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a>
+                <a href="#" data-target="nav-mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
+                {% endif %}
             </div>
         </nav>
         <div class="section no-pad-bot" id="index-banner">
             <div class="container">
-                <div class="header grey-text lighten-5">
+                <div class="header {{ theme.PAGEHEADER }}">
                     <h1>{% block pageheader %}Bookmarks{% endblock %}</h1>
                 </div>
             </div>
@@ -55,8 +118,9 @@
         </div>
 
         <!-- Scripts -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.7/js/materialize.min.js"></script>
-        <script src="{{ url_for('static', filename='js/init.js') }}"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
+        <script src="{{ url_for('static', filename='js/init.js') }}?20180309"></script>
 
+        {% block extrajs %}{% endblock %}
     </body>
 </html>

templates/bookmarks.html

@@ -16,16 +16,16 @@
 
 {% if tag and publictag %}
 <div class="row">
-    <div class="col s12"><a href="{{ url_for('publictag', tagkey=publictag.tagkey) }}">Public link</a></div>
+    <div class="col s12"><a href="{{ url_for('publictag_page', tagkey=publictag.tagkey) }}">Public link</a></div>
 </div>
 {% endif %}
 
 {% if message %}
 <div class="row">
     <div class="col s12">
-        <div class="card-panel orange lighten-2">
-            <span class="white-text">
-                {{ message }}
+        <div class="card-panel {{ theme.MESSAGE_BACKGROUND }}">
+            <span class="{{ theme.MESSAGE_TEXT }}">
+                {{ message|safe }}
             </span>
         </div>
     </div>
@@ -33,95 +33,81 @@
 {% endif %}
 
 <div class="row">
-    <form action="{{ url_for('bookmarks', userkey=userkey) }}" method="POST">
-        <div class="input-field col l10 m10 s8">
-            <input placeholder="filter" type="text" name="filter" id="filter" value="{{ filter }}" class="validate" />
+    <form action="{{ url_for('bookmarks_page', userkey=userkey) }}" name="filterForm" method="POST" autocomplete="off">
+        <div class="input-field col l9 m9 s8">
+            <input placeholder="search text" type="text" name="filter_text" id="filter_text" class="autocomplete" value="{{ filter_text }}" autocomplete="false" />
         </div>
 
-        <div class="input-field col l2 m2 s4">
-            <p class="left-align"><button class="btn waves-effect waves-light" type="submit" name="submit">Filter</button></p>
+        <div class="input-field col l3 m3 s4">
+            <p class="right-align"><button class="btn waves-effect waves-light" type="submit" name="submitBtn" title="Find"><i class="material-icons">search</i></button>
+            {% if show_as and show_as == 'list' %}
+                <a href="{{ url_for('bookmarks_page', userkey=userkey, filtermethod=filtermethod, sortmethod=sortmethod, show_as=None) }}" class="waves-effect waves-light btn" title="Show as cards"><i class="material-icons">apps</i></a>
+            {% else %}
+                <a href="{{ url_for('bookmarks_page', userkey=userkey, filtermethod=filtermethod, sortmethod=sortmethod, show_as='list') }}" class="waves-effect waves-light btn" title="Show as list"><i class="material-icons">reorder</i></a>
+            {% endif %}
+            </p>
         </div>
     </form>
 </div>
 
 {% if tags %}
 <div class="row">
-    <p>
+    <div class="col s12">
+        <ul class="collapsible" data-collapsible="expandable">
+            <li>
+              <div class="collapsible-header"><i class="material-icons">label</i>Filter on star/problem/comment/tag</div>
+              <div class="collapsible-body" style="padding: 10px;">
+                <div class="chip">
+                    <a href="{{ url_for('bookmarks_page', userkey=userkey, filtermethod='starred') }}"><i class="tiny material-icons {{ theme.STAR }}">star</i></a>
+                </div>
+                <div class="chip">
+                    <a href="{{ url_for('bookmarks_page', userkey=userkey, filtermethod='broken') }}"><i class="tiny material-icons {{ theme.PROBLEM }}">report_problem</i></a>
+                </div>
+                <div class="chip">
+                    <a href="{{ url_for('bookmarks_page', userkey=userkey, filtermethod='note') }}"><i class="tiny material-icons {{ theme.COMMENT }}">comment</i></a>
+                </div>
                 {% for tag in tags %}
                 <div class="chip">
-        <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>
+                    <a href="{{ url_for('tag_page', userkey=userkey, tag=tag) }}">{{ tag }}</a>
                 </div>
                 {% endfor %}
-    </p>
+            </li>
+        </ul>
+    </div>
 </div>
 {% endif %}
 
-<div class="row">
-    {% for bookmark in bookmarks %}
-    <div class="col s12 m6 l4">
-        {#
-        <div class="thumbnail">
-            <a href="{{ bookmark.url }}" title="{{ bookmark.url }}">
-                <img style="width:450px;" src="{{ bookmark.image }}" />
-            </a>
-            <p><a href="{{ bookmark.url }}">{{ bookmark.url|urlize(25) }}</a></p>
-            <p>{{ bookmark.created_date.strftime("%m/%d/%Y %H:%M") }}</p>
-        </div>
-        #}
-        <div class="card tiny green darken-3">
-            <div class="card-content white-text">
-                <span class="digimark-card-header activator">
-                    {% for tag in bookmark.tags_list %}
-                        <div class="chip">
-                            <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>
-                        </div>
-                    {% endfor %}
-                    <i class="material-icons right">more_vert</i>
-                </span>
-                    <div class="valign-wrapper digimark-card-content">
-                    <div class="valign">
-                        {% if bookmark.http_status != 200 %}
-                            <i class="tiny material-icons" title="HTTP status {{ bookmark.http_status }}">report_problem</i>
-                        {% endif %}
-                        {% if bookmark.favicon %}
-                            <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" />&nbsp;
-                        {% endif %}
-                        <a href="{{ bookmark.url }}" title="{{ bookmark.url }}" rel="noreferrer">
-                        {% if bookmark.starred == True %}
-                            <i class="tiny material-icons yellow-text">star</i>
-                        {% endif %}
-                        {% if bookmark.title %}
-                            {{ bookmark.title }}
+{% if show_as and show_as == 'list' %}
+    {% include 'list.html' %}
 {% else %}
-                            [ no title ]
+    {% include 'cards.html' %}
 {% endif %}
-                    </a></div>
-                    </div>
-            </div>
-            <div class="card-reveal green darken-3">
-                <span class="card-title white-text valign-wrapper">Added @ {{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}<i class="material-icons right">close</i></span>
-                <div class="white-text valign">
-                {% if bookmark.favicon %}
-                    <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" />&nbsp;&nbsp;&nbsp;
-                {% endif %}
-                <a href="{{ url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" style="padding: 3px"><i class="tiny material-icons">mode_edit</i> EDIT</a>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% endfor %}
 
-    {#
-    <div class="pagination">
-        {% if page > 1 %}<a href="./?page={{ page - 1 }}">Previous</a>{% endif %}
-        {% if pagination.get_pages() > page %}<a href="./?page={{ page + 1 }}">Next</a>{% endif %}
-    </div>
-    #}
-</div>
-
-<div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
-    <a class="btn-floating btn-large red" href="{{ url_for('addbookmark', userkey=userkey) }}">
+<div class="fixed-action-btn" style="bottom: 20px; right: 20px;">
+    <a class="btn-floating btn-large {{ theme.FAB }}" href="{{ url_for('addbookmark', userkey=userkey) }}">
       <i class="large material-icons">add</i>
     </a>
 </div>
 {% endblock %}
+{% block extrajs %}
+<script>
+    function submitFilter() {
+        document.filterForm.submit();
+    }
+    /* Search filter autocomplete */
+    var options = {
+        onAutocomplete: submitFilter,
+        minLength: 3,
+        limit: 10,
+        data: {
+        },
+    }
+    var elem = document.querySelector('.autocomplete');
+    var instance = M.Autocomplete.init(elem, options);
+    /* TODO: fetch from API
+    instance.updateData({
+    });
+    */
+</script>
+<script src="{{ url_for('bookmarks_js', userkey=userkey) }}" ></script>
+{% endblock %}

templates/bookmarks.js

@@ -0,0 +1,11 @@
+var elem = document.querySelector('.autocomplete');
+var instance = M.Autocomplete.getInstance(elem);
+instance.updateData({
+    {% for bookmark in bookmarks %}
+        {% if bookmark.favicon %}
+            "{{ bookmark.title | replace('"', '\\"') | replace('\n', '') | replace('\r', '') }}": "{{ url_for('static', filename='favicons/' + bookmark.favicon) }}",
+        {% else %}
+            "{{ bookmark.title | replace('"', '\\"') | replace('\n', '') | replace('\r', '') }}": null,
+        {% endif %}
+    {% endfor %}
+});

templates/cards.html

@@ -0,0 +1,65 @@
+<div class="row">
+    {% for bookmark in bookmarks %}
+    <div class="col s12 m6 l4">
+        <div class="card horizontal tiny {{ theme.CARD_BACKGROUND }}">
+            <div class="card-image">
+                {% if bookmark.favicon %}
+                    <div><img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" class="favicon" /></div>
+                {% else %}
+                    <div><img src="{{ url_for('static', filename='faviconfallback.png') }}" class="favicon" /></div>
+                {% endif %}
+                {% if bookmark.http_status != 200 and bookmark.http_status != 304 %}
+                    <div><i class="small material-icons {{ theme.PROBLEM }}" title="HTTP status {{ bookmark.http_status }}">report_problem</i></div>
+                {% endif %}
+                {% if bookmark.starred == True %}
+                    <div><i class="small material-icons {{ theme.STAR }}">star</i></div>
+                {% endif %}
+                {% if bookmark.note %}
+                    <div><i class="small material-icons {{ theme.CARD_TEXT }}" title="{{ bookmark.note|truncate(100) }}">comment</i></div>
+                {% endif %}
+            </div>
+            <div class="card-stacked">
+                <div class="card-content {{ theme.CARD_TEXT }}">
+                    <span class="digimark-card-header activator">
+                        <i class="material-icons right">more_vert</i>
+                    </span>
+                    <div class="digimark-card-content">
+                        <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>
+                    </div>
+                </div>
+            </div>
+            <div class="card-reveal {{ theme.CARD_BACKGROUND }}">
+                <span class="card-title {{ theme.CARD_TEXT }}">Added @ {{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}<i class="material-icons right">close</i></span>
+                {% if editable %}
+                <div class="{{ theme.CARD_TEXT }}" style="padding-top: 10px;">
+                <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>
+                </div>
+                {% endif %}
+                {% if showtags %}
+                <div class="digimark-card-header-tags">
+                {% for tag in bookmark.tags_list %}
+                    <div class="chip">
+                        <a href="{{ url_for('tag_page', userkey=userkey, tag=tag) }}">{{ tag }}</a>
+                    </div>
+                {% endfor %}
+                </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+
+    {#
+    <div class="pagination">
+        {% if page > 1 %}<a href="./?page={{ page - 1 }}">Previous</a>{% endif %}
+        {% if pagination.get_pages() > page %}<a href="./?page={{ page + 1 }}">Next</a>{% endif %}
+    </div>
+    #}
+</div>

templates/edit.html

@@ -3,13 +3,19 @@
 {% block pageheader %}{{ action }}{% endblock %}
 {% block pagecontent %}
 
-{% if bookmark.http_status != 200 %}
+{% if bookmark.http_status != 200 and bookmark.http_status != 202 and bookmark.http_status != 304 %}
 <div class="row">
     <div class="col s12">
-        <div class="card-panel red darken-1">
-            <span class="white-text">
+        <div class="card-panel {{ theme.ERRORMESSAGE_BACKGROUND }}">
+            <span class="{{ theme.ERRORMESSAGE_TEXT }}">
                 {% if bookmark.http_status == 404 %}
                 <i class="material-icons">report_problem</i>&nbsp;&nbsp;URL not found (404), broken/outdated link?
+                {% elif bookmark.http_status == 301 %}
+                <i class="material-icons">report_problem</i>&nbsp;&nbsp;HTTP status (301), moved permanently. Use button for new target
+                {% elif bookmark.http_status == 302 %}
+                <i class="material-icons">report_problem</i>&nbsp;&nbsp;HTTP status (302), moved temporarily. Use button for new target
+                {% elif bookmark.http_status == bookmark.HTTP_CONNECTIONERROR %}
+                <i class="material-icons">report_problem</i>&nbsp;&nbsp;Connection error, server might have been offline at the time of last edit
                 {% else %}
                 <i class="material-icons">report_problem</i>&nbsp;&nbsp;HTTP status {{ bookmark.http_status }}
                 {% endif %}
@@ -22,8 +28,8 @@
 {% if message %}
 <div class="row">
     <div class="col s12">
-        <div class="card-panel orange lighten-2">
-            <span class="white-text">
+        <div class="card-panel {{ theme.MESSAGE_BACKGROUND }}">
+            <span class="{{ theme.MESSAGE_TEXT }}">
                 {{ message }}
             </span>
         </div>
@@ -32,63 +38,81 @@
 {% endif %}
 
 {% if formaction and formaction == 'edit' %}
-    <form action="{{ url_for('editingbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" method="POST">
+<form class="digimark" id="digimark" action="{{ url_for('editingbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" method="POST" onsubmit="return onSubmitForm();" autocomplete="off">
 {% else %}
-    <form action="{{ url_for('addingbookmark', userkey=userkey) }}" method="POST">
+<form class="digimark" id="digimark" action="{{ url_for('addingbookmark', userkey=userkey) }}" method="POST" onsubmit="return onSubmitForm();" autocomplete="off">
 {% endif %}
 
     <div class="row">
-
         <div class="input-field col s12">
             <i class="material-icons prefix">description</i>
-            <input placeholder="title" type="text" name="title" id="title" value="{{ bookmark.title }}" class="validate" />
+            <input placeholder="title (leave empty for autofetch)" type="text" name="title" id="title" value="{{ bookmark.title }}" autocomplete="false" />
             <label for="title">Title</label>
+{#            <span class="helper-text">Leave title empty for autofetching from the page</span>#}
         </div>
 
         <div class="input-field col s12">
             <i class="material-icons prefix">turned_in</i>
-            <input placeholder="url" type="text" name="url" id="url" value="{{ bookmark.url }}" class="validate" />
+            <input placeholder="url" type="text" name="url" id="url" value="{{ bookmark.url }}" autocomplete="false" />
             <label for="url">URL</label>
+            {% if bookmark.get_redirect_uri() %}
+            <div>
+                <a class="waves-effect waves-light btn" id="btn_urlupdate" onclick="updateURL()"><i class="material-icons left">turned_in</i>{{ bookmark.get_redirect_uri() }}</a>
+            </div>
+            <script type="text/javascript">
+            function updateURL() {
+                var text = document.getElementById('url');
+                text.value = '{{ bookmark.get_redirect_uri() }}';
+            }
+            </script>
+            {% endif %}
+        </div>
+
+        <div class="input-field col s12">
+            <i class="material-icons prefix">comment</i>
+            <input placeholder="note" type="text" name="note" id="note" value="{{ bookmark.note }}" autocomplete="false" />
+            <label for="note">Note</label>
         </div>
 
         <div class="input-field col s12">
             <i class="material-icons prefix">label</i>
-            <input placeholder="tags, divided by comma's" type="text" name="tags" id="tags" value="{{ bookmark.tags }}" class="validate" />
+            <input placeholder="tags, divided by comma's" type="text" name="tags" id="tags" value="{{ bookmark.tags }}" autocomplete="false" />
             <label for="tags">Tags</label>
         </div>
     </div>
     {% if tags %}
     <div class="row">
         <div class="col s12">
+            <ul class="collapsible" data-collapsible="expandable">
+                <li>
+                  <div class="collapsible-header"><i class="material-icons">label</i>Existing tags</div>
+                  <div class="collapsible-body" style="padding: 10px;">
                     {% for tag in tags %}
-            <div class="chip" id="tag_{{ tag }}">
+                    <div class="chip clickable" id="chip_{{ tag }}" onclick="addTag('{{ tag }}');">
                         {{ tag }}
                     </div>
                     {% endfor %}
                   </div>
-        {% for tag in tags %}
-        <script type="text/javascript">
-        $(function () {
-            $('#tag_{{ tag }}').on('click', function () {
-                var text = $('#tags');
-                text.val(text.val() + ', {{ tag }}');
-            });
-        });
-        </script>
-        {% endfor %}
+                </li>
+            </ul>
+        </div>
     </div>
     {% endif %}
     <div class="row">
 
-        <div class="input-field col s12">
+        <div class="col s12">
             {#<i class="material-icons prefix">star</i>#}
+            <label>
                 <input type="checkbox" name="starred" id="starred" {% if bookmark.starred == True %}checked{% endif %} />
-            <label for="starred">Starred</label>
+                <span>Starred</span>
+            </label>
         </div>
 
-        <div class="input-field col s12">
+        <div class="col s12">
+            <label>
                 <input type="checkbox" name="strip" id="strip" />
-            <label for="strip">Strip parameters from url (like <em>?utm_source=social</em> - can break the link!)</label>
+                <span>Strip parameters from url (like <em>?utm_source=social</em> - can break the link!)</span>
+            </label>
         </div>
 
     {% if bookmark.url_hash %}
@@ -119,15 +143,33 @@
     {% endif %}
 
         <div class="input-field col l2 m3 s4">
-            <p class="left-align"><button class="btn waves-effect waves-light" type="submit" name="submit">Save <i class="material-icons right">send</i></button></p>
+            <p class="left-align"><button class="btn waves-effect waves-light" type="submit" name="submit" id="submit">Save <i class="material-icons right">send</i></button></p>
         </div>
-    </form>
     {% if bookmark.url_hash %}
-        <div class="input-field col l2 m3 s4">
+</form>
+        <div class="input-field col l4 m4 s6">
         <form action="{{ url_for('deletingbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" method="POST">
-            <p class="left-align"><button class="btn waves-effect waves-light" type="submit" name="delete">Delete <i class="material-icons right">delete</i></button></p>
+            <p class="left-align"><button class="btn waves-effect waves-light deletebtn" type="submit" name="delete">Delete <i class="material-icons right">delete</i></button></p>
         </form>
         </div>
-    {% endif %}
     </div>
+    {% else %}
+    </div>
+</form>
+    {% endif %}
+
+<script>
+function onSubmitForm()
+{
+    var theForm = document.getElementById('digimark');
+    var submitButton = document.getElementById('submit');
+    theForm.onsubmit = submitButton.setAttribute("disabled", true);
+    return true;
+}
+function addTag(tagText)
+{
+    var text = document.getElementById('tags');
+    text.value = text.value + ', ' + tagText;
+}
+</script>
 {% endblock %}

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 class="list-image">
+                {% 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) }}" class="waves-effect waves-light btn" title="Edit"><i class="tiny material-icons">mode_edit</i></a>
+                    <a href="{{ url_for('deletingbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" class="waves-effect waves-light btn red" title="DELETE"><i class="tiny material-icons">delete</i></a>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+</div>

templates/publicbookmarks.html

@@ -19,38 +19,11 @@
 {% endif %}
 
 <div class="row">
-    {% for bookmark in bookmarks %}
-    <div class="col s12 m6 l4">
-        <div class="card green darken-3">
-            <div class="card-content white-text">
-                <span class="card-title activator"><i class="material-icons right">more_vert</i></span>
-                    {% if bookmark.http_status != 200 %}
-                        <i class="material-icons" title="HTTP status {{ bookmark.http_status }}">report_problem</i>
-                    {% endif %}
-                    {% if bookmark.favicon %}
-                        <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" />&nbsp;&nbsp;&nbsp;
-                    {% endif %}
-                    <p><a href="{{ bookmark.url }}" title="{{ bookmark.url }}" rel="noreferrer">
-                        {% if bookmark.starred == True %}
-                            <i class="material-icons">star</i>
-                        {% endif %}
-                        {% if bookmark.title %}
-                            {{ bookmark.title }}
-                        {% else %}
-                            [ no title ]
-                        {% endif %}
-                    </a></p>
-            </div>
-            <div class="card-reveal green darken-3">
-                <span class="card-title white-text">Added @ {{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}<i class="material-icons right">close</i></span>
-                <div class="white-text">
-                {% if bookmark.favicon %}
-                    <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" />&nbsp;&nbsp;&nbsp;
-                {% endif %}
+    <div class="col s12">
+        <a href="{{ url_for('publictag_feed', tagkey=tagkey) }}"><i class="material-icons tiny">rss_feed</i> feed</a>
     </div>
 </div>
-        </div>
-    </div>
-    {% endfor %}
-</div>
+
+{% include 'cards.html' %}
+
 {% endblock %}

templates/redirect.html

@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Redirecting - digimarks</title>
+        <meta name="referrer" content="never">
+        <meta name="robots" content="noindex, nofollow">
+        <meta http-equiv=refresh content="3; URL={{ url }}">
+        <style>
+            body { background-color: #000; color: #FFF; }
+            a { color: #fb8c00; }
+        </style>
+    </head>
+    <body>
+        <p>You're being redirected. If nothing happens, <a href="{{ url }}">click here instead</a>.</p>
+    </body>
+</html>

templates/tags.html

@@ -4,11 +4,62 @@
 {% block pagecontent %}
 <div class="row">
 
-    {% for tag in tags %}
-    <div class="chip">
-        <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>
-    </div>
-    {% endfor %}
+    <div class="col s12">
+    <table class="centered">
+        <thead>
+            <tr>
+                <th><i class="material-icons" title="Unique labels">label</i></th>
+                <th><i class="material-icons green-text" title="Public tag pages">present_to_all</i></th>
+                <th><i class="material-icons" title="Total bookmarks">turned_in</i></th>
+                <th><i class="material-icons" title="Bookmarks with notes">comment</i></th>
+                <th><i class="material-icons yellow-text" title="Starred bookmarks">star</i></th>
+                <th><i class="material-icons orange-text" title="HTTP status is not 200 OK">warning</i></th>
+                <th><i class="material-icons red-text" title="Deleted bookmarks">delete</i></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>{{ totaltags }}</td>
+                <td>{{ totalpublic }}</td>
+                <td>{{ totalbookmarks }}</td>
+                <td>{{ totalnotes }}</td>
+                <td>{{ totalstarred }}</td>
+                <td>{{ totalhttperrorstatus }}</td>
+                <td>{{ totaldeleted }}</td>
+            </tr>
+        </tbody>
+    </table>
 
+    <br /><br />
+
+    <table>
+        <thead>
+            <tr>
+                <th>Tag</th>
+                <th>Public link</th>
+                <th>Number of bookmarks</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for tag in tags %}
+            <tr>
+                <td>
+                    <a href="{{ url_for('tag_page', userkey=userkey, tag=tag['tag']) }}">{{ tag['tag'] }}</a>
+                </td>
+                <td>
+                    {% if tag['publictag'] %}
+                        <a href="{{ url_for('publictag_page', tagkey=tag['publictag'].tagkey) }}">Public link</a> (<a href="{{ url_for('removepublictag', tag=tag['tag'], tagkey=tag['publictag'].tagkey, userkey=userkey) }}">Delete</a> <i class="tiny material-icons red-text">warning</i>)
+                    {% else %}
+                        <a href="{{ url_for('addpublictag', userkey=userkey, tag=tag['tag']) }}">Create</a>
+                    {% endif %}
+                </td>
+                <td>
+                    {{ tag['total'] }}
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+    </div>
 </div>
 {% endblock %}

wsgi.py

@@ -1,7 +1,13 @@
 # Activate virtualenv
 import settings
-activate_this = settings.VENV
-execfile(activate_this, dict(__file__=activate_this))
+activate_this = getattr(settings, 'VENV', None)
+# FIXME: python 2 *and* python 3 compatibility
+# Python 2
+#if activate_this:
+#    execfile(activate_this, dict(__file__=activate_this))
+# Python 3
+with open(activate_this) as file_:
+    exec(file_.read(), dict(__file__=activate_this))
 
 from digimarks import app as application