Partly merged with default branch

boards/config/default_settings.ini

@@ -0,0 +1,33 b''
+[Version]
+Version = 2.7.0 Chani
+SiteName = Neboard
+
+[Cache]
+# Timeout for caching, if cache is used
+CacheTimeout = 600
+
+[Forms]
+# Max post length in characters
+MaxTextLength = 30000
+MaxImageSize = 8000000
+LimitPostingSpeed = false
+
+[Messages]
+# Thread bumplimit
+MaxPostsPerThread = 10
+# Old posts will be archived or deleted if this value is reached
+MaxThreadCount = 5
+
+[View]
+DefaultTheme = md
+DefaultImageViewer = simple
+LastRepliesCount = 3
+ThreadsPerPage = 3
+
+[Storage]
+# Enable archiving threads instead of deletion when the thread limit is reached
+ArchiveThreads = true
+
+[External]
+# Thread update
+WebsocketsEnabled = false

boards/migrations/0018_banner.py

@@ -0,0 +1,23 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0017_auto_20150503_1847'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Banner',
+            fields=[
+                ('id', models.AutoField(serialize=False, primary_key=True, verbose_name='ID', auto_created=True)),
+                ('title', models.TextField()),
+                ('text', models.TextField()),
+                ('post', models.ForeignKey(to='boards.Post')),
+            ],
+        ),
+    ]

boards/models/banner.py

@@ -0,0 +1,10 b''
+from django.db import models
+
+
+class Banner(models.Model):
+    title = models.TextField()
+    text = models.TextField()
+    post = models.ForeignKey('Post')
+
+    def __str__(self):
+        return self.title

boards/models/post/export.py

@@ -0,0 +1,55 b''
+from boards import utils
+
+
+PARAMETER_TRUNCATED = 'truncated'
+
+DIFF_TYPE_HTML = 'html'
+DIFF_TYPE_JSON = 'json'
+
+
+class Exporter():
+    @staticmethod
+    def export(post, request, include_last_update) -> str:
+        pass
+
+
+class HtmlExporter(Exporter):
+    @staticmethod
+    def export(post, request, include_last_update):
+        if request is not None and PARAMETER_TRUNCATED in request.GET:
+            truncated = True
+            reply_link = False
+        else:
+            truncated = False
+            reply_link = True
+
+        return post.get_view(truncated=truncated, reply_link=reply_link,
+                             moderator=utils.is_moderator(request))
+
+
+class JsonExporter(Exporter):
+    @staticmethod
+    def export(post, request, include_last_update):
+        post_json = {
+            'id': post.id,
+            'title': post.title,
+            'text': post.get_raw_text(),
+            }
+        if post.images.exists():
+            post_image = post.get_first_image()
+            post_json['image'] = post_image.image.url
+            post_json['image_preview'] = post_image.image.url_200x150
+        if include_last_update:
+            post_json['bump_time'] = utils.datetime_to_epoch(
+                post.get_thread().bump_time)
+        return post_json
+
+
+EXPORTERS = {
+    DIFF_TYPE_HTML: HtmlExporter,
+    DIFF_TYPE_JSON: JsonExporter,
+}
+
+
+def get_exporter(export_type: str) -> Exporter:
+    return EXPORTERS[export_type]()

.hgtags

@@ -28,3 +28,4 b' 119fafc5381b933bf30d97be0b278349f6135075'
 d528d76d3242cced614fa11bb63f3d342e4e1d09 2.5.2
 1b631781ced34fbdeec032e7674bc4e131724699 2.6.0
 0f2ef17dc0de678ada279bf7eedf6c5585f1fd7a 2.6.1
+d53fc814a424d7fd90f23025c87b87baa164450e 2.7.0

boards/admin.py

@@ -1,5 +1,5 b''
 from django.contrib import admin
