Added localization (not fully working). Added tags posting. Changed the design a bit.

locale/ru/LC_MESSAGES/django.po

@@ -0,0 +1,38 b''
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-05 20:55+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+msgid "Title"
+msgstr "Заголовок"
+
+msgid "Text"
+msgstr "Текст"
+
+msgid "Image"
+msgstr "Картинка"
+
+msgid "Post"
+msgstr "Отправить"
+
+msgid "Tags"
+msgstr "Теги"
+
+msgid "View"
+msgstr "Просмотр"
  No newline at end of file

boards/forms.py

@@ -1,8 +1,8 b''
 from django import forms
 
 
 class NewThreadForm(forms.Form):
-    title = forms.CharField(max_length = 100)
-    text = forms.CharField(widget = forms.Textarea)
+    title = forms.CharField(max_length=100)
+    text = forms.CharField(widget=forms.Textarea)
     image = forms.ImageField()
     tags = forms.CharField(max_length=100)

boards/models.py

@@ -1,97 +1,101 b''
 from django.db import models
 from django.utils import timezone
 
 from neboard import settings
 
 import thumbs
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 
 
 class PostManager(models.Manager):
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
-                    ip=NO_IP):
+                    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)
 
+        if tags:
+            for tag in tags:
+                post.tags.add(tag)
+
         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 is None:
             threads = self.filter(parent=NO_PARENT)
         else:
             threads = self.filter(parent=NO_PARENT, tag=tag)
 
         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
 
 
 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)
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     title = models.CharField(max_length=100)
     pub_time = models.DateTimeField()
     text = models.TextField()
     image = thumbs.ImageWithThumbsField(upload_to='images/',
                                         blank=True, sizes=((200, 150),))
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
 
     def __unicode__(self):
         return self.title + ' (' + self.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,39 +1,53 b''
 html {
     background: #333;
+    color: #ffffff;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .title {
     font-weight: bold;
     color: #ffcc00;
 }
 
-.text {
-    color: #ffffff;
-}
-
 .post-form {
     text-align: left;
     color: #ffffff;
+    display: table;
+}
+
+.form-row {
+    display: table-row;
+}
+
+.form-input {
+    display: table-cell;
 }
 
 .link {
     color: #33bb33;
 }
 
 .link:hover {
     color: #00ff00;
 }
 
 .post_id {
     color: #ffffff;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
+}
+
+.tag {
+    color: #bb7766;
+}
+
+.tag:hover {
+    color: #dd8888;
 }
  No newline at end of file

boards/tests.py

@@ -1,97 +1,102 b''
 from django.utils.unittest import TestCase
 from django.test.client import Client
 
 import boards
 
-from boards.models import Post, Admin
+from boards.models import Post, Admin, Tag
 
 
 class BoardTests(TestCase):
     def _create_post(self):
         return Post.objects.create_post(title='title',
                                         text='text')
 
     def test_post_add(self):
         post = self._create_post()
 
         self.assertIsNotNone(post)
         self.assertEqual(boards.models.NO_PARENT, post.parent)
 
     def test_delete_post(self):
         post = self._create_post()
         post_id = post.id
 
         Post.objects.delete_post(post)
 
         self.assertFalse(Post.objects.exists(post_id))
 
     def test_delete_posts_by_ip(self):
         post = self._create_post()
         post_id = post.id
 
         Post.objects.delete_posts_by_ip('0.0.0.0')
 
         self.assertFalse(Post.objects.exists(post_id))
 
     # Authentication tests
 
     def _create_test_user(self):
         admin = Admin(name='test_username12313584353165',
                       password='test_userpassword135135512')
 
         admin.save()
         return admin
 
     def test_admin_login(self):
         client = Client()
 
         self.assertFalse('admin' in client.session)
 
         admin = self._create_test_user()
 
         response = client.post('/login',
                                {'name': admin.name, 'password': admin.password})
 
         # it means that login passed and user are redirected to another page
         self.assertEqual(302, response.status_code)
 
         self.assertTrue('admin' in client.session)
         self.assertTrue(client.session['admin'])
 
         admin.delete()
 
         wrong_name = 'sd2f1s3d21fs3d21f'
         wrong_password = 'sd2f1s3d21fs3d21fsdfsd'
 
         client.post('/login', {'name': wrong_name, 'password': wrong_password})
         self.assertFalse(client.session['admin'])
 
     def test_admin_logout(self):
         client = Client()
 
         self.assertFalse('admin' in client.session)
 
         admin = self._create_test_user()
 
         client.post('/login',
                     {'name': admin.name, 'password': admin.password})
 
         self.assertTrue(client.session['admin'])
 
         client.get('/logout')
 
         self.assertFalse(client.session['admin'])
 
         admin.delete()
 
     def test_get_thread(self):
         opening_post = self._create_post()
         op_id = opening_post.id
 
         for i in range(0, 2):
             Post.objects.create_post('title', 'text',
                                      parent_id=op_id)
 
         thread = Post.objects.get_thread(op_id)
 
         self.assertEqual(3, len(thread))
