Since we show sections on the landing page now, always show all tags in the tags view

boards/models/tag.py

@@ -25,7 +25,7 b' class TagManager(models.Manager):'
         """
 
         return self.annotate(num_threads=Count('thread_tags')).filter(num_threads__gt=0)\
-            .order_by('-required', 'name')
+            .order_by('name')
 
     def get_tag_url_list(self, tags: list) -> str:
         """

boards/templates/boards/all_threads.html

@@ -176,7 +176,6 b''
             </div>
             <div id="preview-text"></div>
             <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
-            <div><a href="{% url "tags" "required" %}">{% trans 'Tags' %}</a></div>
         </div>
     </div>
 

boards/templates/boards/base.html

@@ -41,7 +41,7 b''
             </form>
             {{ tags_str|safe }},
         {% endif %}
-        <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
+        <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">{% trans 'search' %}</a>,
         <a href="{% url 'feed' %}" title="{% trans 'Feed' %}">{% trans 'feed' %}</a>,
         <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'images' %}</a>{% if has_fav_threads %},

boards/templates/boards/tags.html

@@ -3,31 +3,16 b''
 {% load i18n %}
 
 {% block head %}
-    <title>Neboard - {% trans "Tags" %}</title>
+    <title>{{ site_name }} - {% trans "Tags" %}</title>
 {% endblock %}
 
 {% block content %}
 
-{% regroup section_tags by get_first_letter as section_tag_list %}
 {% regroup all_tags by get_first_letter as other_tag_list %}
 
 <div class="post">
-    {% if section_tags %}
-        <div>
-        {% trans 'Sections:' %}
-        {% for letter in section_tag_list %}
-            <br />({{ letter.grouper|upper }})
-            {% for tag in letter.list %}
-                {% autoescape off %}
-                    {{ tag.get_view }}{% if not forloop.last %},{% endif %}
-                {% endautoescape %}
-            {% endfor %}
-        {% endfor %}
-        </div>
-    {% endif %}
     {% if all_tags %}
         <div>
-        {% trans 'Other tags:' %}
         {% for letter in other_tag_list %}
             <br />({{ letter.grouper|upper }})
             {% for tag in letter.list %}
@@ -38,10 +23,6 b''
         {% endfor %}
         </div>
     {% endif %}
-
-    {% if query %}
-        <div><a href="{% url 'tags' %}">{% trans 'All tags...' %}</a></div>
-    {% endif %}
 </div>
 
 {% endblock %}

boards/urls.py

@@ -42,7 +42,7 b' urlpatterns = ['
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^aliases/(?P<category>\w+)/$', alias.AliasesView.as_view(), name='aliases'),
-    url(r'^tags/(?P<query>\w+)?/?$', all_tags.AllTagsView.as_view(), name='tags'),
+    url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
 
     url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),

boards/views/all_tags.py

@@ -4,20 +4,14 b' from boards.views.base import BaseBoardV'
 from boards.models.tag import Tag
 
 
-PARAM_SECTION_TAGS = 'section_tags'
 PARAM_TAGS = 'all_tags'
-PARAM_QUERY = 'query'
 
 
 class AllTagsView(BaseBoardView):
 
-    def get(self, request, query=None):
+    def get(self, request):
         params = dict()
 
-        params[PARAM_SECTION_TAGS] = Tag.objects.filter(required=True)
-        if query != 'required':
-            params[PARAM_TAGS] = Tag.objects.get_not_empty_tags().filter(
-                    required=False)
-        params[PARAM_QUERY] = query
+        params[PARAM_TAGS] = Tag.objects.get_not_empty_tags()
 
         return render(request, 'boards/tags.html', params)