Private
Public Access
Folders are gone — organization is tags-only, via the SubscriptionTag model added last commit. A migration converts every existing Folder into a same-named Tag applied to its feeds, and every folder-scoped FilterRule into an equivalent tag-scoped one, before the Folder table is dropped, so upgrading an existing instance loses nothing (verified by seeding the pre-removal schema directly and running the migration chain against it). Unlike folders, a feed can carry more than one tag, so: - apps.articles.tasks.apply_filter_rules_for_feed and apps.rules.tasks's backlog re-apply now scope by "does this feed carry tag X" rather than "does this feed belong to folder X". - apps.feeds.opml: a feed's tags export as a comma-separated "category" attribute (the standard OPML way to represent multiple categories) instead of nesting under one folder outline. Import reads both that attribute and nested category outlines, turning each enclosing level into its own tag rather than collapsing to the nearest one. - The sidebar groups feeds by tag instead of folder, so a feed with two tags now appears in both groups; untagged feeds fall into "Untagged". AddFeedForm gained a comma-separated tag_names field for parity with the old add-time folder picker. EditSubscriptionForm dropped its folder field entirely — tagging a subscription happens through the tag editor already on that page. Verified end to end: the migration chain from empty, the data migration against a seeded pre-removal schema (folder/subscription/rule all convert correctly), and the running app's sidebar grouping, OPML export category attributes, and tag editor. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
77 lines
3.2 KiB
HTML
77 lines
3.2 KiB
HTML
<nav class="sidebar" aria-label="Feeds and tags">
|
|
<div class="sidebar-brand">
|
|
<a href="{% url 'reader:stream' %}">Evection</a>
|
|
</div>
|
|
|
|
<a href="{% url 'feeds:subscription_list' %}" class="sidebar-manage-btn">Subscription management</a>
|
|
|
|
<ul class="sidebar-top-nav">
|
|
<li>
|
|
<a href="{% url 'reader:stream' %}?filter=all"
|
|
class="{% if not request.GET.tag and not request.GET.feed and request.GET.filter == 'all' %}active{% endif %}">
|
|
All articles
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{% url 'reader:stream' %}?filter=starred"
|
|
class="{% if request.GET.filter == 'starred' %}active{% endif %}">
|
|
Favourites{% if sidebar_starred_count %} ({{ sidebar_starred_count }}){% endif %}
|
|
</a>
|
|
</li>
|
|
<li>
|
|
<a href="{% url 'reader:stream' %}?filter=saved"
|
|
class="{% if request.GET.filter == 'saved' %}active{% endif %}">
|
|
Saved for later
|
|
</a>
|
|
</li>
|
|
</ul>
|
|
|
|
{% for entry in sidebar_tag_groups %}
|
|
<details class="sidebar-section" open>
|
|
<summary>
|
|
<a href="{% url 'reader:stream' %}?tag={{ entry.tag.pk }}"
|
|
class="sidebar-tag-link{% if request.GET.tag == entry.tag.pk|stringformat:'s' %} active{% endif %}">{{ entry.tag.name }}</a>
|
|
</summary>
|
|
{% if entry.subscriptions %}
|
|
<ul class="sidebar-item-list">
|
|
{% for subscription in entry.subscriptions %}
|
|
<li>
|
|
<a href="{% url 'reader:stream' %}?feed={{ subscription.feed_id }}"
|
|
class="sidebar-feed-link{% if request.GET.feed == subscription.feed_id|stringformat:'s' %} active{% endif %}">
|
|
{% if subscription.feed.favicon_url %}<img src="{{ subscription.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
|
|
<span>{{ subscription.display_title }}</span>
|
|
</a>
|
|
{% if subscription.unread_count %}<span class="unread-count">{{ subscription.unread_count }}</span>{% endif %}
|
|
</li>
|
|
{% endfor %}
|
|
</ul>
|
|
{% endif %}
|
|
</details>
|
|
{% endfor %}
|
|
|
|
{% if sidebar_untagged %}
|
|
<details class="sidebar-section" open>
|
|
<summary>Untagged</summary>
|
|
<ul class="sidebar-item-list">
|
|
{% for subscription in sidebar_untagged %}
|
|
<li>
|
|
<a href="{% url 'reader:stream' %}?feed={{ subscription.feed_id }}"
|
|
class="sidebar-feed-link{% if request.GET.feed == subscription.feed_id|stringformat:'s' %} active{% endif %}">
|
|
{% if subscription.feed.favicon_url %}<img src="{{ subscription.feed.favicon_url }}" alt="" class="feed-favicon">{% endif %}
|
|
<span>{{ subscription.display_title }}</span>
|
|
</a>
|
|
{% if subscription.unread_count %}<span class="unread-count">{{ subscription.unread_count }}</span>{% endif %}
|
|
</li>
|
|
{% endfor %}
|
|
</ul>
|
|
</details>
|
|
{% endif %}
|
|
|
|
<ul class="sidebar-top-nav sidebar-footer-nav">
|
|
<li><a href="{% url 'articles:tag_list' %}">Manage tags</a></li>
|
|
<li><a href="{% url 'rules:rule_list' %}">Rules</a></li>
|
|
{% if request.user.is_staff %}<li><a href="{% url 'core:dashboard' %}">Dashboard</a></li>{% endif %}
|
|
<li><a href="{% url 'accounts:logout' %}">Log out</a></li>
|
|
</ul>
|
|
</nav>
|