+
+    def test_create_post_with_tag(self):
+        tag = Tag.objects.create(name='test_tag')
+        post = Post.objects.create_post(title='title', text='text', tags=[tag])
+        self.assertIsNotNone(post)
  No newline at end of file

boards/urls.py

@@ -1,21 +1,21 b''
 from django.conf.urls import patterns, url
 from boards import views
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', views.index, name = 'index'),
 
     # login page
     url(r'^login$', views.login, name='login'),
     # logout page
     url(r'^logout$', views.logout, name='logout'),
 
     # /boards/tag/
-    url(r'^tag/(?P<tag>\w+)/$', views.tag, name = 'tag'),
+    url(r'^tag/(?P<tag_name>\w+)/$', views.tag, name = 'tag'),
     # /boards/post_id/
-    url(r'^thread/(?P<id>\w+)/$', views.thread, name = 'thread'),
+    url(r'^thread/(?P<post_id>\w+)/$', views.thread, name = 'thread'),
     # /boards/tag/post/
     url(r'^post.html$', views.new_post,
 	    name='post'),
 )

boards/views.py

@@ -1,107 +1,125 b''
 from django.template import RequestContext
 from boards import forms
 import boards
 from boards.forms import NewThreadForm
-from boards.models import Post, Admin
+from boards.models import Post, Admin, Tag
 from django.shortcuts import render, get_list_or_404, redirect
 from django.http import HttpResponseRedirect, Http404
 
 
 def index(request):
     context = RequestContext(request)
 
     if request.method == 'POST':
         return new_post(request)
     else:
         threads = Post.objects.get_threads()
 
         context['threads'] = None if len(threads) == 0 else threads
         context['form'] = forms.NewThreadForm()
 
         return render(request, 'posting_general.html',
                       context)
 
 
 def new_post(request, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
     form = NewThreadForm(request.POST, request.FILES)
 
     title = request.POST['title']
     text = request.POST['text']
 
     if 'image' in request.FILES.keys():
         image = request.FILES['image']
     else:
         image = None
 
     ip = request.META['REMOTE_ADDR']
 
-    # TODO Get tags list, download image (if link is given)
+    tags = []
+    if thread_id == boards.models.NO_PARENT:
+        tag_strings = request.POST['tags']
+
+        if tag_strings:
+            tag_strings = tag_strings.split(',')
+            for tag_name in tag_strings:
+                tag_name = tag_name.strip()
+                if len(tag_name) > 0:
+                    tag, created = Tag.objects.get_or_create(name=tag_name)
+                    tags.append(tag)
+
+    # TODO Add a possibility to define a link image instead of an image file.
+    # If a link is given, download the image automatically.
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
-                                    parent_id=thread_id, image=image)
+                                    parent_id=thread_id, image=image,
+                                    tags=tags)
 
     thread_to_show = (post.id if thread_id == boards.models.NO_PARENT else
                       thread_id)
-    return redirect(thread, id=thread_to_show)
+    return redirect(thread, post_id=thread_to_show)
 
 
-def tag(request):
+def tag(request, tag_name):
     """Get all tag threads (posts without a parent)."""
 
