-
- {{ form.url|add_class:"form-input"|attr:"autofocus"|attr:"placeholder: " }}
- {% if form.url.errors %}
-
-
- {{ form.url.errors }}
-
- {% endif %}
-
- This URL is already bookmarked. You can edit it or you can overwrite the existing bookmark
- by saving this form.
-
-
-
- {{ form.tag_string|add_class:"form-input"|attr:"autocomplete:off" }}
-
-
-
- Enter any number of tags separated by space and without the hash (#). If a tag does not
- exist it will be
- automatically created.
-
- {{ form.tag_string.errors }}
-
-
-
-
-
- Optional, leave empty to use description from website.
-
- {{ form.description.errors }}
-
-
+ {% csrf_token %}
+ {{ form.website_title }}
+ {{ form.website_description }}
+ {{ form.auto_close|attr:"type:hidden" }}
+
-
+
diff --git a/bookmarks/templates/bookmarks/index.html b/bookmarks/templates/bookmarks/index.html
index 248f2e7..3f69df1 100644
--- a/bookmarks/templates/bookmarks/index.html
+++ b/bookmarks/templates/bookmarks/index.html
@@ -5,42 +5,42 @@
{% block content %}
- {% include 'bookmarks/bulk_edit/state.html' %}
+ {% include 'bookmarks/bulk_edit/state.html' %}
-
+
+ {{ form.url|add_class:"form-input"|attr:"autofocus"|attr:"placeholder: " }}
+ {% if form.url.errors %}
- {% if request.user.profile.enable_sharing %}
-
- Unread bookmarks can be filtered for, and marked as read after you had a chance to look at them.
-
-
-
-
{% endif %}
-
- Share this bookmark with other users.
-
+ {{ form.url.errors }}
-
- {% if auto_close %}
-
- {% else %}
-
- {% endif %}
- Nevermind
+
+
+ This URL is already bookmarked. You can edit it or you can overwrite the existing bookmark
+ by saving this form.
+
+
+ {{ form.tag_string|add_class:"form-input"|attr:"autocomplete:off" }}
+
+
+
+ Enter any number of tags separated by space and without the hash (#). If a tag does not
+ exist it will be
+ automatically created.
+
+ {{ form.tag_string.errors }}
+
+
+
+
+
+ Optional, leave empty to use description from website.
+
+ {{ form.description.errors }}
+
+
+
+ {% if request.user.profile.enable_sharing %}
+
+ Unread bookmarks can be filtered for, and marked as read after you had a chance to look at them.
+
+
+
+
+ {% endif %}
+
+ Share this bookmark with other users.
+
+ +
+ {% if auto_close %}
+
+ {% else %}
+
+ {% endif %}
+ Nevermind
+
- {# Replace tag input with auto-complete component #}
-
-
+
+
-
+ setupEditAutoValueButton(titleInput);
+ setupEditAutoValueButton(descriptionInput);
+ })();
+
+
-
-
-
+
+
+
{% endblock %}
diff --git a/bookmarks/templates/bookmarks/layout.html b/bookmarks/templates/bookmarks/layout.html
index f2be882..90fbb78 100644
--- a/bookmarks/templates/bookmarks/layout.html
+++ b/bookmarks/templates/bookmarks/layout.html
@@ -5,61 +5,61 @@
{# Use data attributes as storage for access in static scripts #}
-
-
-
-
-
-
-
-
- {# Bookmark list #}
-
-
+
+ {% if empty %}
+ {% include 'bookmarks/empty_bookmarks.html' %}
+ {% else %}
+ {% bookmark_list bookmarks return_url link_target %}
+ {% endif %}
+
+
- {# Tag list #}
-
-
+ {# Tag list #}
+
+
-
+ {# Bookmark list #}
+ Bookmarks
- - {% bookmark_search filters tags %} - {% include 'bookmarks/bulk_edit/toggle.html' %} -
+
-
- Bookmarks
+ + {% bookmark_search filters tags %} + {% include 'bookmarks/bulk_edit/toggle.html' %} +
+
+
+ 
+
+ {# Only show nav items menu when logged in #}
+ {% if request.user.is_authenticated %}
+
{% endif %}
-
+ linkding
+ +
-
-
-
-
- {# Only show nav items menu when logged in #}
- {% if request.user.is_authenticated %}
-
- {% endif %}
-
+
- linkding
- -
- {% block content %}
- {% endblock %}
+ {% block content %}
+ {% endblock %}
diff --git a/bookmarks/templates/bookmarks/nav_menu.html b/bookmarks/templates/bookmarks/nav_menu.html
index b7dfe85..88d895d 100644
--- a/bookmarks/templates/bookmarks/nav_menu.html
+++ b/bookmarks/templates/bookmarks/nav_menu.html
@@ -1,93 +1,101 @@
+{% load shared %}
+{% htmlmin %}
{# Basic menu list #}
{# Menu drop-down for smaller devices #}
+{% endhtmlmin %}
diff --git a/bookmarks/templates/bookmarks/new.html b/bookmarks/templates/bookmarks/new.html
index 62d0144..1166e1b 100644
--- a/bookmarks/templates/bookmarks/new.html
+++ b/bookmarks/templates/bookmarks/new.html
@@ -2,14 +2,14 @@
{% load bookmarks %}
{% block content %}
-
-
-
-
+
-
-
- New bookmark
-
+
+
+
{% endblock %}
diff --git a/bookmarks/templates/bookmarks/pagination.html b/bookmarks/templates/bookmarks/pagination.html
index c7b94f1..59f853e 100644
--- a/bookmarks/templates/bookmarks/pagination.html
+++ b/bookmarks/templates/bookmarks/pagination.html
@@ -1,35 +1,35 @@
{% load shared %}
+
+
+ New bookmark
+-
- {% if page.has_previous %}
-
- - Previous - - {% else %} -
- - Previous - - {% endif %} + {% if page.has_previous %} +
- + Previous + + {% else %} +
- + Previous + + {% endif %} - {% for page_number in visible_page_numbers %} - {% if page_number >= 0 %} -
- - {{ page_number }} - - {% else %} -
- - ... - - {% endif %} - {% endfor %} - - {% if page.has_next %} -
- - Next - + {% for page_number in visible_page_numbers %} + {% if page_number >= 0 %} +
- + {{ page_number }} + {% else %} -
- - Next - +
- + ... + {% endif %} + {% endfor %} + + {% if page.has_next %} +
- + Next + + {% else %} +
- + Next + + {% endif %}
-
{# Replace search input with auto-complete component #}
\ No newline at end of file
diff --git a/bookmarks/templates/bookmarks/shared.html b/bookmarks/templates/bookmarks/shared.html
index 3fa0d4c..ebcffd4 100644
--- a/bookmarks/templates/bookmarks/shared.html
+++ b/bookmarks/templates/bookmarks/shared.html
@@ -5,44 +5,44 @@
{% block content %}
-
+
-
-
+
+
{% endblock %}
diff --git a/bookmarks/templates/bookmarks/tag_cloud.html b/bookmarks/templates/bookmarks/tag_cloud.html
index 579d2b5..921f0a9 100644
--- a/bookmarks/templates/bookmarks/tag_cloud.html
+++ b/bookmarks/templates/bookmarks/tag_cloud.html
@@ -1,35 +1,37 @@
{% load shared %}
-
-
- {# Bookmark list #}
-
-
+
+ {% if empty %}
+ {% include 'bookmarks/empty_bookmarks.html' %}
+ {% else %}
+ {% bookmark_list bookmarks return_url link_target %}
+ {% endif %}
+
+
- {# Filters #}
-
-
+ {# Filters #}
+
+
-
+ {# Bookmark list #}
+ Shared bookmarks
- - {% bookmark_search filters tags mode='shared' %} -
+
-
- Shared bookmarks
+ + {% bookmark_search filters tags mode='shared' %} +
+{% htmlmin %}
+
+{% endhtmlmin %}
diff --git a/bookmarks/templatetags/shared.py b/bookmarks/templatetags/shared.py
index 9e136db..e8b3857 100644
--- a/bookmarks/templatetags/shared.py
+++ b/bookmarks/templatetags/shared.py
@@ -1,3 +1,5 @@
+import re
+
from django import template
from bookmarks import utils
@@ -48,6 +50,7 @@ def remove_from_query_param(context, **kwargs):
return query.urlencode()
+
@register.simple_tag(takes_context=True)
def replace_query_param(context, **kwargs):
query = context.request.GET.copy()
@@ -87,3 +90,22 @@ def humanize_relative_date(value):
if value in (None, ''):
return ''
return utils.humanize_relative_date(value)
+
+
+@register.tag
+def htmlmin(parser, token):
+ nodelist = parser.parse(('endhtmlmin',))
+ parser.delete_first_token()
+ return HtmlMinNode(nodelist)
+
+
+class HtmlMinNode(template.Node):
+ def __init__(self, nodelist):
+ self.nodelist = nodelist
+
+ def render(self, context):
+ output = self.nodelist.render(context)
+
+ output = re.sub(r'\s+', ' ', output)
+
+ return output
{% if has_selected_tags %}
-
+
{% endif %}
-
+