-from boards.models import Post, Tag, Ban, Thread, KeyPair
+from boards.models import Post, Tag, Ban, Thread, KeyPair, Banner
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -64,3 +64,8 b' class BanAdmin(admin.ModelAdmin):'
     list_display = ('ip', 'can_read')
     list_filter = ('can_read',)
     search_fields = ('ip',)
+
+
[e-mail](Banner)
+class BannerAdmin(admin.ModelAdmin):
+    list_display = ('title', 'text')

boards/context_processors.py

@@ -51,11 +51,12 b' def user_and_ui_processor(request):'
     # This shows the moderator panel
     context[CONTEXT_MODERATOR] = utils.is_moderator(request)
 
-    context[CONTEXT_VERSION] = settings.VERSION
-    context[CONTEXT_SITE_NAME] = settings.SITE_NAME
+    context[CONTEXT_VERSION] = settings.get('Version', 'Version')
+    context[CONTEXT_SITE_NAME] = settings.get('Version', 'SiteName')
 
     context[CONTEXT_IMAGE_VIEWER] = settings_manager.get_setting(
-        SETTING_IMAGE_VIEWER, default=settings.DEFAULT_IMAGE_VIEWER)
+        SETTING_IMAGE_VIEWER,
+        default=settings.get('View', 'DefaultImageViewer'))
 
     get_notifications(context, request)
 

boards/forms.py

@@ -172,11 +172,10 b' class PostForm(NeboardForm):'
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
-            if len(text) > board_settings.MAX_TEXT_LENGTH:
+            max_length = board_settings.get_int('Forms', 'MaxTextLength')
+            if len(text) > max_length:
                 raise forms.ValidationError(_('Text must have less than %s '
-                                              'characters') %
-                                            str(board_settings
-                                            .MAX_TEXT_LENGTH))
+                                              'characters') % str(max_length))
         return text
 
     def clean_image(self):
@@ -256,7 +255,7 b' class PostForm(NeboardForm):'
 
         posting_delay = settings.POSTING_DELAY
 
-        if board_settings.LIMIT_POSTING_SPEED:
+        if board_settings.get_bool('Forms', 'LimitPostingSpeed'):
             now = time.time()
 
             current_delay = 0
@@ -283,10 +282,11 b' class PostForm(NeboardForm):'
                 self.session[LAST_POST_TIME] = now
 
     def validate_image_size(self, size: int):
