Added error 404 page

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,182 +1,189 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.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-27 23:51+0300\n"
+"POT-Creation-Date: 2013-08-30 18:54+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: ru\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"
 
+#: templates/boards/404.html:6
+msgid "Not found"
+msgstr "Не найдено"
+
+#: templates/boards/404.html:12
+msgid "This page does not exist"
+msgstr "Этой страницы не существует"
+
 #: templates/boards/authors.html:6
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:24
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:26
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:28
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/banned.html:6
 msgid "Banned"
-msgstr ""
+msgstr "Заблокирован"
 
 #: templates/boards/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
-msgstr ""
+msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/base.html:12
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:35
+#: templates/boards/base.html:36
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:41
+#: templates/boards/base.html:42
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:49
+#: templates/boards/base.html:50
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/posting_general.html:18
 msgid "Tag: "
 msgstr "Тег: "
 
 #: templates/boards/posting_general.html:35
-#: templates/boards/posting_general.html:79 templates/boards/thread.html:27
+#: templates/boards/posting_general.html:81 templates/boards/thread.html:27
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/boards/posting_general.html:46
+#: templates/boards/posting_general.html:48
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:53 templates/boards/thread.html:111
+#: templates/boards/posting_general.html:55 templates/boards/thread.html:108
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:54 templates/boards/thread.html:112
+#: templates/boards/posting_general.html:56 templates/boards/thread.html:109
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:56
-#: templates/boards/posting_general.html:127 templates/boards/thread.html:51
+#: templates/boards/posting_general.html:58
+#: templates/boards/posting_general.html:131 templates/boards/thread.html:48
 #: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/boards/posting_general.html:109
+#: templates/boards/posting_general.html:113
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:112 templates/boards/thread.html:73
+#: templates/boards/posting_general.html:116 templates/boards/thread.html:70
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/boards/posting_general.html:117 templates/boards/thread.html:78
+#: templates/boards/posting_general.html:121 templates/boards/thread.html:75
 msgid "Text"
 msgstr "Текст"
 
-#: templates/boards/posting_general.html:122 templates/boards/thread.html:83
+#: templates/boards/posting_general.html:126 templates/boards/thread.html:80
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/boards/posting_general.html:137 templates/boards/thread.html:94
+#: templates/boards/posting_general.html:141 templates/boards/thread.html:91
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:139
+#: templates/boards/posting_general.html:143
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:142 templates/boards/thread.html:96
+#: templates/boards/posting_general.html:146 templates/boards/thread.html:93
 msgid "Basic markdown syntax."
 msgstr "Базовый синтаксис markdown."
 
-#: templates/boards/posting_general.html:152
+#: templates/boards/posting_general.html:156
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/settings.html:13
 msgid "Theme"
 msgstr "Тема"
 
 #: templates/boards/settings.html:29
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:7
 msgid "tags"
 msgstr "тегов"
 
-#: templates/boards/thread.html:39
-msgid "Get!"
-msgstr "Гет!"
-
-#: templates/boards/thread.html:70
+#: templates/boards/thread.html:67
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:94
 msgid "Example: "
 msgstr "Пример: "
 
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:94
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/thread.html:98
+#: templates/boards/thread.html:95
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/thread.html:99
+#: templates/boards/thread.html:96
 msgid "Quotes can be inserted with"
 msgstr "Цитаты могут быть вставлены при помощи"
 
-#: templates/boards/thread.html:100
+#: templates/boards/thread.html:97
 msgid "Links to answers can be inserted with"
 msgstr "Ссылки на ответы могут быть вставлены с помощью"
 
-#: templates/boards/thread.html:113
+#: templates/boards/thread.html:110
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
+#~ msgid "Get!"
+#~ msgstr "Гет!"
+
 #~ msgid "View"
 #~ msgstr "Просмотр"
 
 #~ msgid "gets"
 #~ msgstr "гетов"
 
 #~ msgid "author"
 #~ msgstr "автор"
 
 #~ msgid "developer"
 #~ msgstr "разработчик"
 
 #~ msgid "javascript developer"
 #~ msgstr "разработчик javascript"
 
 #~ msgid "designer"
 #~ msgstr "дизайнер"

boards/templates/boards/404.html

@@ -1,30 +1,14 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 
 {% block head %}
-    <title>{% trans "Authors" %}</title>
+    <title>{% trans "Not found" %}</title>
 {% endblock %}
 
 {% block content %}
     <div class="post">
-        <h2>Authors</h2>
-        {% for nick, values in authors.items %}
-            <p>
-                <b>{{ nick }}</b> ({{ values.name }}):
-                {% for value in values.contacts %}
-                    <a href="mailto:{{ value }}">{{ value }}</a>
-                {% endfor %} -
-                {% for role in values.roles %}
-                    {% trans role %}
-                {% endfor %}
-            </p>
-        {% endfor %}
-        <br />
-        <p>{% trans "Distributed under the" %}
-            <a href="http://www.gnu.org/licenses/gpl.html" >GNU GPLv3</a>
-            {% trans "license" %}</p>
-        <p><a href="https://bitbucket.org/neko259/neboard">
-            {% trans "Repository" %}</a></p>
+        <p><img src="{{ STATIC_URL }}images/404.png" width="200" /></p>
+        <p>{% trans 'This page does not exist' %}</p>
     </div>
 {% endblock %}
  No newline at end of file