-    tag_name = request.GET['tag']
-
-    threads = get_list_or_404(Post, tag=tag_name)
+    tag = Tag.objects.get(name=tag_name)
+    threads = get_list_or_404(Post, tags=tag)
 
-    context = RequestContext(request)
-    context['threads'] = None if len(threads) == 0 else threads
-    context['tag'] = tag_name
+    if request.method == 'POST':
+        return new_post(request)
+    else:
+        context = RequestContext(request)
+        context['threads'] = None if len(threads) == 0 else threads
+        context['tag'] = tag_name
 
-    return render(request, 'posting_general.html',
-                  context)
+        context['form'] = forms.NewThreadForm(initial={'tags': tag_name})
+
+        return render(request, 'posting_general.html',
+                      context)
 
 
-def thread(request, id):
+def thread(request, post_id):
     """Get all thread posts"""
 
     if request.method == 'POST':
-        return new_post(request, id)
+        return new_post(request, post_id)
     else:
         # TODO Show 404 if there is no such thread
-        posts = Post.objects.get_thread(id)
+        posts = Post.objects.get_thread(post_id)
 
         context = RequestContext(request)
         context['posts'] = posts
 
         context['form'] = forms.NewThreadForm()
 
         return render(request, 'thread.html', context)
 
 
 def login(request):
     """Log in as admin"""
 
     if 'name' in request.POST and 'password' in request.POST:
         request.session['admin'] = False
 
         isAdmin = len(Admin.objects.filter(name=request.POST['name'],
                                            password=request.POST[
                                                'password'])) > 0
 
         if isAdmin:
             request.session['admin'] = True
 
             response = HttpResponseRedirect('/')
 
         else:
             response = render(request, 'login.html', {'error': 'Login error'})
     else:
         response = render(request, 'login.html', {})
 
     return response
 
 
 def logout(request):
     request.session['admin'] = False
     return HttpResponseRedirect('/')
  No newline at end of file

templates/posting_general.html

@@ -1,34 +1,61 b''
 {% extends "base.html" %}
 
+{% load i18n %}
+
 {% block content %}
 
 	{% if threads %}
 		{% for thread in threads %}
             {% 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>
                 <a class="link" href="/thread/{{ thread.id }}/">
-                    [View]</a><br />
-                <span class="text">{{ thread.text }}</span><br />
+                    [{% trans "View" %}]</a><br />
+                {{ thread.text }}<br />
+                {% if thread.tags %}
+                    <span class="tags">{% trans 'Tags' %}:
+                        {% for tag in thread.tags.all %}
+                            <a class="tag" href="/tag/{{ tag.name }}">
+                                {{ tag.name }}</a>
+                        {% endfor %}
+                    </span>
+                {% endif %}
             </div>
             <hr />
         {% endfor %}
 	{% else %}
-		<span class="text">No threads found.</span>
+		No threads found.
         <hr />
 	{% endif %}
 
     <div class="post-form">
-    <form enctype="multipart/form-data" method="post">{% csrf_token %}
-		{{ form.as_p }}
-		<input type="submit" value="Post!" />
-	</form>
+        <div class="post-form">
+            <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' %}" />
+            </form>
+        </div>
     </div>
 
 {% endblock %}
  No newline at end of file

templates/thread.html

@@ -1,33 +1,54 b''
 {% extends "base.html" %}
 
+{% load i18n %}
+
 {% block content %}
 
 	{% if posts %}
 		{% for post in posts %}
             {% 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>
                 <span class="post_id">(#{{ post.id }})</span><br />
-                <span class="text">{{ post.text }}</span><br />
+                {{ post.text }}<br />
+                {% if post.tags %}
+                    <span class="tags">{% trans 'Tags' %}:
+                        {% for tag in post.tags.all %}
+                            <a class="tag" href="/tag/{{ tag.name }}">
+                                {{ tag.name }}</a>
+                        {% endfor %}
+                    </span>
+                {% endif %}
             </div>
             <hr />
 		{% endfor %}
 	{% else %}
 		No threads found.
         <hr />
 	{% endif %}
 
     <div class="post-form">
     <form enctype="multipart/form-data" method="post">{% csrf_token %}
-		{{ form.as_p }}
-		<input type="submit" value="Post!" />
+		<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