-        if size > board_settings.MAX_IMAGE_SIZE:
+        max_size = board_settings.get_int('Forms', 'MaxImageSize')
+        if size > max_size:
             raise forms.ValidationError(
                 _('Image must be less than %s bytes')
-                % str(board_settings.MAX_IMAGE_SIZE))
+                % str(max_size))
 
     def _get_image_from_url(self, url: str) -> SimpleUploadedFile:
         """

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-21 21:10+0300\n"
+"POT-Creation-Date: 2015-05-07 13:10+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"
@@ -68,79 +68,79 b' msgstr "\xd0\x9f\xd0\xbe\xd0\xb8\xd1\x81\xd0\xba"'
 msgid "Please wait %s seconds before sending message"
 msgstr "Пожалуйста подождите %s секунд перед отправкой сообщения"
 
-#: forms.py:142
+#: forms.py:144
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:145
+#: forms.py:147
 msgid "Image URL"
 msgstr "URL изображения"
 
-#: forms.py:151
+#: forms.py:153
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:154
+#: forms.py:156
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
-#: forms.py:165
+#: forms.py:167
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:174
+#: forms.py:176
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:196
+#: forms.py:198
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:217
+#: forms.py:219
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
-#: forms.py:249
+#: forms.py:251
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:286
+#: forms.py:288
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:333 templates/boards/posting_general.html:145
+#: forms.py:335 templates/boards/posting_general.html:129
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:340
+#: forms.py:342
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:354
+#: forms.py:356
 msgid "Need at least one of the tags: "
 msgstr "Нужна хотя бы одна из меток: "
 
-#: forms.py:367
+#: forms.py:369
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:368
+#: forms.py:370
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
-#: forms.py:369
+#: forms.py:371
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:370
+#: forms.py:372
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:376
+#: forms.py:378
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -189,7 +189,7 b' msgstr "\xd0\xa3\xd0\xbf\xd1\x80\xd0\xb0\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xbc\xd0\xb5\xd1\x82\xd0\xba\xd0\xb0\xd0\xbc\xd0\xb8"'
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: templates/boards/base.html:52 templates/boards/settings.html:9
+#: templates/boards/base.html:52 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
@@ -207,12 +207,12 b' msgid "Up"'
 msgstr "Вверх"
 
 #: templates/boards/notifications.html:17
-#: templates/boards/posting_general.html:80 templates/search/search.html:26
+#: templates/boards/posting_general.html:70 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/notifications.html:27
-#: templates/boards/posting_general.html:118 templates/search/search.html:37
+#: templates/boards/posting_general.html:102 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
@@ -244,44 +244,49 b' msgstr "\xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb9"'
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:64
+#: templates/boards/posting_general.html:35
+#| msgid "messages"
+msgid "Related message"
+msgstr "Связанное сообщение"
+
+#: templates/boards/posting_general.html:60
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/posting_general.html:67
+#: templates/boards/posting_general.html:63
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
-#: templates/boards/posting_general.html:94
+#: templates/boards/posting_general.html:84
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:123
+#: templates/boards/posting_general.html:107
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:129
+#: templates/boards/posting_general.html:113
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:134 templates/boards/preview.html:16
+#: templates/boards/posting_general.html:118 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:43
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:139
+#: templates/boards/posting_general.html:123
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:142
+#: templates/boards/posting_general.html:126
 #: templates/boards/thread_normal.html:48
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:159
+#: templates/boards/posting_general.html:143
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -293,19 +298,19 b' msgstr "\xd0\x9f\xd1\x80\xd0\xb5\xd0\xb4\xd0\xbf\xd1\x80\xd0\xbe\xd1\x81\xd0\xbc\xd0\xbe\xd1\x82\xd1\x80"'
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/boards/settings.html:17
+#: templates/boards/settings.html:16
 msgid "You are moderator."
 msgstr "Вы модератор."
 
-#: templates/boards/settings.html:21
+#: templates/boards/settings.html:20
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
-#: templates/boards/settings.html:29
+#: templates/boards/settings.html:28
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
-#: templates/boards/settings.html:38
+#: templates/boards/settings.html:37
 msgid "Save"
 msgstr "Сохранить"
 
@@ -377,7 +382,7 b' msgstr "\xd0\x9d\xd0\xbe\xd1\x80\xd0\xbc\xd0\xb0\xd0\xbb\xd1\x8c\xd0\xbd\xd1\x8b\xd0\xb9 \xd1\x80\xd0\xb5\xd0\xb6\xd0\xb8\xd0\xbc"'
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
-#: templates/boards/thread_gallery.html:50
+#: templates/boards/thread_gallery.html:41
 msgid "No images."
 msgstr "Нет изображений."
 
@@ -401,8 +406,3 b' msgstr "\xd0\x9e\xd0\xb1\xd0\xbd\xd0\xbe\xd0\xb2\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "Ok"
 msgstr "Ок"
 
-#~ msgid "Wait %s seconds after last posting"
-#~ msgstr "Подождите %s секунд после последнего постинга"
-
-#~ msgid "tag1 several_words_tag"
-#~ msgstr "метка1 метка_из_нескольких_слов"

boards/models/__init__.py

@@ -7,3 +7,4 b' from boards.models.thread import Thread'
 from boards.models.post import Post
 from boards.models.tag import Tag
 from boards.models.user import Ban
+from boards.models.banner import Banner

boards/models/tag.py

@@ -56,9 +56,13 b' class Tag(models.Model, Viewable):'
     def get_thread_count(self) -> int:
         return self.get_threads().count()
 
+    # TODO Remove this and use get_absolute_url
     def get_url(self):
         return reverse('tag', kwargs={'tag_name': self.name})
 
+    def get_absolute_url(self):
+        return self.get_url()
+
     def get_threads(self):
         return self.thread_set.order_by('-bump_time')
 
@@ -67,7 +71,7 b' class Tag(models.Model, Viewable):'
 
     def get_view(self):
         link = '<a class="tag" href="{}">{}</a>'.format(
-            self.get_url(), self.name)
+            self.get_absolute_url(), self.name)
         if self.is_required():
             link = '<b>{}</b>'.format(link)
         return link

boards/models/thread.py

@@ -34,12 +34,13 b' class ThreadManager(models.Manager):'
         threads = Thread.objects.filter(archived=False).order_by('-bump_time')
         thread_count = threads.count()
 
-        if thread_count > settings.MAX_THREAD_COUNT:
-            num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
+        max_thread_count = settings.get_int('Messages', 'MaxThreadCount')
+        if thread_count > max_thread_count:
+            num_threads_to_delete = thread_count - max_thread_count
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             for thread in old_threads:
-                if settings.ARCHIVE_THREADS:
+                if settings.get_bool('Storage', 'ArchiveThreads'):
                     self._archive_thread(thread)
                 else:
                     thread.delete()
@@ -55,7 +56,7 b' class ThreadManager(models.Manager):'
 
 
 def get_thread_max_posts():
-    return settings.MAX_POSTS_PER_THREAD
+    return settings.get_int('Messages', 'MaxPostsPerThread')
 
 
 class Thread(models.Model):
@@ -122,11 +123,13 b' class Thread(models.Model):'
         Gets several last replies, not including opening post
         """
 
