Limit number of tags shown in the navigation bar to only the most popular ones.

boards/forms.py

@@ -38,7 +38,7 b' class PostForm(forms.Form):'
 
 
 class ThreadForm(PostForm):
-    INVALID_TAG_CHARACTERS = ['+', '/', '&', '=', '?', '-']
+    INVALID_TAG_CHARACTERS = ['+', '/', '&', '=', '?', '-', '.', ',']
 
     tags = forms.CharField(max_length=100)
 

boards/models.py

@@ -137,6 +137,14 b' class TagManager(models.Manager):'
 
         return tags
 
+    def get_popular_tags(self):
+        all_tags = self.get_not_empty_tags()
+
+        sorted_tags = sorted(all_tags, key=lambda tag: tag.get_popularity(),
+                             reverse=True)
+
+        return sorted_tags[:settings.POPULAR_TAGS]
+
 
 class Tag(models.Model):
     """
@@ -160,6 +168,14 b' class Tag(models.Model):'
         posts_with_tag = Post.objects.get_threads(tag=self)
         return len(posts_with_tag)
 
+    def get_popularity(self):
+        posts_with_tag = Post.objects.get_threads(tag=self)
+        reply_count = 0
+        for post in posts_with_tag:
+            reply_count += post.get_reply_count()
+
+        return reply_count
+
 
 class Post(models.Model):
     """A post is a message."""

boards/static/css/md/base_page.css

@@ -17,14 +17,6 b' html {'
     color: #afdcec;
 }
 
-.link:hover, a:hover {
-    color: #fff380;
-}
-
-.post_id:hover {
-    color: #ccc555;
-}
-
 .block {
     display: inline-block;
     vertical-align: top;
@@ -34,10 +26,6 b' html {'
     color: #b4cfec;
 }
 
-.tag:hover {
-    color: #d0edb4;
-}
-
 .post_id {
     color: #fff380;
 }
@@ -192,4 +180,8 b' blockquote {'
 
 .comment {
     color: darkseagreen;
-}
  No newline at end of file
+}
+
+a:hover {
+    text-decoration: underline;
+}

boards/urls.py

@@ -21,4 +21,5 b" urlpatterns = patterns('',"
     url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
     # /boards/theme/theme_name/
     url(r'^settings$', views.settings, name='settings'),
+    url(r'^tags$', views.all_tags, name='tags'),
 )

boards/views.py

@@ -20,7 +20,7 b' def index(request, page=0):'
         # TODO Get rid of the duplicate code in index and tag views
         context['threads'] = None if len(threads) == 0 else threads
         context['form'] = forms.ThreadForm()
-        context['tags'] = Tag.objects.get_not_empty_tags()
+        context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
         context['pages'] = range(Post.objects.get_thread_page_count())
 
@@ -94,7 +94,7 b' def tag(request, tag_name, page=0):'
         context = RequestContext(request)
         context['threads'] = None if len(threads) == 0 else threads
         context['tag'] = tag_name
-        context['tags'] = Tag.objects.get_not_empty_tags()
+        context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
         context['pages'] = range(Post.objects.get_thread_page_count(tag=tag))
 
@@ -117,7 +117,7 b' def thread(request, post_id):'
 
         context['posts'] = posts
         context['form'] = forms.PostForm()
-        context['tags'] = Tag.objects.get_not_empty_tags()
+        context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
 
         return render(request, 'thread.html', context)
@@ -165,11 +165,20 b' def settings(request):'
         selected_theme = _get_theme(request)
         form = SettingsForm(initial={'theme': selected_theme})
         context['form'] = form
-        context['tags'] = Tag.objects.get_not_empty_tags()
+        context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
 
         return render(request, 'settings.html', context)
 
 
+def all_tags(request):
+    context = RequestContext(request)
+    context['tags'] = Tag.objects.get_popular_tags()
+    context['theme'] = _get_theme(request)
+    context['all_tags'] = Tag.objects.get_not_empty_tags()
+
+    return render(request, 'tags.html', context)
+
+
 def _get_theme(request):
     return request.session.get('theme', neboard.settings.DEFAULT_THEME)
  No newline at end of file

neboard/settings.py

@@ -169,6 +169,9 b' LOGGING = {'
     }
 }
 
+MARKUP_FIELD_TYPES = (
+    ('markdown', markdown_extended),
+)
 # Custom imageboard settings
 MAX_POSTS_PER_THREAD = 10 # Thread bumplimit
 MAX_THREAD_COUNT = 500 # Old threads will be deleted to preserve this count
@@ -180,6 +183,4 b' THEMES = ['
     ('sw', 'Snow White') ]
 DEFAULT_THEME = 'md'
 
-MARKUP_FIELD_TYPES = (
-    ('markdown', markdown_extended),
-)
  No newline at end of file
+POPULAR_TAGS=10
  No newline at end of file

templates/base.html

@@ -26,6 +26,7 b''
         <a class="tag" href=" {% url 'tag' tag_name=tag.name %}">
             {{ tag.name }}</a>({{ tag.get_post_count }})
     {% endfor %}
+    <a class="tag" href="{% url 'tags' %}">[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 

templates/posting_general.html

@@ -35,9 +35,6 b''
                 {% endautoescape %}
             </div>
                 <div class="metadata">
-                    {{ thread.get_reply_count }} {% trans 'replies' %},
-                    {{ thread.get_images_count }} {% trans 'images' %},
-                    {{ thread.get_gets_count }} {% trans 'gets' %}.
                     {% if thread.tags.all %}
                         <span class="tags">{% trans 'Tags' %}:
                             {% for tag in thread.tags.all %}
@@ -46,7 +43,10 b''
                                     {{ tag.name }}</a>
                             {% endfor %}
                         </span>
-                    {% endif %}
+                    {% endif %},
+                    {{ thread.get_reply_count }} {% trans 'replies' %},
+                    {{ thread.get_images_count }} {% trans 'images' %}.
+                    {% trans 'Last update: ' %}{{ thread.last_edit_time }}
                 </div>
             </div>
         {% endfor %}

templates/tags.html

@@ -4,89 +4,21 b''
 {% load markup %}
 
 {% block head %}
-    <title>Neboard - {{ posts.0.title }}</title>
+    <title>Neboard - {% trans "tags" %}</title>
 {% endblock %}
 
 {% block content %}
 
-	{% if posts %}
-		{% for post in posts %}
-            <a id="{{ post.id }}"></a>
-            <div class="post">
-            {% if post.image %}
-                <div class="image">
-                    <a href="{{ post.image.url }}"><img
-                        src="{{ post.image.url_200x150 }}" />
-                    </a>
-                </div>
-            {% endif %}
-            <div class="message">
-                <span class="title">{{ post.title }}</span>
-                <a class="post_id" href="#{{ post.id }}">
-                    (#{{ post.id }})</a>
-                [{{ post.pub_time }}]
-                {% if post.is_get %}
-                    <span class="get">
-                        {% trans "Get!" %}
-                    </span>
-                {% endif %}
-                {% autoescape off %}
-                {{ post.text.rendered }}
-                {% endautoescape %}
-            </div>
-            {% if post.tags.all %}
-                <div class="metadata">
-                    <span class="tags">{% trans 'Tags' %}:
-                        {% for tag in post.tags.all %}
-                            <a class="tag" href="{% url 'tag' tag.name %}">
-                                {{ tag.name }}</a>
-                        {% endfor %}
-                    </span>
-                </div>
-            {% endif %}
-            </div>
+    <div class="post">
+	{% if tags %}
+		{% for tag in all_tags %}
+            <a class="tag" href="{% url 'tag' tag.name %}">
+                {{ tag.name }}</a><br />
 		{% endfor %}
 	{% else %}
-		No threads found.
+		No tags found.
         <hr />
 	{% endif %}
-
-    <form id="form" enctype="multipart/form-data" method="post"
-            >{% csrf_token %}
-        <div class="post-form-w">
-            <div class="form-title">{% trans "Reply to thread" %}</div>
-            <div class="post-form">
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Title' %}</div>
-                    <div class="form-input">{{ form.title }}</div>
-                </div>
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Text' %}</div>
-                    <div class="form-input">{{ form.text }}</div>
-                </div>
-                <div class="form-row">
-                    <div class="form-label">{% trans 'Image' %}</div>
-                    <div class="form-input">{{ form.image }}</div>
-                </div>
-            </div>
-            <div class="form-submit"><input type="submit"
-                                            value="{% trans "Post" %}"/></div>
-            <div>Use <a
-                    href="http://daringfireball.net/projects/markdown/basics">
-                markdown</a> syntax for posting.</div>
-            <div>Example: *<i>italic</i>*, **<b>bold</b>**</div>
-            <div>Insert quotes with "&gt;"</div>
-        </div>
-    </form>
-
-{% endblock %}
-
-{% block metapanel %}
-
-    <span class="metapanel">
-        {{ posts.0.get_reply_count }} {% trans 'replies' %},
-        {{ posts.0.get_images_count }} {% trans 'images' %},
-        {{ posts.0.get_gets_count }} {% trans 'gets' %}
-    </span>
+    </div>
 
 {% endblock %}
  No newline at end of file

templates/thread.html

@@ -85,8 +85,8 b''
 
     <span class="metapanel">
         {{ posts.0.get_reply_count }} {% trans 'replies' %},
-        {{ posts.0.get_images_count }} {% trans 'images' %},
-        {{ posts.0.get_gets_count }} {% trans 'gets' %}
+        {{ posts.0.get_images_count }} {% trans 'images' %}.
+        {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
     </span>
 
 {% endblock %}
  No newline at end of file