boards/views.py

@@ -1,256 +1,261 b''
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseRedirect
 
 from boards import forms
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm
 
 from boards.models import Post, Admin, Tag, Ban
 from boards import authors
 import neboard
 
 
 def index(request, page=0):
     context = _init_default_context(request)
 
     if utils.need_include_captcha(request):
         threadFormClass = ThreadCaptchaForm
         kwargs = {'request': request}
     else:
         threadFormClass = ThreadForm
         kwargs = {}
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList, **kwargs)
 
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = threadFormClass(error_class=PlainErrorList, **kwargs)
 
     threads = Post.objects.get_threads(page=int(page))
 
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
     context['pages'] = range(Post.objects.get_thread_page_count())
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def _new_post(request, form, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
     ip = _get_client_ip(request)
     is_banned = Ban.objects.filter(ip=ip).count() > 0
 
     if is_banned:
         return redirect(you_are_banned)
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     tags = []
 
     new_thread = thread_id == boards.models.NO_PARENT
     if new_thread:
         tag_strings = data['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,
                                     tags=tags)
 
     thread_to_show = (post.id if new_thread else thread_id)
 
     if new_thread:
         return redirect(thread, post_id=thread_to_show)
     else:
         return redirect(reverse(thread,
                                 kwargs={'post_id': thread_to_show}) + '#'
                         + str(post.id))
 
 
 def tag(request, tag_name, page=0):
     """Get all tag threads (posts without a parent)."""
 
     tag = get_object_or_404(Tag, name=tag_name)
     threads = Post.objects.get_threads(tag=tag, page=int(page))
 
     if request.method == 'POST':
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = forms.ThreadForm(initial={'tags': tag_name},
                                 error_class=PlainErrorList)
 
     context = _init_default_context(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag_name
     context['pages'] = range(Post.objects.get_thread_page_count(tag=tag))
 
     context['form'] = form
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     if utils.need_include_captcha(request):
         postFormClass = PostCaptchaForm
         kwargs = {'request': request}
     else:
         postFormClass = PostForm
         kwargs = {}
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         if form.is_valid():
             return _new_post(request, form, post_id)
     else:
         form = postFormClass(error_class=PlainErrorList, **kwargs)
 
     posts = Post.objects.get_thread(post_id)
 
     context = _init_default_context(request)
 
     context['posts'] = posts
     context['form'] = form
 
     return render(request, 'boards/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, 'boards/login.html', {'error': 'Login error'})
     else:
         response = render(request, 'boards/login.html', {})
 
     return response
 
 
 def logout(request):
     request.session['admin'] = False
     return HttpResponseRedirect('/')
 
 
 def settings(request):
     """User's settings"""
 
     context = RequestContext(request)
 
     if request.method == 'POST':
         form = SettingsForm(request.POST)
         if form.is_valid():
             selected_theme = form.cleaned_data['theme']
             request.session['theme'] = selected_theme
 
         return redirect(settings)
     else:
         selected_theme = _get_theme(request)
         form = SettingsForm(initial={'theme': selected_theme})
         context['form'] = form
         context['tags'] = Tag.objects.get_popular_tags()
         context['theme'] = _get_theme(request)
 
         return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
     """All tags list"""
 
     context = _init_default_context(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'boards/tags.html', context)
 
 
 def jump_to_post(request, post_id):
     """Determine thread in which the requested post is and open it's page"""
 
     post = get_object_or_404(Post, id=post_id)
 
     if boards.models.NO_PARENT == post.parent:
         return redirect(thread, post_id=post.id)
     else:
         parent_thread = get_object_or_404(Post, id=post.parent)
         return redirect(reverse(thread, kwargs={'post_id': parent_thread.id})
                         + '#' + str(post.id))
 
 
 def authors(request):
     context = _init_default_context(request)
     context['authors'] = boards.authors.authors
 
     return render(request, 'boards/authors.html', context)
 
 
 def you_are_banned(request):
     context = _init_default_context(request)
     return render(request, 'boards/banned.html', context)
 
 
+def page_404(request):
+    context = _init_default_context(request)
+    return render(request, 'boards/404.html', context)
+
+
 def _get_theme(request):
     """Get user's CSS theme"""
 
     return request.session.get('theme', neboard.settings.DEFAULT_THEME)
 
 
 def _get_client_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[-1].strip()
     else:
         ip = request.META.get('REMOTE_ADDR')
     return ip
 
 
 def _init_default_context(request):
     """Create context with default values that are used in most views"""
 
     context = RequestContext(request)
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
 
     return context

neboard/urls.py

@@ -1,23 +1,23 b''
 from django.conf.urls import patterns, include, url
 
 # Uncomment the next two lines to enable the admin:
 from django.conf.urls.static import static
 from django.contrib import admin
 from neboard import settings
 
 admin.autodiscover()
 
 urlpatterns = patterns('',
     # Examples:
     # url(r'^$', 'neboard.views.home', name='home'),
     # url(r'^neboard/', include('neboard.foo.urls')),
 
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
     url(r'^', include('boards.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
- 
+handler404 = 'boards.views.page_404'