Fixed medadata design when an image is present. Added a method to determine if the tag is empty (has no attached threads).

boards/models.py

@@ -1,186 +1,190 b''
 import os
 import re
 from django.db import models
 from django.utils import timezone
 import time
 
 from neboard import settings
 
 import thumbs
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 
 
 def update_image_filename(instance, filename):
     """Get unique image filename"""
 
     path = 'images/'
     new_name = str(int(time.mktime(time.gmtime()))) + '_' + filename
     return os.path.join(path, new_name)
 
 
 class PostManager(models.Manager):
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
                     ip=NO_IP, tags=None):
         post = self.create(title=title,
                            text=text,
                            pub_time=timezone.now(),
                            parent=parent_id,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,
                            last_edit_time=timezone.now())
 
         if tags:
             for tag in tags:
                 post.tags.add(tag)
 
         if parent_id != NO_PARENT:
             parent = self.get(id=parent_id)
             parent.last_edit_time=timezone.now()
             parent.save()
         else:
             self._delete_old_threads()
 
         return post
 
     def delete_post(self, post):
         children = self.filter(parent=post.id)
         for child in children:
             self.delete_post(child)
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         posts = self.filter(poster_ip=ip)
         for post in posts:
             self.delete_post(post)
 
     def get_threads(self, tag=None):
         if tag:
             threads = self.filter(parent=NO_PARENT, tags=tag)
         else:
             threads = self.filter(parent=NO_PARENT)
         threads = list(threads.order_by('-last_edit_time'))
 
         return threads
 
     def get_thread(self, opening_post_id):
         opening_post = self.get(id=opening_post_id)
         replies = self.filter(parent=opening_post_id)
 
         thread = [opening_post]
         thread.extend(replies)
 
         return thread
 
     def exists(self, post_id):
         posts = self.filter(id=post_id)
 
         return len(posts) > 0
 
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         delete the old ones.
         """
 
         # TODO Try to find a better way to get the active thread count.
 
         # TODO Move old threads to the archive instead of deleting them.
         # Maybe make some 'old' field in the model to indicate the thread
         # must not be shown and be able for replying.
 
         threads = self.get_threads()
         thread_count = len(threads)
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[-num_threads_to_delete:]
 
             for thread in old_threads:
                 self.delete_post(thread)
 
 
 class Tag(models.Model):
     """
     A tag is a text node assigned to the post. The tag serves as a board
     section. There can be multiple tags for each message
     """
 
     name = models.CharField(max_length=100)
     # TODO Connect the tag to its posts to check the number of threads for
     # the tag.
 
     def __unicode__(self):
         return self.name
 
+    def is_empty(self):
+        posts_with_tag = Post.objects.get_threads(tag=self)
+        return len(posts_with_tag) == 0
+
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     title = models.CharField(max_length=50)
     pub_time = models.DateTimeField()
     text = models.TextField()
     image = thumbs.ImageWithThumbsField(upload_to=update_image_filename,
                                         blank=True, sizes=((200, 150),))
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
     last_edit_time = models.DateTimeField()
 
     def __unicode__(self):
         return self.title + ' (' + self.text + ')'
 
     def _get_replies(self):
         return Post.objects.filter(parent=self.id)
 
     def get_reply_count(self):
         return len(self._get_replies())
 
     def get_images_count(self):
         images_count = 1 if self.image else 0
         for reply in self._get_replies():
             if reply.image:
                 images_count += 1
 
         return images_count
 
     def get_gets_count(self):
         gets_count = 1 if self.is_get() else 0
         for reply in self._get_replies():
             if reply.is_get():
                 gets_count += 1
 
         return gets_count
 
     def is_get(self):
         """If the post has pretty id (1, 1000, 77777), than it is called GET"""
 
         # TODO Make a better algorithm for describing gets
         return self.id == 1 or self.id % 10 == 0
 
     def get_parsed_text(self):
         text = self.text
 
         # TODO Implement parsing
         # Make //text colored
         # Make >>12 links to posts
 
         return text
 
 
 class Admin(models.Model):
     """
     Model for admin users
     """
     name = models.CharField(max_length=100)
     password = models.CharField(max_length=100)
 
     def __unicode__(self):
         return self.name + '/' + '*' * len(self.password)
 

boards/static/css/base_page.css

@@ -1,80 +1,79 b''
 html {
     background: #555;
     color: #ffffff;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .title {
     font-weight: bold;
     color: #ffcc00;
 }
 
 .post-form {
     text-align: left;
     display: table;
     border-radius: 5px;
     padding: 5px;
     margin: 5px;
     background: #334;
 }
 
 .form-row {
     display: table-row;
 }
 
 .form-input {
     display: table-cell;
 }
 
 .link {
     color: #afdcec;
 }
 
 .link:hover {
     color: #fff380;
 }
 
 .post_id {
     color: #ffffff;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #b4cfec;
 }
 
 .tag:hover {
     color: #d0edb4;
 }
 
 .post_id {
     color: #fff380;
 }
 
 .post {
     background: #333;
     margin: 5px;
     padding: 10px;
     border-radius: 5px;
 }
 
 .form-title {
     font-weight: bolder;
 }
 
 .metadata {
-    float: left;
     padding: 2px;
     margin-top: 10px;
     border: solid 1px #666;
     font-size: 0.9em;
     color: #ddd
 }
  No newline at end of file

templates/posting_general.html

@@ -1,72 +1,72 b''
 {% extends "base.html" %}
 
 {% load i18n %}
 
 {% block content %}
 
 	{% if threads %}
 		{% for thread in threads %}
             <div class="post">
             {% if thread.image %}
                 <div class="block">
                     <a href="{{ thread.image.url }}"><img
                             src="{{ thread.image.url_200x150 }}" />
                     </a>
                 </div>
             {% endif %}
             <div class="block">
                 <span class="title">{{ thread.title }}</span>
                 <span class="post_id">(#{{ thread.id }})</span>
                 [{{ thread.pub_time }}]
                 [<a class="link" href="{% url 'thread' thread.id %}"
                     >{% trans "View" %}</a>]<br />
                 {{ thread.get_parsed_text|linebreaksbr|truncatechars:300 }}<br
                     />
+            </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 %}
                                 <a class="tag" href="
                                 {% url 'tag' tag_name=tag.name %}">
                                     {{ tag.name }}</a>
                             {% endfor %}
                         </span>
                     {% endif %}
                 </div>
             </div>
-            </div>
         {% endfor %}
 	{% else %}
 		No threads found.
         <hr />
 	{% endif %}
 
     <div class="post-form">
         <span class="form-title">{% trans "Create new thread" %}</span>
         <form enctype="multipart/form-data" method="post">{% csrf_token %}
             <div class="form-row">
                 <div class="form-input">{% trans 'Title' %}</div>
                 <div class="form-input">{{ form.title }}</div>
             </div>
             <div class="form-row">
                 <div class="form-input">{% trans 'Text' %}</div>
                 <div class="form-input">{{ form.text }}</div>
             </div>
             <div class="form-row">
                 <div class="form-input">{% trans 'Image' %}</div>
                 <div class="form-input">{{ form.image }}</div>
             </div>
             <div class="form-row">
                 <div class="form-input">{% trans 'Tags' %}</div>
                 <div class="form-input">{{ form.tags }}</div>
             </div>
             <input type="submit" value="{% trans 'Post' %}" />
             <hr />
             {% trans "Tags must be delimited by spaces. Text or image is required." %}
         </form>
     </div>
 
 {% endblock %}
  No newline at end of file

templates/thread.html

@@ -1,61 +1,61 b''
 {% extends "base.html" %}
 
 {% load i18n %}
 
 {% block content %}
 
 	{% if posts %}
 		{% for post in posts %}
             <a name="{{ post.id }}"></a>
             <div class="post">
             {% if post.image %}
                 <div class="block">
                     <a href="{{ post.image.url }}"><img
                         src="{{ post.image.url_200x150 }}" />
                     </a>
                 </div>
             {% endif %}
             <div class="block">
                 <span class="title">{{ post.title }}</span>
                 <a class="post_id" href="#{{ post.id }}">
                     (#{{ post.id }})</a>
                 [{{ post.pub_time }}]<br />
                 {{ post.get_parsed_text|linebreaksbr }}<br />
-                {% 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>
+            {% 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>
 		{% endfor %}
 	{% else %}
 		No threads found.
         <hr />
 	{% endif %}
 
     <div class="post-form">
         <span class="form-title">{% trans "Reply to the thread" %}</span>
         <form enctype="multipart/form-data" method="post">{% csrf_token %}
             <div class="form-row">
                 <div class="form-input">{% trans 'Title' %}</div>
                 <div class="form-input">{{ form.title }}</div>
             </div>
             <div class="form-row">
                 <div class="form-input">{% trans 'Text' %}</div>
                 <div class="form-input">{{ form.text }}</div>
             </div>
             <div class="form-row">
                 <div class="form-input">{% trans 'Image' %}</div>
                 <div class="form-input">{{ form.image }}</div>
             </div>
             <input type="submit" value="{% trans 'Post' %}" />
         </form>
     </div>
 
 {% endblock %}
  No newline at end of file