8000 [pull] master from sissbruecker:master by pull[bot] · Pull Request #117 · bryanwills/linkding · GitHub
[go: up one dir, main page]
Skip to content

[pull] master from sissbruecker:master #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 14, 2026
Merged

[pull] master from sissbruecker:master #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bookmarks/styles/bookmark-details.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@
color: var(--alternative-color);
}

& .tags a::before {
content: "#";
}

& .status form {
display: flex;
gap: var(--unit-2);
Expand Down
3 changes: 3 additions & 0 deletions bookmarks/styles/bookmark-page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ ul.bookmark-list {
& a:visited:hover {
color: var(--alternative-color);
}
& a::before {
content: "#";
}
& a:not(:last-child) {
margin-right: var(--unit-1);
}
Expand Down
4 changes: 2 additions & 2 deletions bookmarks/templates/bookmarks/bookmark_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
8000 <div class="description inline truncate">
{% if bookmark_item.tags %}
<span class="tags">
{% for tag in bookmark_item.tags %}<a href="?{{ tag.query_string }}">#{{ tag.name }}</a>{% endfor %}
{% for tag in bookmark_item.tags %}<a href="?{{ tag.query_string }}">{{ tag.name }}</a>{% endfor %}
</span>
{% endif %}
{% if bookmark_item.tags and bookmark_item.description %}|{% endif %}
Expand All @@ -51,7 +51,7 @@
{% if bookmark_item.description %}<div class="description separate">{{ bookmark_item.description }}</div>{% endif %}
{% if bookmark_item.tags %}
<div class="tags">
{% for tag in bookmark_item.tags %}<a href="?{{ tag.query_string }}">#{{ tag.name }}</a>{% endfor %}
{% for tag in bookmark_item.tags %}<a href="?{{ tag.query_string }}">{{ tag.name }}</a>{% endfor %}
</div>
{% endif %}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion bookmarks/templates/bookmarks/details/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h3>Files</h3>
<h3 id="details-modal-tags-title">Tags</h3>
<div>
{% for tag in details.tags %}
8000 <a href="{% url 'linkding:bookmarks.index' %}?{{ tag.query_string }}">#{{ tag.name }}</a>
<a href="{% url 'linkding:bookmarks.index' %}?{{ tag.query_string }}">{{ tag.name }}</a>
{% endfor %}
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion bookmarks/tests/test_bookmark_details_modal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ def test_tags(self):
section = self.get_section_content(soup, "Tags")

for tag in bookmark.tags.all():
tag_link = section.find("a", string=f"#{tag.name}")
tag_link = section.find("a", string=tag.name)
self.assertIsNotNone(tag_link)
expected_url = reverse("linkding:bookmarks.index") + f"?q=%23{tag.name}"
self.assertEqual(tag_link["href"], expected_url)
Expand Down
10 10000 changes: 5 additions & 5 deletions bookmarks/tests/test_bookmarks_list_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def inline_bookmark_description_test(self, bookmark):
self.assertEqual(len(tag_links), len(bookmark.tags.all()))

for tag in bookmark.tags.all():
tag_link = tags.find("a", string=f"#{tag.name}")
tag_link = tags.find("a", string=tag.name)
self.assertIsNotNone(tag_link)
self.assertEqual(tag_link["href"], f"?q=%23{tag.name}")

Expand Down Expand Up @@ -406,7 +406,7 @@ def separate_bookmark_description_test(self, bookmark):
self.assertEqual(len(tag_links), len(bookmark.tags.all()))

for tag in bookmark.tags.all():
tag_link = tags.find("a", string=f"#{tag.name}")
tag_link = tags.find("a", string=tag.name)
self.assertIsNotNone(tag_link)
self.assertEqual(tag_link["href"], f"?q=%23{tag.name}")

Expand Down Expand Up @@ -470,9 +470,9 @@ def test_bookmark_tag_ordering(self):
tags = soup.select_one(".tags")
tag_links = tags.find_all("a")
self.assertEqual(len(tag_links), 3)
self.assertEqual(tag_links[0].text, "#tag1")
self.assertEqual(tag_links[1].text, "#tag2")
self.assertEqual(tag_links[2].text, "#tag3")
self.assertEqual(tag_links[0].text, "tag1")
self.assertEqual(tag_links[1].text, "tag2")
self.assertEqual(tag_links[2].text, "tag3")

def test_bookmark_tag_query_string(self):
# appends tag to existing query string
Expand Down
2 changes: 1 addition & 1 deletion bookmarks/tests/test_bundles_preview_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_preview_renders_bookmark(self):
self.assertContains(response, bookmark.title)
self.assertContains(response, bookmark.description)
self.assertContains(response, bookmark.url)
self.assertContains(response, "#test-tag")
self.assertContains(response, "test-tag")

def test_preview_renders_bookmark_in_preview_mode(self):
tag = self.setup_tag(name="test-tag")
Expand Down
Loading
0