-        if settings.LAST_REPLIES_COUNT > 0:
+        last_replies_count = settings.get_int('View', 'LastRepliesCount')
+
+        if last_replies_count > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
-                reply_count_to_show = min(settings.LAST_REPLIES_COUNT,
+                reply_count_to_show = min(last_replies_count,
                                           reply_count - 1)
                 replies = self.get_replies()
                 last_replies = replies[reply_count - reply_count_to_show:]
@@ -138,7 +141,7 b' class Thread(models.Model):'
         Gets number of posts between opening post and last replies.
         """
         reply_count = self.get_reply_count()
-        last_replies_count = min(settings.LAST_REPLIES_COUNT,
+        last_replies_count = min(settings.get_int('View', 'LastRepliesCount'),
                                  reply_count - 1)
         return reply_count - last_replies_count - 1
 
@@ -222,7 +225,7 b' class Thread(models.Model):'
                 post.threads.update(last_edit_time=self.last_edit_time)
 
     def notify_clients(self):
-        if not settings.WEBSOCKETS_ENABLED:
+        if not settings.get_bool('External', 'WebsocketsEnabled'):
             return
 
         client = Client()
@@ -232,3 +235,6 b' class Thread(models.Model):'
             WS_NOTIFICATION_TYPE: WS_NOTIFICATION_TYPE_NEW_POST,
             })
         client.send()
+
+    def get_absolute_url(self):
+        return self.get_opening_post().get_absolute_url()

boards/rss.py

@@ -10,7 +10,7 b' from boards import settings'
 # TODO Make tests for all of these
 class AllThreadsFeed(Feed):
 
-    title = settings.SITE_NAME + ' - All threads'
+    title = settings.get('Version', 'SiteName') + ' - All threads'
     link = '/'
     description_template = 'boards/rss/post.html'
 

boards/settings.py

@@ -1,2 +1,18 b''
-from boards.default_settings import *
+import configparser
+
+
+config = configparser.ConfigParser()
+config.read('boards/config/default_settings.ini')
+config.read('boards/config/settings.ini')
+
 
+def get(section, name):
+    return config[section][name]
+
+
+def get_int(section, name):
+    return int(get(section, name))
+
+
+def get_bool(section, name):
+    return get(section, name) == 'true'

boards/static/js/thread_update.js

@@ -28,6 +28,8 b" var CLASS_POST = '.post'"
 var POST_ADDED = 0;
 var POST_UPDATED = 1;
 
+var JS_AUTOUPDATE_PERIOD = 20000;
+
 var wsUser = '';
 
 var unreadPosts = 0;
@@ -48,36 +50,39 b' function connectWebsocket() {'
     var wsHost = metapanel.getAttribute('data-ws-host');
     var wsPort = metapanel.getAttribute('data-ws-port');
 
-    if (wsHost.length > 0 && wsPort.length > 0)
-    var centrifuge = new Centrifuge({
-        "url": 'ws://' + wsHost + ':' + wsPort + "/connection/websocket",
-        "project": metapanel.getAttribute('data-ws-project'),
-        "user": wsUser,
-        "timestamp": metapanel.getAttribute('data-ws-token-time'),
-        "token": metapanel.getAttribute('data-ws-token'),
-        "debug": false
-    });
+    if (wsHost.length > 0 && wsPort.length > 0) {
+        var centrifuge = new Centrifuge({
+            "url": 'ws://' + wsHost + ':' + wsPort + "/connection/websocket",
+            "project": metapanel.getAttribute('data-ws-project'),
+            "user": wsUser,
+            "timestamp": metapanel.getAttribute('data-ws-token-time'),
+            "token": metapanel.getAttribute('data-ws-token'),
+            "debug": false
+        });
 
-    centrifuge.on('error', function(error_message) {
-        console.log("Error connecting to websocket server.");
-        console.log(error_message);
-        return false;
-    });
-
-    centrifuge.on('connect', function() {
-        var channelName = 'thread:' + threadId;
-        centrifuge.subscribe(channelName, function(message) {
-            getThreadDiff();
+        centrifuge.on('error', function(error_message) {
+            console.log("Error connecting to websocket server.");
+            console.log(error_message);
+            return false;
         });
 
-        // For the case we closed the browser and missed some updates
-        getThreadDiff();
-        $('#autoupdate').hide();
-    });
+        centrifuge.on('connect', function() {
+            var channelName = 'thread:' + threadId;
+            centrifuge.subscribe(channelName, function(message) {
+                getThreadDiff();
+            });
 
-    centrifuge.connect();
+            // For the case we closed the browser and missed some updates
+            getThreadDiff();
+            $('#autoupdate').hide();
+        });
 
-    return true;
+        centrifuge.connect();
+
+        return true;
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -193,8 +198,21 b' function isPageBottom() {'
     return scroll == 1
 }
 
+function enableJsUpdate() {
+    setInterval(getThreadDiff, JS_AUTOUPDATE_PERIOD);
+    return true;
+}
+
 function initAutoupdate() {
-    return connectWebsocket();
+    if (location.protocol === 'https:') {
+        return enableJsUpdate();
+    } else {
+        if (connectWebsocket()) {
+            return true;
+        } else {
+            return enableJsUpdate();
+        }
+    }
 }
 
 function getReplyCount() {

boards/templates/boards/posting_general.html

@@ -28,6 +28,14 b''
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
+    {% for banner in banners %}
+        <div class="post">
+            <div class="title">{{ banner.title }}</div>
+            <div>{{ banner.text }}</div>
+            <div>{% trans 'Related message' %}: <a href="{{ banner.post.get_url }}">>>{{ banner.post.id }}</a></div>
+        </div>
+    {% endfor %}
+
 {% if tag %}
     <div class="tag_info">
         <h2>

boards/templates/boards/settings.html

@@ -1,7 +1,6 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
-{% load humanize %}
 {% load tz %}
 
 {% block head %}

boards/tests/test_post.py

@@ -91,26 +91,26 b' class PostTests(TestCase):'
     def test_thread_max_count(self):
         """Test deletion of old posts when the max thread count is reached"""
 
-        for i in range(settings.MAX_THREAD_COUNT + 1):
+        for i in range(settings.get_int('Messages', 'MaxThreadCount') + 1):
             self._create_post()
 
-        self.assertEqual(settings.MAX_THREAD_COUNT,
+        self.assertEqual(settings.get_int('Messages', 'MaxThreadCount'),
                          len(Thread.objects.filter(archived=False)))
 
     def test_pages(self):
         """Test that the thread list is properly split into pages"""
 
-        for i in range(settings.MAX_THREAD_COUNT):
+        for i in range(settings.get_int('Messages', 'MaxThreadCount')):
             self._create_post()
 
         all_threads = Thread.objects.filter(archived=False)
 
         paginator = Paginator(Thread.objects.filter(archived=False),
-                              settings.THREADS_PER_PAGE)
+                              settings.get_int('View', 'ThreadsPerPage'))
         posts_in_second_page = paginator.page(2).object_list
         first_post = posts_in_second_page[0]
 
-        self.assertEqual(all_threads[settings.THREADS_PER_PAGE].id,
+        self.assertEqual(all_threads[settings.get_int('View', 'ThreadsPerPage')].id,
                          first_post.id)
 
     def test_reflinks(self):

boards/views/all_threads.py

@@ -11,7 +11,7 b' from boards import utils, settings'
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.forms import ThreadForm, PlainErrorList
-from boards.models import Post, Thread, Ban, Tag, PostImage
+from boards.models import Post, Thread, Ban, Tag, PostImage, Banner
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
@@ -28,6 +28,7 b" TAG_DELIMITER = ' '"
 PARAMETER_CURRENT_PAGE = 'current_page'
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
+PARAMETER_BANNERS = 'banners'
 
 PARAMETER_PREV_LINK = 'prev_page_link'
 PARAMETER_NEXT_LINK = 'next_page_link'
@@ -50,7 +51,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         self.settings_manager = get_settings_manager(request)
         paginator = get_paginator(self.get_threads(),
-                                  settings.THREADS_PER_PAGE)
+                                  settings.get_int('View', 'ThreadsPerPage'))
         paginator.current_page = int(page)
 
         try:
@@ -60,6 +61,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         params[PARAMETER_THREADS] = threads
         params[CONTEXT_FORM] = form
+        params[PARAMETER_BANNERS] = Banner.objects.order_by('-id').all()
 
         self.get_page_context(paginator, params, page)
 

boards/views/settings.py

@@ -32,7 +32,8 b' class SettingsView(BaseBoardView):'
             initial={
                 FORM_THEME: selected_theme,
                 FORM_IMAGE_VIEWER: settings_manager.get_setting(
-                    SETTING_IMAGE_VIEWER, default=settings.DEFAULT_IMAGE_VIEWER),
+                    SETTING_IMAGE_VIEWER,
+                    default=settings.get('View', 'DefaultImageViewer')),
                 FORM_USERNAME: settings_manager.get_setting(SETTING_USERNAME),
                 FORM_TIMEZONE: request.session.get(
                     SESSION_TIMEZONE, timezone.get_current_timezone()),

boards/views/thread/thread.py

@@ -51,7 +51,7 b' class ThreadView(BaseBoardView, PostMixi'
         params[CONTEXT_LASTUPDATE] = str(thread_to_show.last_edit_time)
         params[CONTEXT_THREAD] = thread_to_show
 
-        if settings.WEBSOCKETS_ENABLED:
+        if settings.get_bool('External', 'WebsocketsEnabled'):
             token_time = format(timezone.now(), u'U')
 
             params[CONTEXT_WS_TIME] = token_time

neboard/settings.py

@@ -144,7 +144,7 b' INSTALLED_APPS = ('
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
-    'django.contrib.humanize',
+    #'django.contrib.humanize',
 
     'debug_toolbar',