From 65f375944406438b10af281668902ceec412cac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= Date: Mon, 5 Jan 2026 05:33:59 +0100 Subject: [PATCH 1/5] Align form usages in templates (#1267) --- bookmarks/forms.py | 200 +++++++++++- .../frontend/components/tag-autocomplete.js | 3 +- bookmarks/frontend/utils/element.js | 8 +- bookmarks/models.py | 110 ------- bookmarks/settings/base.py | 1 - bookmarks/styles/theme/autocomplete.css | 9 + bookmarks/styles/theme/forms.css | 4 + bookmarks/templates/bookmarks/form.html | 61 ++-- bookmarks/templates/bookmarks/search.html | 4 +- .../templates/bookmarks/user_section.html | 4 +- bookmarks/templates/bundles/edit.html | 1 - bookmarks/templates/bundles/form.html | 55 ++-- bookmarks/templates/bundles/new.html | 1 - .../registration_complete.html | 1 - .../registration_form.html | 9 +- bookmarks/templates/registration/login.html | 14 +- .../registration/password_change_done.html | 1 - .../registration/password_change_form.html | 26 +- bookmarks/templates/settings/general.html | 293 +++++++----------- bookmarks/templates/shared/error_list.html | 2 +- bookmarks/templates/tags/form.html | 14 +- bookmarks/templates/tags/merge.html | 32 +- bookmarks/templatetags/bookmarks.py | 6 +- bookmarks/templatetags/shared.py | 67 +++- bookmarks/tests/test_bookmark_edit_view.py | 2 +- bookmarks/tests/test_bookmark_new_view.py | 2 +- bookmarks/tests/test_bookmark_search_form.py | 3 +- bookmarks/tests/test_bundles_edit_view.py | 14 +- bookmarks/tests/test_settings_general_view.py | 8 +- bookmarks/tests/test_tags_merge_view.py | 10 + bookmarks/urls.py | 10 +- bookmarks/views/auth.py | 12 + bookmarks/views/bundles.py | 3 +- bookmarks/views/contexts.py | 2 +- bookmarks/views/settings.py | 10 +- bookmarks/widgets.py | 83 +++++ pyproject.toml | 2 +- uv.lock | 11 - 38 files changed, 608 insertions(+), 490 deletions(-) create mode 100644 bookmarks/widgets.py diff --git a/bookmarks/forms.py b/bookmarks/forms.py index da58d0adf..d5dd0320d 100644 --- a/bookmarks/forms.py +++ b/bookmarks/forms.py @@ -1,10 +1,15 @@ from django import forms -from django.forms.utils import ErrorList +from django.contrib.auth.models import User +from django.db import models from django.utils import timezone from bookmarks.models import ( Bookmark, + BookmarkBundle, + BookmarkSearch, + GlobalSettings, Tag, + UserProfile, build_tag_string, parse_tag_string, sanitize_tag_name, @@ -12,23 +17,29 @@ from bookmarks.services.bookmarks import create_bookmark, update_bookmark from bookmarks.type_defs import HttpRequest from bookmarks.validators import BookmarkURLValidator - - -class CustomErrorList(ErrorList): - template_name = "shared/error_list.html" +from bookmarks.widgets import ( + FormCheckbox, + FormErrorList, + FormInput, + FormNumberInput, + FormSelect, + FormTextarea, + TagAutocomplete, +) class BookmarkForm(forms.ModelForm): # Use URLField for URL - url = forms.CharField(validators=[BookmarkURLValidator()]) - tag_string = forms.CharField(required=False) + url = forms.CharField(validators=[BookmarkURLValidator()], widget=FormInput) + tag_string = forms.CharField(required=False, widget=TagAutocomplete) # Do not require title and description as they may be empty - title = forms.CharField(max_length=512, required=False) - description = forms.CharField(required=False, widget=forms.Textarea()) - unread = forms.BooleanField(required=False) - shared = forms.BooleanField(required=False) + title = forms.CharField(max_length=512, required=False, widget=FormInput) + description = forms.CharField(required=False, widget=FormTextarea) + notes = forms.CharField(required=False, widget=FormTextarea) + unread = forms.BooleanField(required=False, widget=FormCheckbox) + shared = forms.BooleanField(required=False, widget=FormCheckbox) # Hidden field that determines whether to close window/tab after saving the bookmark - auto_close = forms.CharField(required=False) + auto_close = forms.CharField(required=False, widget=forms.HiddenInput) class Meta: model = Bookmark @@ -62,7 +73,7 @@ def __init__(self, request: HttpRequest, instance: Bookmark = None): initial = {"tag_string": build_tag_string(instance.tag_names, " ")} data = request.POST if request.method == "POST" else None super().__init__( - data, instance=instance, initial=initial, error_class=CustomErrorList + data, instance=instance, initial=initial, error_class=FormErrorList ) @property @@ -111,12 +122,14 @@ def convert_tag_string(tag_string: str): class TagForm(forms.ModelForm): + name = forms.CharField(widget=FormInput) + class Meta: model = Tag fields = ["name"] def __init__(self, user, *args, **kwargs): - super().__init__(*args, **kwargs, error_class=CustomErrorList) + super().__init__(*args, **kwargs, error_class=FormErrorList) self.user = user def clean_name(self): @@ -146,11 +159,11 @@ def save(self, commit=True): class TagMergeForm(forms.Form): - target_tag = forms.CharField() - merge_tags = forms.CharField() + target_tag = forms.CharField(widget=TagAutocomplete) + merge_tags = forms.CharField(widget=TagAutocomplete) def __init__(self, user, *args, **kwargs): - super().__init__(*args, **kwargs, error_class=CustomErrorList) + super().__init__(*args, **kwargs, error_class=FormErrorList) self.user = user def clean_target_tag(self): @@ -197,3 +210,156 @@ def clean_merge_tags(self): ) return merge_tags + + +class BookmarkBundleForm(forms.ModelForm): + name = forms.CharField(max_length=256, widget=FormInput) + search = forms.CharField(max_length=256, required=False, widget=FormInput) + any_tags = forms.CharField(required=False, widget=TagAutocomplete) + all_tags = forms.CharField(required=False, widget=TagAutocomplete) + excluded_tags = forms.CharField(required=False, widget=TagAutocomplete) + + class Meta: + model = BookmarkBundle + fields = ["name", "search", "any_tags", "all_tags", "excluded_tags"] + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs, error_class=FormErrorList) + + +class BookmarkSearchForm(forms.Form): + SORT_CHOICES = [ + (BookmarkSearch.SORT_ADDED_ASC, "Added ↑"), + (BookmarkSearch.SORT_ADDED_DESC, "Added ↓"), + (BookmarkSearch.SORT_TITLE_ASC, "Title ↑"), + (BookmarkSearch.SORT_TITLE_DESC, "Title ↓"), + ] + FILTER_SHARED_CHOICES = [ + (BookmarkSearch.FILTER_SHARED_OFF, "Off"), + (BookmarkSearch.FILTER_SHARED_SHARED, "Shared"), + (BookmarkSearch.FILTER_SHARED_UNSHARED, "Unshared"), + ] + FILTER_UNREAD_CHOICES = [ + (BookmarkSearch.FILTER_UNREAD_OFF, "Off"), + (BookmarkSearch.FILTER_UNREAD_YES, "Unread"), + (BookmarkSearch.FILTER_UNREAD_NO, "Read"), + ] + + q = forms.CharField() + user = forms.ChoiceField(required=False, widget=FormSelect) + bundle = forms.CharField(required=False) + sort = forms.ChoiceField(choices=SORT_CHOICES, widget=FormSelect) + shared = forms.ChoiceField(choices=FILTER_SHARED_CHOICES, widget=forms.RadioSelect) + unread = forms.ChoiceField(choices=FILTER_UNREAD_CHOICES, widget=forms.RadioSelect) + modified_since = forms.CharField(required=False) + added_since = forms.CharField(required=False) + + def __init__( + self, + search: BookmarkSearch, + editable_fields: list[str] = None, + users: list[User] = None, + ): + super().__init__() + editable_fields = editable_fields or [] + self.editable_fields = editable_fields + + # set choices for user field if users are provided + if users: + user_choices = [(user.username, user.username) for user in users] + user_choices.insert(0, ("", "Everyone")) + self.fields["user"].choices = user_choices + + for param in search.params: + # set initial values for modified params + value = search.__dict__.get(param) + if isinstance(value, models.Model): + self.fields[param].initial = value.id + else: + self.fields[param].initial = value + + # Mark non-editable modified fields as hidden. That way, templates + # rendering a form can just loop over hidden_fields to ensure that + # all necessary search options are kept when submitting the form. + if search.is_modified(param) and param not in editable_fields: + self.fields[param].widget = forms.HiddenInput() + + +class UserProfileForm(forms.ModelForm): + class Meta: + model = UserProfile + fields = [ + "theme", + "bookmark_date_display", + "bookmark_description_display", + "bookmark_description_max_lines", + "bookmark_link_target", + "web_archive_integration", + "tag_search", + "tag_grouping", + "enable_sharing", + "enable_public_sharing", + "enable_favicons", + "enable_preview_images", + "enable_automatic_html_snapshots", + "display_url", + "display_view_bookmark_action", + "display_edit_bookmark_action", + "display_archive_bookmark_action", + "display_remove_bookmark_action", + "permanent_notes", + "default_mark_unread", + "default_mark_shared", + "custom_css", + "auto_tagging_rules", + "items_per_page", + "sticky_pagination", + "collapse_side_panel", + "hide_bundles", + "legacy_search", + ] + widgets = { + "theme": FormSelect, + "bookmark_date_display": FormSelect, + "bookmark_description_display": FormSelect, + "bookmark_description_max_lines": FormNumberInput, + "bookmark_link_target": FormSelect, + "web_archive_integration": FormSelect, + "tag_search": FormSelect, + "tag_grouping": FormSelect, + "auto_tagging_rules": FormTextarea, + "custom_css": FormTextarea, + "items_per_page": FormNumberInput, + "display_url": FormCheckbox, + "permanent_notes": FormCheckbox, + "display_view_bookmark_action": FormCheckbox, + "display_edit_bookmark_action": FormCheckbox, + "display_archive_bookmark_action": FormCheckbox, + "display_remove_bookmark_action": FormCheckbox, + "sticky_pagination": FormCheckbox, + "collapse_side_panel": FormCheckbox, + "hide_bundles": FormCheckbox, + "legacy_search": FormCheckbox, + "enable_favicons": FormCheckbox, + "enable_preview_images": FormCheckbox, + "enable_sharing": FormCheckbox, + "enable_public_sharing": FormCheckbox, + "enable_automatic_html_snapshots": FormCheckbox, + "default_mark_unread": FormCheckbox, + "default_mark_shared": FormCheckbox, + } + + +class GlobalSettingsForm(forms.ModelForm): + class Meta: + model = GlobalSettings + fields = ["landing_page", "guest_profile_user", "enable_link_prefetch"] + widgets = { + "landing_page": FormSelect, + "guest_profile_user": FormSelect, + "enable_link_prefetch": FormCheckbox, + } + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields["guest_profile_user"].empty_label = "Standard profile" diff --git a/bookmarks/frontend/components/tag-autocomplete.js b/bookmarks/frontend/components/tag-autocomplete.js index a1675879e..4d9d6fac0 100644 --- a/bookmarks/frontend/components/tag-autocomplete.js +++ b/bookmarks/frontend/components/tag-autocomplete.js @@ -9,6 +9,7 @@ export class TagAutocomplete extends TurboLitElement { inputId: { type: String, attribute: "input-id" }, inputName: { type: String, attribute: "input-name" }, inputValue: { type: String, attribute: "input-value" }, + inputClass: { type: String, attribute: "input-class" }, inputPlaceholder: { type: String, attribute: "input-placeholder" }, inputAriaDescribedBy: { type: String, attribute: "input-aria-describedby" }, variant: { type: String }, @@ -160,7 +161,7 @@ export class TagAutocomplete extends TurboLitElement { name="${this.inputName || nothing}" .value="${this.inputValue || ""}" placeholder="${this.inputPlaceholder || " "}" - class="form-input" + class="form-input ${this.inputClass || ""}" type="text" autocomplete="off" autocapitalize="off" diff --git a/bookmarks/frontend/utils/element.js b/bookmarks/frontend/utils/element.js index e2bcb72cd..94a110413 100644 --- a/bookmarks/frontend/utils/element.js +++ b/bookmarks/frontend/utils/element.js @@ -42,10 +42,10 @@ document.addEventListener("turbo:render", () => { }); document.addEventListener("turbo:before-morph-element", (event) => { - if (event.target instanceof TurboLitElement) { - // Prevent Turbo from morphing Lit elements, which would remove rendered - // contents. For now this means that any Lit element / widget can not be - // updated from the server when using morphing. + const parent = event.target?.parentElement; + if (parent instanceof TurboLitElement) { + // Prevent Turbo from morphing Lit elements contents, which would remove + // elements rendered on the client side. event.preventDefault(); } }); diff --git a/bookmarks/models.py b/bookmarks/models.py index 9dd93dea9..745806bff 100644 --- a/bookmarks/models.py +++ b/bookmarks/models.py @@ -3,7 +3,6 @@ import logging import os -from django import forms from django.conf import settings from django.contrib.auth.models import User from django.core.validators import MinValueValidator @@ -195,12 +194,6 @@ def __str__(self): return self.name -class BookmarkBundleForm(forms.ModelForm): - class Meta: - model = BookmarkBundle - fields = ["name", "search", "any_tags", "all_tags", "excluded_tags"] - - class BookmarkSearch: SORT_ADDED_ASC = "added_asc" SORT_ADDED_DESC = "added_desc" @@ -323,64 +316,6 @@ def from_request(request: any, query_dict: QueryDict, preferences: dict = None): ) -class BookmarkSearchForm(forms.Form): - SORT_CHOICES = [ - (BookmarkSearch.SORT_ADDED_ASC, "Added ↑"), - (BookmarkSearch.SORT_ADDED_DESC, "Added ↓"), - (BookmarkSearch.SORT_TITLE_ASC, "Title ↑"), - (BookmarkSearch.SORT_TITLE_DESC, "Title ↓"), - ] - FILTER_SHARED_CHOICES = [ - (BookmarkSearch.FILTER_SHARED_OFF, "Off"), - (BookmarkSearch.FILTER_SHARED_SHARED, "Shared"), - (BookmarkSearch.FILTER_SHARED_UNSHARED, "Unshared"), - ] - FILTER_UNREAD_CHOICES = [ - (BookmarkSearch.FILTER_UNREAD_OFF, "Off"), - (BookmarkSearch.FILTER_UNREAD_YES, "Unread"), - (BookmarkSearch.FILTER_UNREAD_NO, "Read"), - ] - - q = forms.CharField() - user = forms.ChoiceField(required=False) - bundle = forms.CharField(required=False) - sort = forms.ChoiceField(choices=SORT_CHOICES) - shared = forms.ChoiceField(choices=FILTER_SHARED_CHOICES, widget=forms.RadioSelect) - unread = forms.ChoiceField(choices=FILTER_UNREAD_CHOICES, widget=forms.RadioSelect) - modified_since = forms.CharField(required=False) - added_since = forms.CharField(required=False) - - def __init__( - self, - search: BookmarkSearch, - editable_fields: list[str] = None, - users: list[User] = None, - ): - super().__init__() - editable_fields = editable_fields or [] - self.editable_fields = editable_fields - - # set choices for user field if users are provided - if users: - user_choices = [(user.username, user.username) for user in users] - user_choices.insert(0, ("", "Everyone")) - self.fields["user"].choices = user_choices - - for param in search.params: - # set initial values for modified params - value = search.__dict__.get(param) - if isinstance(value, models.Model): - self.fields[param].initial = value.id - else: - self.fields[param].initial = value - - # Mark non-editable modified fields as hidden. That way, templates - # rendering a form can just loop over hidden_fields to ensure that - # all necessary search options are kept when submitting the form. - if search.is_modified(param) and param not in editable_fields: - self.fields[param].widget = forms.HiddenInput() - - class UserProfile(models.Model): THEME_AUTO = "auto" THEME_LIGHT = "light" @@ -507,41 +442,6 @@ def save(self, *args, **kwargs): super().save(*args, **kwargs) -class UserProfileForm(forms.ModelForm): - class Meta: - model = UserProfile - fields = [ - "theme", - "bookmark_date_display", - "bookmark_description_display", - "bookmark_description_max_lines", - "bookmark_link_target", - "web_archive_integration", - "tag_search", - "tag_grouping", - "enable_sharing", - "enable_public_sharing", - "enable_favicons", - "enable_preview_images", - "enable_automatic_html_snapshots", - "display_url", - "display_view_bookmark_action", - "display_edit_bookmark_action", - "display_archive_bookmark_action", - "display_remove_bookmark_action", - "permanent_notes", - "default_mark_unread", - "default_mark_shared", - "custom_css", - "auto_tagging_rules", - "items_per_page", - "sticky_pagination", - "collapse_side_panel", - "hide_bundles", - "legacy_search", - ] - - @receiver(post_save, sender=User) def create_user_profile(sender, instance, created, **kwargs): if created: @@ -640,13 +540,3 @@ def save(self, *args, **kwargs): if not self.pk and GlobalSettings.objects.exists(): raise Exception("There is already one instance of GlobalSettings") return super().save(*args, **kwargs) - - -class GlobalSettingsForm(forms.ModelForm): - class Meta: - model = GlobalSettings - fields = ["landing_page", "guest_profile_user", "enable_link_prefetch"] - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields["guest_profile_user"].empty_label = "Standard profile" diff --git a/bookmarks/settings/base.py b/bookmarks/settings/base.py index 563337d17..4640ab6a9 100644 --- a/bookmarks/settings/base.py +++ b/bookmarks/settings/base.py @@ -39,7 +39,6 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "widget_tweaks", "rest_framework", "rest_framework.authtoken", "huey.contrib.djhuey", diff --git a/bookmarks/styles/theme/autocomplete.css b/bookmarks/styles/theme/autocomplete.css index f8a74b094..df062797d 100644 --- a/bookmarks/styles/theme/autocomplete.css +++ b/bookmarks/styles/theme/autocomplete.css @@ -31,6 +31,15 @@ outline: none; } } + + &:has(.is-error) { + background: var(--error-color-shade); + border-color: var(--error-color); + + &.is-focused { + outline-color: var(--error-color); + } + } } &.small { diff --git a/bookmarks/styles/theme/forms.css b/bookmarks/styles/theme/forms.css index 10567a037..af9a6e3ba 100644 --- a/bookmarks/styles/theme/forms.css +++ b/bookmarks/styles/theme/forms.css @@ -135,6 +135,10 @@ textarea.form-input { .is-error + & { color: var(--error-color); } + + &.is-error { + color: var(--error-color); + } } /* Form element: Select */ diff --git a/bookmarks/templates/bookmarks/form.html b/bookmarks/templates/bookmarks/form.html index 125fc40d5..22b14b66a 100644 --- a/bookmarks/templates/bookmarks/form.html +++ b/bookmarks/templates/bookmarks/form.html @@ -1,38 +1,32 @@ -{% load widget_tweaks %} {% load static %} {% load shared %}
{% csrf_token %} - {{ form.auto_close|attr:"type:hidden" }} -
- + {{ form.auto_close }} +
+ {% formlabel form.url "URL" %}
- {{ form.url|form_field:"validation"|add_class:"form-input"|attr:"autofocus" }} + {% formfield form.url autofocus=True %}
- {% if form.url.errors %}
{{ form.url.errors }}
{% endif %} + {{ form.url.errors }}
This URL is already bookmarked. The form has been pre-filled with the existing bookmark, and saving the form will update the existing bookmark.
- - - -
+ {% formlabel form.tag_string "Tags" %} + {% formfield form.tag_string has_help=True %} + {% formhelp form.tag_string %} Enter any number of tags separated by space and without the hash (#). If a tag does not exist it will be automatically created. -
+ {% endformhelp %}
- {{ form.tag_string.errors }}
- + {% formlabel form.title "Title" %}
@@ -40,18 +34,16 @@
- {{ form.title|add_class:"form-input"|attr:"autocomplete:off" }} - {{ form.title.errors }} + {% formfield form.title %}
- + {% formlabel form.description "Description" %}
- {{ form.description|add_class:"form-input"|attr:"rows:3" }} - {{ form.description.errors }} + {% formfield form.description rows="3" %}
@@ -59,35 +51,28 @@ Notes - {{ form.notes|form_field:"help"|add_class:"form-input"|attr:"rows:8" }} -
Additional notes, supports Markdown.
+ {% formfield form.notes rows="8" has_help=True %} + {% formhelp form.notes %} + Additional notes, supports Markdown. + {% endformhelp %}
- {{ form.notes.errors }}
-
- {{ form.unread|form_field:"help" }} - - -
-
+ {% formfield form.unread label="Mark as unread" has_help=True %} + {% formhelp form.unread %} Unread bookmarks can be filtered for, and marked as read after you had a chance to look at them. -
+ {% endformhelp %}
{% if request.user_profile.enable_sharing %}
-
- {{ form.shared|form_field:"help" }} - - -
-
+ {% formfield form.shared label="Share" has_help=True %} + {% formhelp form.shared %} {% if request.user_profile.enable_public_sharing %} Share this bookmark with other registered users and anonymous users. {% else %} Share this bookmark with other registered users. {% endif %} -
+ {% endformhelp %}
{% endif %}
diff --git a/bookmarks/templates/bookmarks/search.html b/bookmarks/templates/bookmarks/search.html index 08f4a13e1..ffee8c3c4 100644 --- a/bookmarks/templates/bookmarks/search.html +++ b/bookmarks/templates/bookmarks/search.html @@ -1,4 +1,4 @@ -{% load static widget_tweaks %} +{% load static shared %}
{% endif %} {% if 'shared' in preferences_form.editable_fields %} diff --git a/bookmarks/templates/bookmarks/user_section.html b/bookmarks/templates/bookmarks/user_section.html index ac16679b3..360e9e208 100644 --- a/bookmarks/templates/bookmarks/user_section.html +++ b/bookmarks/templates/bookmarks/user_section.html @@ -1,4 +1,4 @@ -{% load widget_tweaks %} +{% load shared %}

User

@@ -9,7 +9,7 @@

User

{% for hidden_field in user_list.form.hidden_fields %}{{ hidden_field }}{% endfor %}
- {% render_field user_list.form.user class+="form-select" data-submit-on-change="" %} + {% formfield user_list.form.user data_submit_on_change="" %} diff --git a/bookmarks/templates/bundles/edit.html b/bookmarks/templates/bundles/edit.html index c4b0df82c..291e71ebf 100644 --- a/bookmarks/templates/bundles/edit.html +++ b/bookmarks/templates/bundles/edit.html @@ -1,5 +1,4 @@ {% extends 'shared/layout.html' %} -{% load widget_tweaks %} {% block head %} {% with page_title="Edit bundle - Linkding" %}{{ block.super }}{% endwith %} {% endblock %} diff --git a/bookmarks/templates/bundles/form.html b/bookmarks/templates/bundles/form.html index b081817db..713540756 100644 --- a/bookmarks/templates/bundles/form.html +++ b/bookmarks/templates/bundles/form.html @@ -1,38 +1,37 @@ -{% load widget_tweaks %} -
- - {{ form.name|add_class:"form-input"|attr:"autocomplete:off"|attr:"placeholder: " }} - {% if form.name.errors %}
{{ form.name.errors }}
{% endif %} +{% load shared %} +
+ {% formlabel form.name "Name" %} + {% formfield form.name %} + {{ form.name.errors }}
-
- - {{ form.search|add_class:"form-input"|attr:"autocomplete:off"|attr:"placeholder: " }} - {% if form.search.errors %}
{{ form.search.errors }}
{% endif %} -
All of these search terms must be present in a bookmark to match.
+
+ {% formlabel form.search "Search terms" %} + {% formfield form.search has_help=True %} + {{ form.search.errors }} + {% formhelp form.search %} + All of these search terms must be present in a bookmark to match. + {% endformhelp %}
- - - -
At least one of these tags must be present in a bookmark to match.
+ {% formlabel form.any_tags "Tags" %} + {% formfield form.any_tags has_help=True %} + {% formhelp form.any_tags %} + At least one of these tags must be present in a bookmark to match. + {% endformhelp %}
- - - -
All of these tags must be present in a bookmark to match.
+ {% formlabel form.all_tags "Required tags" %} + {% formfield form.all_tags has_help=True %} + {% formhelp form.all_tags %} + All of these tags must be present in a bookmark to match. + {% endformhelp %}
- - - -
None of these tags must be present in a bookmark to match.
+ {% formlabel form.excluded_tags "Excluded tags" %} + {% formfield form.excluded_tags has_help=True %} + {% formhelp form.excluded_tags %} + None of these tags must be present in a bookmark to match. + {% endformhelp %}
Register {% csrf_token %}
- {{ form.username|add_class:'form-input'|attr:"placeholder: " }} + {{ form.username }}
{{ form.errors.username }}
- {{ form.email|add_class:'form-input'|attr:"placeholder: " }} + {{ form.email }}
{{ form.errors.email }}
- {{ form.password1|add_class:'form-input'|attr:"placeholder: " }} + {{ form.password1 }}
{{ form.errors.password1 }}
- {{ form.password2|add_class:'form-input'|attr:"placeholder: " }} + {{ form.password2 }}
{{ form.errors.password2 }}

diff --git a/bookmarks/templates/registration/login.html b/bookmarks/templates/registration/login.html index ae38f4790..16bbcb011 100644 --- a/bookmarks/templates/registration/login.html +++ b/bookmarks/templates/registration/login.html @@ -1,5 +1,5 @@ {% extends 'shared/layout.html' %} -{% load widget_tweaks %} +{% load shared %} {% block head %} {% with page_title="Login - Linkding" %}{{ block.super }}{% endwith %} {% endblock %} @@ -11,17 +11,15 @@

Login

{% csrf_token %} {% if form.errors %} -
-

Your username and password didn't match. Please try again.

-
+

Your username and password didn't match. Please try again.

{% endif %}
- - {{ form.username|add_class:'form-input'|attr:'placeholder: ' }} + {% formlabel form.username 'Username' %} + {% formfield form.username class='form-input' %}
- - {{ form.password|add_class:'form-input'|attr:'placeholder: ' }} + {% formlabel form.password 'Password' %} + {% formfield form.password class='form-input' %}

diff --git a/bookmarks/templates/registration/password_change_done.html b/bookmarks/templates/registration/password_change_done.html index f12264e8a..b566d2376 100644 --- a/bookmarks/templates/registration/password_change_done.html +++ b/bookmarks/templates/registration/password_change_done.html @@ -1,5 +1,4 @@ {% extends 'shared/layout.html' %} -{% load widget_tweaks %} {% block head %} {% with page_title="Password changed - Linkding" %}{{ block.super }}{% endwith %} {% endblock %} diff --git a/bookmarks/templates/registration/password_change_form.html b/bookmarks/templates/registration/password_change_form.html index 9a3b42a60..2b37d48ef 100644 --- a/bookmarks/templates/registration/password_change_form.html +++ b/bookmarks/templates/registration/password_change_form.html @@ -1,5 +1,5 @@ {% extends 'shared/layout.html' %} -{% load widget_tweaks %} +{% load shared %} {% block head %} {% with page_title="Change password - Linkding" %}{{ block.super }}{% endwith %} {% endblock %} @@ -10,20 +10,20 @@

Change Password

{% csrf_token %} -
- - {{ form.old_password|add_class:'form-input'|attr:"placeholder: " }} - {% if form.old_password.errors %}
{{ form.old_password.errors }}
{% endif %} +
+ {% formlabel form.old_password 'Old password' %} + {% formfield form.old_password class='form-input' %} + {{ form.old_password.errors }}
-
- - {{ form.new_password1|add_class:'form-input'|attr:"placeholder: " }} - {% if form.new_password1.errors %}
{{ form.new_password1.errors }}
{% endif %} +
+ {% formlabel form.new_password1 'New password' %} + {% formfield form.new_password1 class='form-input' %} + {{ form.new_password1.errors }}
-
- - {{ form.new_password2|add_class:'form-input'|attr:"placeholder: " }} - {% if form.new_password2.errors %}
{{ form.new_password2.errors }}
{% endif %} +
+ {% formlabel form.new_password2 'Confirm new password' %} + {% formfield form.new_password2 class='form-input' %} + {{ form.new_password2.errors }}

Profile data-turbo="false"> {% csrf_token %}
- - {{ form.theme|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel form.theme "Theme" %} + {% formfield form.theme has_help=True class="width-25 width-sm-100" %} + {% formhelp form.theme %} Whether to use a light or dark theme, or automatically adjust the theme based on your system's settings. -
+ {% endformhelp %}
- - {{ form.bookmark_date_display|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel form.bookmark_date_display "Bookmark date format" %} + {% formfield form.bookmark_date_display has_help=True class="width-25 width-sm-100" %} + {% formhelp form.bookmark_date_display %} Whether to show bookmark dates as relative (how long ago), or as absolute dates. Alternatively the date can be hidden. -
+ {% endformhelp %}
- - {{ form.bookmark_description_display|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel form.bookmark_description_display "Bookmark description" %} + {% formfield form.bookmark_description_display has_help=True class="width-25 width-sm-100" %} + {% formhelp form.bookmark_description_display %} Whether to show bookmark descriptions and tags in the same line, or as separate blocks. -
+ {% endformhelp %}
- - {{ form.bookmark_description_max_lines|add_class:"form-input width-25 width-sm-100" }} -
Limits the number of lines that are displayed for the bookmark description.
+ {% formlabel form.bookmark_description_max_lines "Bookmark description max lines" %} + {% formfield form.bookmark_description_max_lines has_help=True class="width-25 width-sm-100" %} + {% formhelp form.bookmark_description_max_lines %} + Limits the number of lines that are displayed for the bookmark description. + {% endformhelp %}
- -
When enabled, this setting displays the bookmark URL below the title.
+ {% formfield form.display_url label="Show bookmark URL" has_help=True %} + {% formhelp form.display_url %} + When enabled, this setting displays the bookmark URL below the title. + {% endformhelp %}
- -
+ {% formfield form.permanent_notes label="Show notes permanently" has_help=True %} + {% formhelp form.permanent_notes %} Whether to show bookmark notes permanently, without having to toggle them individually. Alternatively the keyboard shortcut e can be used to temporarily show all notes. -
+ {% endformhelp %}
- - - - - + Bookmark actions + {% formfield form.display_view_bookmark_action label="View" %} + {% formfield form.display_edit_bookmark_action label="Edit" %} + {% formfield form.display_archive_bookmark_action label="Archive" %} + {% formfield form.display_remove_bookmark_action label="Remove" %}
Which actions to display for each bookmark.
- - {{ form.bookmark_link_target|add_class:"form-select width-25 width-sm-100" }} -
Whether to open bookmarks a new page or in the same page.
+ {% formlabel form.bookmark_link_target "Open bookmarks in" %} + {% formfield form.bookmark_link_target has_help=True class="width-25 width-sm-100" %} + {% formhelp form.bookmark_link_target %} + Whether to open bookmarks a new page or in the same page. + {% endformhelp %}
-
- - {{ form.items_per_page|add_class:"form-input width-25 width-sm-100"|attr:"min:10" }} - {% if form.items_per_page.errors %} -
{{ form.items_per_page.errors }}
- {% else %} - {% endif %} -
The number of bookmarks to display per page.
+
+ {% formlabel form.items_per_page "Items per page" %} + {% formfield form.items_per_page has_help=True class="width-25 width-sm-100" min="10" %} + {{ form.items_per_page.errors }} + {% formhelp form.items_per_page %} + The number of bookmarks to display per page. + {% endformhelp %}
- -
+ {% formfield form.sticky_pagination label="Sticky pagination" has_help=True %} + {% formhelp form.sticky_pagination %} When enabled, the pagination controls will stick to the bottom of the screen, so that they are always visible without having to scroll to the end of the page first. -
+ {% endformhelp %}
- -
+ {% formfield form.collapse_side_panel label="Collapse side panel" has_help=True %} + {% formhelp form.collapse_side_panel %} When enabled, the tags side panel will be collapsed by default to give more space to the bookmark list. Instead, the tags are shown in an expandable drawer. -
+ {% endformhelp %}
- -
Allows to hide the bundles in the side panel if you don't intend to use them.
+ {% formfield form.hide_bundles label="Hide bundles" has_help=True %} + {% formhelp form.hide_bundles %} + Allows to hide the bundles in the side panel if you don't intend to use them. + {% endformhelp %}
- - {{ form.tag_search|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel form.tag_search "Tag search" %} + {% formfield form.tag_search has_help=True class="width-25 width-sm-100" %} + {% formhelp form.tag_search %} In strict mode, tags must be prefixed with a hash character (#). In lax mode, tags can also be searched without the hash character. Note that tags without the hash character are indistinguishable from search terms, which means the search result will also include bookmarks where a search term matches otherwise. -
+ {% endformhelp %}
- -
+ {% formfield form.legacy_search label="Enable legacy search" has_help=True %} + {% formhelp form.legacy_search %} Since version 1.44.0, linkding has a new search engine that supports logical expressions (and, or, not). If you run into any issues with the new search, you can enable this option to temporarily switch back to the old search. Please report any issues you encounter with the new search on GitHub so they can be addressed. This option will be removed in a future version. -
+ {% endformhelp %}
- - {{ form.tag_grouping|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel form.tag_grouping "Tag grouping" %} + {% formfield form.tag_grouping has_help=True class="width-25 width-sm-100" %} + {% formhelp form.tag_grouping %} In alphabetical mode, tags will be grouped by the first letter. If disabled, tags will not be grouped. -
+ {% endformhelp %}
@@ -176,21 +139,18 @@

Profile

-
{{ form.auto_tagging_rules|add_class:"form-input monospace"|attr:"rows:6" }}
+
{% formfield form.auto_tagging_rules has_help=True class="monospace" rows="6" %}
-
+ {% formhelp form.auto_tagging_rules %} Automatically adds tags to bookmarks based on predefined rules. Each line is a single rule that maps a URL to one or more tags. For example: 
youtube.com video
 reddit.com/r/Music music reddit
-
+ {% endformhelp %}
- -
+ {% formfield form.enable_favicons label="Enable Favicons" has_help=True %} + {% formhelp form.enable_favicons %} Automatically loads favicons for bookmarked websites and displays them next to each bookmark. Enabling this feature automatically downloads all missing favicons. By default, this feature uses a Google service to download favicons. @@ -198,95 +158,68 @@

Profile

options documentation on how to configure a custom favicon provider. Icons are downloaded in the background, and it may take a while for them to show up. -
+ {% endformhelp %} {% if request.user_profile.enable_favicons and enable_refresh_favicons %} {% endif %}
- -
+ {% formfield form.enable_preview_images label="Enable Preview Images" has_help=True %} + {% formhelp form.enable_preview_images %} Automatically loads preview images for bookmarked websites and displays them next to each bookmark. Enabling this feature automatically downloads all missing preview images. -
+ {% endformhelp %}
- - {{ form.web_archive_integration|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel form.web_archive_integration "Internet Archive integration" %} + {% formfield form.web_archive_integration has_help=True class="width-25 width-sm-100" %} + {% formhelp form.web_archive_integration %} Enabling this feature will automatically create snapshots of bookmarked websites on the Internet Archive Wayback Machine. This allows to preserve, and later access the website as it was at the point in time it was bookmarked, in case it goes offline or its content is modified. Please consider donating to the Internet Archive if you make use of this feature. -
+ {% endformhelp %}
- -
+ {% formfield form.enable_sharing label="Enable bookmark sharing" has_help=True %} + {% formhelp form.enable_sharing %} Allows to share bookmarks with other users, and to view shared bookmarks. Disabling this feature will hide all previously shared bookmarks from other users. -
+ {% endformhelp %}
- -
+ {% formfield form.enable_public_sharing label="Enable public bookmark sharing" has_help=True %} + {% formhelp form.enable_public_sharing %} Makes shared bookmarks publicly accessible, without requiring a login. That means that anyone with a link to this instance can view shared bookmarks via the shared bookmarks page. -
+ {% endformhelp %}
{% if has_snapshot_support %}
- -
+ {% formfield form.enable_automatic_html_snapshots label="Automatically create HTML snapshots" has_help=True %} + {% formhelp form.enable_automatic_html_snapshots %} Automatically creates HTML snapshots when adding bookmarks. Alternatively, when disabled, snapshots can be created manually in the details view of a bookmark. -
+ {% endformhelp %}
{% endif %}
- -
+ {% formfield form.default_mark_unread label="Create bookmarks as unread by default" has_help=True %} + {% formhelp form.default_mark_unread %} Sets the default state for the "Mark as unread" option when creating a new bookmark. Setting this option will make all new bookmarks default to unread. This can be overridden when creating each new bookmark. -
+ {% endformhelp %}
- -
+ {% formfield form.default_mark_shared label="Create bookmarks as shared by default" has_help=True %} + {% formhelp form.default_mark_shared %} Sets the default state for the "Share" option when creating a new bookmark. Setting this option will make all new bookmarks default to shared. This can be overridden when creating each new bookmark. -
+ {% endformhelp %}
@@ -294,9 +227,11 @@

Profile

Custom CSS -
{{ form.custom_css|add_class:"form-input monospace"|attr:"rows:6" }}
+
{% formfield form.custom_css has_help=True class="monospace" rows="6" %}
-
Allows to add custom CSS to the page.
+ {% formhelp form.custom_css %} + Allows to add custom CSS to the page. + {% endformhelp %}
Global settings data-turbo="false"> {% csrf_token %}
- - {{ global_settings_form.landing_page|add_class:"form-select width-25 width-sm-100" }} -
The page that unauthenticated users are redirected to when accessing the root URL.
+ {% formlabel global_settings_form.landing_page "Landing page" %} + {% formfield global_settings_form.landing_page has_help=True class="width-25 width-sm-100" %} + {% formhelp global_settings_form.landing_page %} + The page that unauthenticated users are redirected to when accessing the root URL. + {% endformhelp %}
- - {{ global_settings_form.guest_profile_user|add_class:"form-select width-25 width-sm-100" }} -
+ {% formlabel global_settings_form.guest_profile_user "Guest user profile" %} + {% formfield global_settings_form.guest_profile_user has_help=True class="width-25 width-sm-100" %} + {% formhelp global_settings_form.guest_profile_user %} The user profile to use for users that are not logged in. This will affect how publicly shared bookmarks are displayed regarding theme, bookmark list settings, etc. You can either use your own profile or create a dedicated user for this purpose. By default, a standard profile with fixed settings is used. -
+ {% endformhelp %}
- -
+ {% formfield global_settings_form.enable_link_prefetch label="Enable prefetching links on hover" has_help=True %} + {% formhelp global_settings_form.enable_link_prefetch %} Prefetches internal links when hovering over them. This can improve the perceived performance when navigating application, but also increases the load on the server as well as bandwidth usage. -
+ {% endformhelp %}
Import {% csrf_token %}
-
+
When importing bookmarks from a service that supports marking bookmarks as public or private (using the PRIVATE attribute), enabling this option will import all bookmarks that are marked as not private as shared bookmarks. diff --git a/bookmarks/templates/shared/error_list.html b/bookmarks/templates/shared/error_list.html index 0c58c2527..15769f3cb 100644 --- a/bookmarks/templates/shared/error_list.html +++ b/bookmarks/templates/shared/error_list.html @@ -2,7 +2,7 @@ {# Force rendering validation errors in English language to align with the rest of the app #} {% language 'en-us' %} {% if errors %} -
    {% for error in errors %}
  • {{ error }}
    • {% endfor %}
diff --git a/bookmarks/templates/tags/form.html b/bookmarks/templates/tags/form.html index 7b10311bd..1a9a104c8 100644 --- a/bookmarks/templates/tags/form.html +++ b/bookmarks/templates/tags/form.html @@ -1,9 +1,9 @@ -{% load widget_tweaks %} -
- - {{ form.name|add_class:"form-input"|attr:"autocomplete:off"|attr:"placeholder: "|attr:"autofocus" }} -
+{% load shared %} +
+ {% formlabel form.name "Name" %} + {% formfield form.name has_help=True autofocus=True %} + {% formhelp form.name %} Tag names are case-insensitive and cannot contain spaces (spaces will be replaced with hyphens). -
- {% if form.name.errors %}
{{ form.name.errors }}
{% endif %} + {% endformhelp %} + {{ form.name.errors }}
diff --git a/bookmarks/templates/tags/merge.html b/bookmarks/templates/tags/merge.html index 53ca84ba2..58691913b 100644 --- a/bookmarks/templates/tags/merge.html +++ b/bookmarks/templates/tags/merge.html @@ -1,4 +1,4 @@ -{% load widget_tweaks %} +{% load shared %} The merged tags are deleted -
- - - -
+
+ {% formlabel form.target_tag "Target tag" %} + {% formfield form.target_tag has_help=True %} + {% formhelp form.target_tag %} Enter the name of the tag you want to keep. The tags entered below will be merged into this one. -
- {% if form.target_tag.errors %}
{{ form.target_tag.errors }}
{% endif %} + {% endformhelp %} + {{ form.target_tag.errors }}
-
- - - -
+
+ {% formlabel form.merge_tags "Tags to merge" %} + {% formfield form.merge_tags has_help=True %} + {% formhelp form.merge_tags %} Enter the names of tags to merge into the target tag, separated by spaces. These tags will be deleted after merging. -
- {% if form.merge_tags.errors %}
{{ form.merge_tags.errors }}
{% endif %} + {% endformhelp %} + {{ form.merge_tags.errors }}
diff --git a/bookmarks/templatetags/bookmarks.py b/bookmarks/templatetags/bookmarks.py index a11696b01..e168449c1 100644 --- a/bookmarks/templatetags/bookmarks.py +++ b/bookmarks/templatetags/bookmarks.py @@ -1,9 +1,7 @@ from django import template -from bookmarks.models import ( - BookmarkSearch, - BookmarkSearchForm, -) +from bookmarks.forms import BookmarkSearchForm +from bookmarks.models import BookmarkSearch register = template.Library() diff --git a/bookmarks/templatetags/shared.py b/bookmarks/templatetags/shared.py index 63b24646b..1f1a7f682 100644 --- a/bookmarks/templatetags/shared.py +++ b/bookmarks/templatetags/shared.py @@ -7,6 +7,7 @@ from django.utils.safestring import mark_safe from bookmarks import utils +from bookmarks.widgets import FormCheckbox register = template.Library() @@ -102,20 +103,60 @@ def append_attr(widget, attr, value): attrs[attr] = value -@register.filter("form_field") -def form_field(field, modifier_string): - modifiers = modifier_string.split(",") - has_errors = hasattr(field, "errors") and field.errors +@register.simple_tag +def formlabel(field, label_text): + return mark_safe( + f'' + ) + + +@register.simple_tag +def formfield(field, **kwargs): + widget = field.field.widget + + label = kwargs.pop("label", None) + if label and isinstance(widget, FormCheckbox): + widget.label = label - if "validation" in modifiers and has_errors: - append_attr(field.field.widget, "aria-describedby", field.auto_id + "_error") - if "help" in modifiers: - append_attr(field.field.widget, "aria-describedby", field.auto_id + "_help") + if kwargs.pop("has_help", False): + append_attr(widget, "aria-describedby", field.auto_id + "_help") - # Some assistive technologies announce a field as invalid when it has the - # required attribute, even if the user has not interacted with the field - # yet. Set aria-invalid false to prevent this behavior. + has_errors = hasattr(field, "errors") and field.errors + if has_errors: + append_attr(widget, "class", "is-error") + append_attr(widget, "aria-describedby", field.auto_id + "_error") if field.field.required and not has_errors: - append_attr(field.field.widget, "aria-invalid", "false") + append_attr(widget, "aria-invalid", "false") + + for attr, value in kwargs.items(): + attr = attr.replace("_", "-") + if attr == "class": + append_attr(widget, "class", value) + else: + widget.attrs[attr] = value + + return field.as_widget() + - return field +@register.tag +def formhelp(parser, token): + try: + tag_name, field_var = token.split_contents() + except ValueError: + raise template.TemplateSyntaxError( + f"{token.contents.split()[0]!r} tag requires a single argument (form field)" + ) from None + nodelist = parser.parse(("endformhelp",)) + parser.delete_first_token() + return FormHelpNode(nodelist, field_var) + + +class FormHelpNode(template.Node): + def __init__(self, nodelist, field_var): + self.nodelist = nodelist + self.field_var = template.Variable(field_var) + + def render(self, context): + field = self.field_var.resolve(context) + content = self.nodelist.render(context) + return f'
{content}
' diff --git a/bookmarks/tests/test_bookmark_edit_view.py b/bookmarks/tests/test_bookmark_edit_view.py index 5a6b3cb36..58cbaa45a 100644 --- a/bookmarks/tests/test_bookmark_edit_view.py +++ b/bookmarks/tests/test_bookmark_edit_view.py @@ -113,7 +113,7 @@ def test_should_prefill_bookmark_form_fields(self): self.assertInHTML( f""" - + """, html, ) diff --git a/bookmarks/tests/test_bookmark_new_view.py b/bookmarks/tests/test_bookmark_new_view.py index 7cfa55fe2..841d5de3e 100644 --- a/bookmarks/tests/test_bookmark_new_view.py +++ b/bookmarks/tests/test_bookmark_new_view.py @@ -78,7 +78,7 @@ def test_should_prefill_url_from_url_parameter(self): self.assertInHTML( """ - + """, html, ) diff --git a/bookmarks/tests/test_bookmark_search_form.py b/bookmarks/tests/test_bookmark_search_form.py index 2143617ae..34bdd9546 100644 --- a/bookmarks/tests/test_bookmark_search_form.py +++ b/bookmarks/tests/test_bookmark_search_form.py @@ -1,6 +1,7 @@ from django.test import TestCase -from bookmarks.models import BookmarkSearch, BookmarkSearchForm +from bookmarks.forms import BookmarkSearchForm +from bookmarks.models import BookmarkSearch from bookmarks.tests.helpers import BookmarkFactoryMixin diff --git a/bookmarks/tests/test_bundles_edit_view.py b/bookmarks/tests/test_bundles_edit_view.py index be4bc19dc..c8b736035 100644 --- a/bookmarks/tests/test_bundles_edit_view.py +++ b/bookmarks/tests/test_bundles_edit_view.py @@ -56,8 +56,8 @@ def test_should_render_edit_form_with_prefilled_fields(self): self.assertInHTML( f""" + autocomplete="off" class="form-input" + maxlength="256" aria-invalid="false" required id="id_name"> """, html, ) @@ -65,8 +65,8 @@ def test_should_render_edit_form_with_prefilled_fields(self): self.assertInHTML( f""" + autocomplete="off" class="form-input" + maxlength="256" aria-describedby="id_search_help" id="id_search"> """, html, ) @@ -74,7 +74,7 @@ def test_should_render_edit_form_with_prefilled_fields(self): self.assertInHTML( f""" + input-aria-describedby="id_any_tags_help" input-id="id_any_tags"> """, html, ) @@ -82,7 +82,7 @@ def test_should_render_edit_form_with_prefilled_fields(self): self.assertInHTML( f""" + input-aria-describedby="id_all_tags_help" input-id="id_all_tags"> """, html, ) @@ -90,7 +90,7 @@ def test_should_render_edit_form_with_prefilled_fields(self): self.assertInHTML( f""" + input-aria-describedby="id_excluded_tags_help" input-id="id_excluded_tags"> """, html, ) diff --git a/bookmarks/tests/test_settings_general_view.py b/bookmarks/tests/test_settings_general_view.py index 5c63d97aa..46795a565 100644 --- a/bookmarks/tests/test_settings_general_view.py +++ b/bookmarks/tests/test_settings_general_view.py @@ -410,7 +410,9 @@ def test_automatic_html_snapshots_should_be_hidden_when_snapshots_not_supported( self.assertInHTML( """ - + """, html, count=0, @@ -425,7 +427,9 @@ def test_automatic_html_snapshots_should_be_visible_when_snapshots_supported( self.assertInHTML( """ - + """, html, count=1, diff --git a/bookmarks/tests/test_tags_merge_view.py b/bookmarks/tests/test_tags_merge_view.py index 624155cce..23d6bea12 100644 --- a/bookmarks/tests/test_tags_merge_view.py +++ b/bookmarks/tests/test_tags_merge_view.py @@ -29,6 +29,10 @@ def get_form_group(self, response, input_name): return autocomplete_element.find_parent("div", class_="form-group") return None + def get_autocomplete(self, response, input_name): + soup = self.make_soup(response.content.decode()) + return soup.find("ld-tag-autocomplete", {"input-name": input_name}) + def test_merge_tags(self): target_tag = self.setup_tag(name="target_tag") merge_tag1 = self.setup_tag(name="merge_tag1") @@ -134,6 +138,9 @@ def test_validate_missing_target_tag(self): self.assertIn("This field is required", self.get_text(target_tag_group)) self.assertTrue(Tag.objects.filter(id=merge_tag.id).exists()) + autocomplete = self.get_autocomplete(response, "target_tag") + self.assertIn("is-error", autocomplete.get("input-class", "")) + def test_validate_missing_merge_tags(self): self.setup_tag(name="target_tag") @@ -145,6 +152,9 @@ def test_validate_missing_merge_tags(self): merge_tags_group = self.get_form_group(response, "merge_tags") self.assertIn("This field is required", self.get_text(merge_tags_group)) + autocomplete = self.get_autocomplete(response, "merge_tags") + self.assertIn("is-error", autocomplete.get("input-class", "")) + def test_validate_nonexistent_target_tag(self): self.setup_tag(name="merge_tag") diff --git a/bookmarks/urls.py b/bookmarks/urls.py index 34a6e66e3..533c1d1fd 100644 --- a/bookmarks/urls.py +++ b/bookmarks/urls.py @@ -160,7 +160,15 @@ # Registration if settings.ALLOW_REGISTRATION: - urlpatterns.append(path("", include("django_registration.backends.one_step.urls"))) + from django_registration.backends.one_step.views import RegistrationView + + urlpatterns.append( + path( + "accounts/register/", + RegistrationView.as_view(), + name="django_registration_register", + ) + ) # Context path if settings.LD_CONTEXT_PATH: diff --git a/bookmarks/views/auth.py b/bookmarks/views/auth.py index 9fecdf874..c1d5b8a01 100644 --- a/bookmarks/views/auth.py +++ b/bookmarks/views/auth.py @@ -1,6 +1,8 @@ from django.conf import settings from django.contrib.auth import views as auth_views +from bookmarks.widgets import FormErrorList + class LinkdingLoginView(auth_views.LoginView): """ @@ -8,6 +10,11 @@ class LinkdingLoginView(auth_views.LoginView): Allows to override settings in tests """ + def get_form(self, form_class=None): + form = super().get_form(form_class) + form.error_class = FormErrorList + return form + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -27,6 +34,11 @@ def form_invalid(self, form): class LinkdingPasswordChangeView(auth_views.PasswordChangeView): + def get_form(self, form_class=None): + form = super().get_form(form_class) + form.error_class = FormErrorList + return form + def form_invalid(self, form): """ Hotwired Turbo requires a non 2xx status code to handle failed form diff --git a/bookmarks/views/bundles.py b/bookmarks/views/bundles.py index 754e6fc39..6ca911a18 100644 --- a/bookmarks/views/bundles.py +++ b/bookmarks/views/bundles.py @@ -4,7 +4,8 @@ from django.shortcuts import render from django.urls import reverse -from bookmarks.models import BookmarkBundle, BookmarkBundleForm, BookmarkSearch +from bookmarks.forms import BookmarkBundleForm +from bookmarks.models import BookmarkBundle, BookmarkSearch from bookmarks.queries import parse_query_string from bookmarks.services import bundles from bookmarks.views import access diff --git a/bookmarks/views/contexts.py b/bookmarks/views/contexts.py index e22a65829..bd793bfcc 100644 --- a/bookmarks/views/contexts.py +++ b/bookmarks/views/contexts.py @@ -8,12 +8,12 @@ from django.urls import reverse from bookmarks import queries, utils +from bookmarks.forms import BookmarkSearchForm from bookmarks.models import ( Bookmark, BookmarkAsset, BookmarkBundle, BookmarkSearch, - BookmarkSearchForm, Tag, User, UserProfile, diff --git a/bookmarks/views/settings.py b/bookmarks/views/settings.py index 89b6e0ba6..bfdf08385 100644 --- a/bookmarks/views/settings.py +++ b/bookmarks/views/settings.py @@ -13,13 +13,12 @@ from django.urls import reverse from django.utils import timezone +from bookmarks.forms import GlobalSettingsForm, UserProfileForm from bookmarks.models import ( ApiToken, Bookmark, FeedToken, GlobalSettings, - GlobalSettingsForm, - UserProfileForm, ) from bookmarks.services import exporter, importer, tasks from bookmarks.type_defs import HttpRequest @@ -301,10 +300,11 @@ def bookmark_export(request: HttpRequest): return response except Exception: - return render( + return general( request, - "settings/general.html", - {"export_error": "An error occurred during bookmark export."}, + context_overrides={ + "export_error": "An error occurred during bookmark export." + }, ) diff --git a/bookmarks/widgets.py b/bookmarks/widgets.py new file mode 100644 index 000000000..3856a9d36 --- /dev/null +++ b/bookmarks/widgets.py @@ -0,0 +1,83 @@ +from django import forms +from django.forms.utils import ErrorList +from django.utils.html import escape, format_html +from django.utils.safestring import mark_safe + + +class FormErrorList(ErrorList): + template_name = "shared/error_list.html" + + +class FormInput(forms.TextInput): + def __init__(self, attrs=None): + default_attrs = {"class": "form-input", "autocomplete": "off"} + if attrs: + default_attrs.update(attrs) + super().__init__(default_attrs) + + +class FormNumberInput(forms.NumberInput): + def __init__(self, attrs=None): + default_attrs = {"class": "form-input"} + if attrs: + default_attrs.update(attrs) + super().__init__(default_attrs) + + +class FormSelect(forms.Select): + def __init__(self, attrs=None): + default_attrs = {"class": "form-select"} + if attrs: + default_attrs.update(attrs) + super().__init__(default_attrs) + + +class FormTextarea(forms.Textarea): + def __init__(self, attrs=None): + default_attrs = {"class": "form-input"} + if attrs: + default_attrs.update(attrs) + super().__init__(default_attrs) + + +class FormCheckbox(forms.CheckboxInput): + def __init__(self, attrs=None): + super().__init__(attrs) + self.label = "Label" + + def render(self, name, value, attrs=None, renderer=None): + checkbox_html = super().render(name, value, attrs, renderer) + input_id = attrs.get("id") if attrs else None + return format_html( + '
' + "{}" + '' + '' + "
", + checkbox_html, + input_id, + self.label, + ) + + +class TagAutocomplete(forms.TextInput): + def __init__(self, attrs=None): + super().__init__(attrs) + + def render(self, name, value, attrs=None, renderer=None): + # Merge self.attrs with passed attrs + final_attrs = self.build_attrs(self.attrs, attrs) + + input_id = final_attrs.get("id") + input_value = escape(value) if value else "" + aria_describedby = final_attrs.get("aria-describedby") + input_class = final_attrs.get("class") + + html = f'=1.0.3", "django>=6.0", "django-registration>=5.2.1", - "django-widget-tweaks>=1.5.0", "djangorestframework>=3.16.1", "huey>=2.5.5", "markdown>=3.10", @@ -50,6 +49,7 @@ python-preference = "system" [tool.djlint] custom_html="ld-\\w+,ld-\\w+-\\w+" +custom_blocks="formhelp" indent=2 format_js=true profile="django" diff --git a/uv.lock b/uv.lock index 0c765e9d2..ed4e217b4 100644 --- a/uv.lock +++ b/uv.lock @@ -341,15 +341,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/78/5d/aa2f82b3c809db66eb986963db1d4b89de190b4eac2e3021a725112e3b13/django_registration-5.2.1-py3-none-any.whl", hash = "sha256:7079e2364b15fc6bef18b81ae94c5e947b556abdbbfb19c9bcca14feafde6a3d", size = 105277, upload-time = "2025-04-07T05:54:46.981Z" }, ] -[[package]] -name = "django-widget-tweaks" -version = "1.5.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/a5/fe/26eb92fba83844e71bbec0ced7fc2e843e5990020e3cc676925204031654/django-widget-tweaks-1.5.0.tar.gz", hash = "sha256:1c2180681ebb994e922c754804c7ffebbe1245014777ac47897a81f57cc629c7", size = 14767, upload-time = "2023-08-25T15:29:12.778Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/46/6a/6cb6deb5c38b785c77c3ba66f53051eada49205979c407323eb666930915/django_widget_tweaks-1.5.0-py3-none-any.whl", hash = "sha256:a41b7b2f05bd44d673d11ebd6c09a96f1d013ee98121cb98c384fe84e33b881e", size = 8960, upload-time = "2023-08-25T15:29:05.644Z" }, -] - [[package]] name = "djangorestframework" version = "3.16.1" @@ -494,7 +485,6 @@ dependencies = [ { name = "bleach-allowlist" }, { name = "django" }, { name = "django-registration" }, - { name = "django-widget-tweaks" }, { name = "djangorestframework" }, { name = "huey" }, { name = "markdown" }, @@ -528,7 +518,6 @@ requires-dist = [ { name = "bleach-allowlist", specifier = ">=1.0.3" }, { name = "django", specifier = ">=6.0" }, { name = "django-registration", specifier = ">=5.2.1" }, - { name = "django-widget-tweaks", specifier = ">=1.5.0" }, { name = "djangorestframework", specifier = ">=3.16.1" }, { name = "huey", specifier = ">=2.5.5" }, { name = "markdown", specifier = ">=3.10" }, From 50180c96844e66f1e68bb9c3fbabfd9827943c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= Date: Mon, 5 Jan 2026 05:52:43 +0100 Subject: [PATCH 2/5] Remove registration switch (#1268) --- bookmarks/settings/base.py | 3 -- bookmarks/settings/custom.py | 2 - .../registration_complete.html | 12 ------ .../registration_form.html | 39 ------------------- bookmarks/templates/registration/login.html | 3 -- bookmarks/urls.py | 12 ------ bookmarks/views/auth.py | 1 - pyproject.toml | 1 - scripts/run-docker.sh | 2 +- uv.lock | 24 ------------ 10 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 bookmarks/templates/django_registration/registration_complete.html delete mode 100644 bookmarks/templates/django_registration/registration_form.html diff --git a/bookmarks/settings/base.py b/bookmarks/settings/base.py index 4640ab6a9..53993b42a 100644 --- a/bookmarks/settings/base.py +++ b/bookmarks/settings/base.py @@ -136,9 +136,6 @@ "PAGE_SIZE": 100, } -# Registration switch -ALLOW_REGISTRATION = False - # URL validation flag LD_DISABLE_URL_VALIDATION = os.getenv("LD_DISABLE_URL_VALIDATION", False) in ( True, diff --git a/bookmarks/settings/custom.py b/bookmarks/settings/custom.py index 143330e5e..fcfe4e538 100644 --- a/bookmarks/settings/custom.py +++ b/bookmarks/settings/custom.py @@ -1,3 +1 @@ # Placeholder, can be mounted in a Docker container with a custom settings - -# ALLOW_REGISTRATION = True diff --git a/bookmarks/templates/django_registration/registration_complete.html b/bookmarks/templates/django_registration/registration_complete.html deleted file mode 100644 index 74d5d399a..000000000 --- a/bookmarks/templates/django_registration/registration_complete.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'shared/layout.html' %} -{% block head %} - {% with page_title="Registration complete - Linkding" %}{{ block.super }}{% endwith %} -{% endblock %} -{% block content %} -
-
-

Registration complete

-
-

You can now use the application.

-
-{% endblock %} diff --git a/bookmarks/templates/django_registration/registration_form.html b/bookmarks/templates/django_registration/registration_form.html deleted file mode 100644 index aa6af8d99..000000000 --- a/bookmarks/templates/django_registration/registration_form.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends 'shared/layout.html' %} -{% block head %} - {% with page_title="Registration - Linkding" %}{{ block.super }}{% endwith %} -{% endblock %} -{% block content %} -
-
-

Register

-
- - {% csrf_token %} -
- - {{ form.username }} -
{{ form.errors.username }}
-
-
- - {{ form.email }} -
{{ form.errors.email }}
-
-
- - {{ form.password1 }} -
{{ form.errors.password1 }}
-
-
- - {{ form.password2 }} -
{{ form.errors.password2 }}
-
-
- - - -
-{% endblock %} diff --git a/bookmarks/templates/registration/login.html b/bookmarks/templates/registration/login.html index 16bbcb011..d8998356c 100644 --- a/bookmarks/templates/registration/login.html +++ b/bookmarks/templates/registration/login.html @@ -30,9 +30,6 @@

Login

href="{% url 'oidc_authentication_init' %}" data-turbo="false">Login with OIDC {% endif %} - {% if allow_registration %} - Register - {% endif %}
diff --git a/bookmarks/urls.py b/bookmarks/urls.py index 533c1d1fd..214917a09 100644 --- a/bookmarks/urls.py +++ b/bookmarks/urls.py @@ -158,18 +158,6 @@ # import debug_toolbar # urlpatterns.append(path("__debug__/", include(debug_toolbar.urls))) -# Registration -if settings.ALLOW_REGISTRATION: - from django_registration.backends.one_step.views import RegistrationView - - urlpatterns.append( - path( - "accounts/register/", - RegistrationView.as_view(), - name="django_registration_register", - ) - ) - # Context path if settings.LD_CONTEXT_PATH: urlpatterns = [path(settings.LD_CONTEXT_PATH, include(urlpatterns))] diff --git a/bookmarks/views/auth.py b/bookmarks/views/auth.py index c1d5b8a01..3a3b90c51 100644 --- a/bookmarks/views/auth.py +++ b/bookmarks/views/auth.py @@ -18,7 +18,6 @@ def get_form(self, form_class=None): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["allow_registration"] = settings.ALLOW_REGISTRATION context["enable_oidc"] = settings.LD_ENABLE_OIDC return context diff --git a/pyproject.toml b/pyproject.toml index 7ba101a26..d5de9bd61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,6 @@ dependencies = [ "bleach>=6.3.0", "bleach-allowlist>=1.0.3", "django>=6.0", - "django-registration>=5.2.1", "djangorestframework>=3.16.1", "huey>=2.5.5", "markdown>=3.10", diff --git a/scripts/run-docker.sh b/scripts/run-docker.sh index 430a9b66b..96d3a9636 100755 --- a/scripts/run-docker.sh +++ b/scripts/run-docker.sh @@ -2,7 +2,7 @@ variant="${1:-default}" -docker build -f "docker/$variant.Dockerfile" -t sissbruecker/linkding:local . +docker build -f "docker/$variant.Dockerfile" --target linkding -t sissbruecker/linkding:local . docker rm -f linkding-local || true diff --git a/uv.lock b/uv.lock index ed4e217b4..fb5fd8f64 100644 --- a/uv.lock +++ b/uv.lock @@ -161,15 +161,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" }, ] -[[package]] -name = "confusable-homoglyphs" -version = "3.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0d/10/1358fca1ee2d97d4f2877df9ffbe6d124da666fef3b2f75e771a4c1afee6/confusable_homoglyphs-3.3.1.tar.gz", hash = "sha256:b995001c9b2e1b4cea0cf5f3840a7c79188a8cbbad053d693572bd8c1c1ec460", size = 325480, upload-time = "2024-01-30T10:10:27.47Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/c5/6e/c0fcbb7d341a46cf4241a6aa9e6a737734f0657521fc1bcd074953fe4eea/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl", hash = "sha256:84c92cb79dc7f55aa290d0762b2349abd8dee4c16fbe6f99eac978d394e2e6a1", size = 144755, upload-time = "2024-01-30T10:10:24.857Z" }, -] - [[package]] name = "coverage" version = "7.13.1" @@ -328,19 +319,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/6d/72/685c978af45ad08257e2c69687a873eda6b6531c79b6e6091794c41c5ff6/django_debug_toolbar-6.1.0-py3-none-any.whl", hash = "sha256:e214dea4494087e7cebdcea84223819c5eb97f9de3110a3665ad673f0ba98413", size = 269069, upload-time = "2025-10-30T19:50:37.71Z" }, ] -[[package]] -name = "django-registration" -version = "5.2.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "confusable-homoglyphs" }, - { name = "django" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9a/a0/f6e6d0a59b94eb4ab14983853334cb25401d677c5a3799aaca6819acf2eb/django_registration-5.2.1.tar.gz", hash = "sha256:06864f9da0bc4d7b073fb2da98d95d12428357ab0bc46e33f79c26707ec06bbe", size = 94187, upload-time = "2025-04-07T05:54:48.558Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/78/5d/aa2f82b3c809db66eb986963db1d4b89de190b4eac2e3021a725112e3b13/django_registration-5.2.1-py3-none-any.whl", hash = "sha256:7079e2364b15fc6bef18b81ae94c5e947b556abdbbfb19c9bcca14feafde6a3d", size = 105277, upload-time = "2025-04-07T05:54:46.981Z" }, -] - [[package]] name = "djangorestframework" version = "3.16.1" @@ -484,7 +462,6 @@ dependencies = [ { name = "bleach" }, { name = "bleach-allowlist" }, { name = "django" }, - { name = "django-registration" }, { name = "djangorestframework" }, { name = "huey" }, { name = "markdown" }, @@ -517,7 +494,6 @@ requires-dist = [ { name = "bleach", specifier = ">=6.3.0" }, { name = "bleach-allowlist", specifier = ">=1.0.3" }, { name = "django", specifier = ">=6.0" }, - { name = "django-registration", specifier = ">=5.2.1" }, { name = "djangorestframework", specifier = ">=3.16.1" }, { name = "huey", specifier = ">=2.5.5" }, { name = "markdown", specifier = ">=3.10" }, From fdb5b4e82dcbb266e99f5ef1e3346b38a93910ac Mon Sep 17 00:00:00 2001 From: Aidan Coyle Date: Mon, 5 Jan 2026 02:25:54 -0600 Subject: [PATCH 3/5] Remove absolute URIs from settings page (#1261) * Remove absolute URIs from admin page The rest of the links on this page are absolute paths without a specified hostname, but these in particlar use build_absolute_uri. I am running linkding behind two different load balancers which makes these links bubble up the "internal" hostname instead of the hostname I actually got to the page from. * Add LD_USE_X_FORWARDED_HOST See: https://docs.djangoproject.com/en/6.0/ref/settings/#std-setting-USE_X_FORWARDED_HOST --- bookmarks/settings/base.py | 10 ++++++++++ .../tests/test_settings_integrations_view.py | 8 ++++---- bookmarks/views/settings.py | 17 +++++------------ docs/src/content/docs/options.md | 8 ++++++++ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/bookmarks/settings/base.py b/bookmarks/settings/base.py index 53993b42a..44f881342 100644 --- a/bookmarks/settings/base.py +++ b/bookmarks/settings/base.py @@ -217,6 +217,16 @@ if LD_AUTH_PROXY_LOGOUT_URL: LOGOUT_REDIRECT_URL = LD_AUTH_PROXY_LOGOUT_URL +LD_USE_X_FORWARDED_HOST = os.getenv("LD_USE_X_FORWARDED_HOST", False) in ( + True, + "True", + "true", + "1", +) + +if LD_USE_X_FORWARDED_HOST: + USE_X_FORWARDED_HOST = LD_USE_X_FORWARDED_HOST + # CSRF trusted origins trusted_origins = os.getenv("LD_CSRF_TRUSTED_ORIGINS", "") if trusted_origins: diff --git a/bookmarks/tests/test_settings_integrations_view.py b/bookmarks/tests/test_settings_integrations_view.py index 11fe90ef6..7fdb6cfba 100644 --- a/bookmarks/tests/test_settings_integrations_view.py +++ b/bookmarks/tests/test_settings_integrations_view.py @@ -133,18 +133,18 @@ def test_should_display_feed_urls(self): token = FeedToken.objects.first() self.assertInHTML( - f'All bookmarks', + f'All bookmarks', html, ) self.assertInHTML( - f'Unread bookmarks', + f'Unread bookmarks', html, ) self.assertInHTML( - f'Shared bookmarks', + f'Shared bookmarks', html, ) self.assertInHTML( - 'Public shared bookmarks', + 'Public shared bookmarks', html, ) diff --git a/bookmarks/views/settings.py b/bookmarks/views/settings.py index bfdf08385..ff096de31 100644 --- a/bookmarks/views/settings.py +++ b/bookmarks/views/settings.py @@ -176,18 +176,11 @@ def integrations(request): ) feed_token = FeedToken.objects.get_or_create(user=request.user)[0] - all_feed_url = request.build_absolute_uri( - reverse("linkding:feeds.all", args=[feed_token.key]) - ) - unread_feed_url = request.build_absolute_uri( - reverse("linkding:feeds.unread", args=[feed_token.key]) - ) - shared_feed_url = request.build_absolute_uri( - reverse("linkding:feeds.shared", args=[feed_token.key]) - ) - public_shared_feed_url = request.build_absolute_uri( - reverse("linkding:feeds.public_shared") - ) + + all_feed_url = reverse("linkding:feeds.all", args=[feed_token.key]) + unread_feed_url = reverse("linkding:feeds.unread", args=[feed_token.key]) + shared_feed_url = reverse("linkding:feeds.shared", args=[feed_token.key]) + public_shared_feed_url = reverse("linkding:feeds.public_shared") return render( request, diff --git a/docs/src/content/docs/options.md b/docs/src/content/docs/options.md index df10b5365..f1e4bdaa5 100644 --- a/docs/src/content/docs/options.md +++ b/docs/src/content/docs/options.md @@ -194,6 +194,14 @@ Multiple origins can be specified by separating them with a comma (`,`). This setting is adopted from the Django framework used by linkding, more information on the setting is available in the [Django documentation](https://docs.djangoproject.com/en/4.0/ref/settings/#std-setting-CSRF_TRUSTED_ORIGINS). +### `LD_USE_X_FORWARDED_HOST` + +Values: `true` or `false` | Default = `false` + +If enabled the server will trust the `X-Forwarded-Host` header over the `Host` header to determine the hostname of the server. This should only be enabled if a proxy which sets this header is in use. + +This setting is adopted from the Django framework used by linkding, more information on the setting is available in the [Django documentation](https://docs.djangoproject.com/en/6.0/ref/settings/#std-setting-USE_X_FORWARDED_HOST) + ### `LD_LOG_X_FORWARDED_FOR` Values: `true` or `false` | Default = `false` From 5f5ea73aec3a2c24ff038be1d62e26e380fd4fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= Date: Mon, 5 Jan 2026 09:33:27 +0100 Subject: [PATCH 4/5] Cleanup --- bookmarks/settings/base.py | 17 +++++++---------- docs/src/content/docs/options.md | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/bookmarks/settings/base.py b/bookmarks/settings/base.py index 44f881342..f73d34d22 100644 --- a/bookmarks/settings/base.py +++ b/bookmarks/settings/base.py @@ -29,6 +29,13 @@ ALLOWED_HOSTS = ["*"] +USE_X_FORWARDED_HOST = os.getenv("LD_USE_X_FORWARDED_HOST", False) in ( + True, + "True", + "true", + "1", +) + # Application definition INSTALLED_APPS = [ @@ -217,16 +224,6 @@ if LD_AUTH_PROXY_LOGOUT_URL: LOGOUT_REDIRECT_URL = LD_AUTH_PROXY_LOGOUT_URL -LD_USE_X_FORWARDED_HOST = os.getenv("LD_USE_X_FORWARDED_HOST", False) in ( - True, - "True", - "true", - "1", -) - -if LD_USE_X_FORWARDED_HOST: - USE_X_FORWARDED_HOST = LD_USE_X_FORWARDED_HOST - # CSRF trusted origins trusted_origins = os.getenv("LD_CSRF_TRUSTED_ORIGINS", "") if trusted_origins: diff --git a/docs/src/content/docs/options.md b/docs/src/content/docs/options.md index f1e4bdaa5..5bc09a7f9 100644 --- a/docs/src/content/docs/options.md +++ b/docs/src/content/docs/options.md @@ -200,7 +200,7 @@ Values: `true` or `false` | Default = `false` If enabled the server will trust the `X-Forwarded-Host` header over the `Host` header to determine the hostname of the server. This should only be enabled if a proxy which sets this header is in use. -This setting is adopted from the Django framework used by linkding, more information on the setting is available in the [Django documentation](https://docs.djangoproject.com/en/6.0/ref/settings/#std-setting-USE_X_FORWARDED_HOST) +This setting is adopted from the Django framework used by linkding, more information on the setting is available in the [Django documentation](https://docs.djangoproject.com/en/6.0/ref/settings/#std-setting-USE_X_FORWARDED_HOST). ### `LD_LOG_X_FORWARDED_FOR` From f7229a06fc771f4d5e8deac67902b387eb4832c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Mendes?= Date: Mon, 5 Jan 2026 08:35:42 +0000 Subject: [PATCH 5/5] Add linkdinger to community projects (#1266) --- docs/src/content/docs/community.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/content/docs/community.md b/docs/src/content/docs/community.md index 5e236bf8f..2b6b404ba 100644 --- a/docs/src/content/docs/community.md +++ b/docs/src/content/docs/community.md @@ -21,6 +21,7 @@ This section lists community projects around using linkding, in alphabetical ord - [linkding-api](https://github.com/vbsampath/linkding-api) A Javascript library implementing linkding REST API by [vbsampath](https://github.com/vbsampath) - [linkding-archiver](https://github.com/sebw/linkding-archiver) A Python application that integrates with SingleFile and Tube Archivist to archive your links and videos. By [sebw](https://github.com/sebw) - [linkding-cli](https://github.com/bachya/linkding-cli) A command-line interface (CLI) to interact with the linkding REST API. Powered by [aiolinkding](https://github.com/bachya/aiolinkding). By [bachya](https://github.com/bachya) +- [linkdinger](https://github.com/lmmendes/linkdinger) A Telegram bot that saves links directly to Linkding, with support for tags, notes, and searching bookmarks. By [lmmendes](https://github.com/lmmendes) - [linkding-extension](https://github.com/jeroenpardon/linkding-extension) Chromium compatible extension that wraps the linkding bookmarklet. Tested with Chrome, Edge, Brave. By [jeroenpardon](https://github.com/jeroenpardon) - [linkding-healthcheck](https://github.com/sebw/linkding-healthcheck) A Go application that checks the health of your bookmarks and add a tag on dead and problematic URLs. By [sebw](https://github.com/sebw) - [linkding-injector](https://github.com/Fivefold/linkding-injector) Injects search results from linkding into the sidebar of search pages like google and duckduckgo. Tested with Firefox and Chrome. By [Fivefold](https://github.com/Fivefold)