Fixed threads title in the browser title bar. Moving old threads to archive instead of deleting them.

boards/migrations/0018_auto__add_field_thread_archived.py

@@ -0,0 +1,85 b''
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Thread.archived'
+        db.add_column(u'boards_thread', 'archived',
+                      self.gf('django.db.models.fields.BooleanField')(default=0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Thread.archived'
+        db.delete_column(u'boards_thread', 'archived')
+
+
+    models = {
+        'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            'can_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'reason': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '200'})
+        },
+        'boards.post': {
+            'Meta': {'object_name': 'Post'},
+            '_text_rendered': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('boards.thumbs.ImageWithThumbsField', [], {'max_length': '100', 'blank': 'True'}),
+            'image_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_pre_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_pre_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'poster_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'referenced_posts': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'rfp+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Post']", 'null': 'True'}),
+            'thread_new': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Thread']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.User']", 'null': 'True'})
+        },
+        'boards.setting': {
+            'Meta': {'object_name': 'Setting'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.User']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'linked': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tag+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Thread']"})
+        },
+        'boards.thread': {
+            'Meta': {'object_name': 'Thread'},
+            'archived': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tre+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['boards.Tag']", 'symmetrical': 'False'})
+        },
+        'boards.user': {
+            'Meta': {'object_name': 'User'},
+            'fav_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'fav_threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rank': ('django.db.models.fields.IntegerField', [], {}),
+            'registration_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'user_id': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

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: 2013-12-24 20:39+0200\n"
+"POT-Creation-Date: 2014-01-06 21:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -74,8 +74,7 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82 \xd0\xb8\xd0\xbb\xd0\xb8 \xd0\xba\xd0\xb0\xd1\x80\xd1\x82\xd0\xb8\xd0\xbd\xd0\xba\xd0\xb0 \xd0\xb4\xd0\xbe\xd0\xbb\xd0\xb6\xd0\xbd\xd1\x8b \xd0\xb1\xd1\x8b\xd1\x82\xd1\x8c \xd0\xb2\xd0\xb2\xd0\xb5\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:163 templates/boards/post.html:61 templates/boards/tags.html:6
-#: templates/boards/rss/post.html:10
+#: forms.py:163 templates/boards/tags.html:6 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
@@ -112,6 +111,43 b' msgstr "\xd0\x9d\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd0\xbe"'
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
+#: templates/boards/archive.html:45 templates/boards/posting_general.html:64
+msgid "Previous page"
+msgstr "Предыдущая страница"
+
+#: templates/boards/archive.html:77 templates/boards/post.html:37
+#: templates/boards/posting_general.html:103 templates/boards/thread.html:69
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/boards/archive.html:81 templates/boards/post.html:40
+#: templates/boards/posting_general.html:107 templates/boards/thread.html:72
+msgid "Ban IP"
+msgstr "Заблокировать IP"
+
+#: templates/boards/archive.html:90 templates/boards/post.html:53
+#: templates/boards/posting_general.html:116
+#: templates/boards/posting_general.html:180 templates/boards/thread.html:81
+msgid "Replies"
+msgstr "Ответы"
+
+#: templates/boards/archive.html:99 templates/boards/posting_general.html:125
+#: templates/boards/thread.html:138 templates/boards/thread_gallery.html:58
+msgid "images"
+msgstr "изображений"
+
+#: templates/boards/archive.html:124 templates/boards/posting_general.html:203
+msgid "Next page"
+msgstr "Следующая страница"
+
+#: templates/boards/archive.html:129 templates/boards/posting_general.html:208
+msgid "No threads exist. Create the first one!"
+msgstr "Нет тем. Создайте первую!"
+
+#: templates/boards/archive.html:138 templates/boards/posting_general.html:235
+msgid "Pages:"
+msgstr "Страницы: "
+
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
@@ -149,12 +185,16 b' msgstr "\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8"'
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:52
+#: templates/boards/base.html:51
+msgid "Archive"
+msgstr "Архив"
+
+#: templates/boards/base.html:53
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:54
+#: templates/boards/base.html:55
 msgid "Up"
 msgstr "Вверх"
 
@@ -166,52 +206,20 b' msgstr "ID \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f"'
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:35 templates/boards/posting_general.html:103
-#: templates/boards/thread.html:68
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/boards/post.html:38 templates/boards/posting_general.html:107
-#: templates/boards/thread.html:71
-msgid "Ban IP"
-msgstr "Заблокировать IP"
-
-#: templates/boards/post.html:51 templates/boards/posting_general.html:116
-#: templates/boards/posting_general.html:180 templates/boards/thread.html:80
-msgid "Replies"
-msgstr "Ответы"
-
-#: templates/boards/posting_general.html:64
-msgid "Previous page"
-msgstr "Предыдущая страница"
-
 #: templates/boards/posting_general.html:97
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:125 templates/boards/thread.html:130
-#: templates/boards/thread_gallery.html:52
-msgid "images"
-msgstr "изображений"
-
 #: templates/boards/posting_general.html:142
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:203
-msgid "Next page"
-msgstr "Следующая страница"
-
-#: templates/boards/posting_general.html:208
-msgid "No threads exist. Create the first one!"
-msgstr "Нет тем. Создайте первую!"
-
 #: templates/boards/posting_general.html:214
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:218 templates/boards/thread.html:112
+#: templates/boards/posting_general.html:218 templates/boards/thread.html:115
 msgid "Post"
 msgstr "Отправить"
 
@@ -220,14 +228,10 b' msgid "Tags must be delimited by spaces.'
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:225 templates/boards/thread.html:116
+#: templates/boards/posting_general.html:225 templates/boards/thread.html:119
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:235
-msgid "Pages:"
-msgstr "Страницы: "
-
 #: templates/boards/settings.html:14
 msgid "User:"
 msgstr "Пользователь:"
@@ -260,27 +264,27 b' msgstr "\xd1\x82\xd0\xb5\xd0\xbc"'
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:22 templates/boards/thread_gallery.html:20
+#: templates/boards/thread.html:19 templates/boards/thread_gallery.html:20
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
-#: templates/boards/thread.html:23 templates/boards/thread_gallery.html:21
+#: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
-#: templates/boards/thread.html:31
+#: templates/boards/thread.html:28
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:106
+#: templates/boards/thread.html:109
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:129 templates/boards/thread_gallery.html:51
+#: templates/boards/thread.html:137 templates/boards/thread_gallery.html:57
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/thread.html:131 templates/boards/thread_gallery.html:53
+#: templates/boards/thread.html:139 templates/boards/thread_gallery.html:59
 msgid "Last update: "
 msgstr "Последнее обновление: "
 

boards/models/post.py

@@ -15,6 +15,8 b' from markupfield.fields import MarkupFie'
 from neboard import settings
 from boards import thumbs
 
+MAX_TITLE_LENGTH = 50
+
 APP_LABEL_BOARDS = 'boards'
 
 CACHE_KEY_PPD = 'ppd'
@@ -64,7 +66,8 b' class PostManager(models.Manager):'
                            thread_new=thread,
                            image=image,
                            poster_ip=ip,
-                           poster_user_agent=UNKNOWN_UA, # TODO Get UA at last!
+                           poster_user_agent=UNKNOWN_UA,  # TODO Get UA at
+                           # last!
                            last_edit_time=posting_time,
                            user=user)
 
@@ -111,7 +114,7 b' class PostManager(models.Manager):'
 
     # TODO Move this method to thread manager
     def get_threads(self, tag=None, page=ALL_PAGES,
-                    order_by='-bump_time'):
+                    order_by='-bump_time', archived=False):
         if tag:
             threads = tag.threads
 
@@ -120,7 +123,7 b' class PostManager(models.Manager):'
         else:
             threads = Thread.objects.all()
 
-        threads = threads.order_by(order_by)
+        threads = threads.filter(archived=archived).order_by(order_by)
 
         if page != ALL_PAGES:
             thread_count = threads.count()
@@ -134,25 +137,23 b' class PostManager(models.Manager):'
         return threads
 
     # TODO Move this method to thread manager
-    def get_thread_page_count(self, tag=None):
+    def get_thread_page_count(self, tag=None, archived=False):
         if tag:
             threads = Thread.objects.filter(tags=tag)
         else:
             threads = Thread.objects.all()
 
+        threads = threads.filter(archived=archived)
+
         return self._get_page_count(threads.count())
 
     # TODO Move this method to thread manager
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
-        delete the old ones.
+        archive the old ones.
         """
 
-        # 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 = threads.count()
 
@@ -160,7 +161,9 b' class PostManager(models.Manager):'
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
-            map(Thread.delete_with_posts, old_threads)
+            for thread in old_threads:
+                thread.archived = True
+                thread.save()
 
     def connect_replies(self, post):
         """
@@ -270,7 +273,7 b' class Post(models.Model):'
     def get_title(self):
         title = self.title
         if len(title) == 0:
-            title = self.text.raw[:20]
+            title = self.text.rendered[:MAX_TITLE_LENGTH]
 
         return title
 
@@ -294,6 +297,7 b' class Thread(models.Model):'
     last_edit_time = models.DateTimeField()
     replies = models.ManyToManyField('Post', symmetrical=False, null=True,
                                      blank=True, related_name='tre+')
+    archived = models.BooleanField(default=False)
 
     def get_tags(self):
         """
@@ -321,6 +325,9 b' class Thread(models.Model):'
         Check if the thread can be bumped by replying
         """
 
+        if self.archived:
+            return False
+
         post_count = self.get_reply_count()
 
         return post_count < settings.MAX_POSTS_PER_THREAD

boards/static/css/md/base_page.css

@@ -43,7 +43,7 b' html {'
     color: #fff380;
 }
 
-.post, .dead_post, #posts-table {
+.post, .dead_post, .archive_post, #posts-table {
     background: #333;
     margin: 5px;
     padding: 10px;
@@ -191,6 +191,10 b' blockquote {'
     background-color: #442222;
 }
 
+.archive_post {
+    background-color: #000;
+}
+
 .mark_btn {
     border: 1px solid;
     min-width: 2ex;

boards/templates/boards/archive.html

@@ -6,11 +6,7 b''
 {% load static %}
 
 {% block head %}
-    {% if tag %}
-        <title>Neboard - {{ tag.name }}</title>
-    {% else %}
-        <title>Neboard</title>
-    {% endif %}
+    <title>Neboard</title>
 
     {% if prev_page %}
         <link rel="next" href="
@@ -37,21 +33,6 b''
 
     {% get_current_language as LANGUAGE_CODE %}
 
-{% if tag %}
-    <div class="tag_info">
-        <h2>
-            {% if tag in user.fav_tags.all %}
-                <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
-                   class="fav">★</a>
-            {% else %}
-                <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
-                   class="not_fav">★</a>
-            {% endif %}
-            #{{ tag.name }}
-        </h2>
-    </div>
-{% endif %}
-
     {% if threads %}
         {% if prev_page %}
             <div class="page_link">
@@ -68,11 +49,7 b''
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
-            {% if thread.bumpable %}
-		        <div class="post" id="{{ thread.op.id }}">
-            {% else %}
-		        <div class="post dead_post" id="{{ thread.op.id }}">
-            {% endif %}
+            <div class="post archive_post" id="{{ thread.op.id }}">
             {% if thread.op.image %}
                 <div class="image">
                     <a class="thumb"
@@ -91,10 +68,7 b''
                     <span class="title">{{ thread.op.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     > ({{ thread.op.id }})</a>
-                    [{{ thread.op.pub_time }}]
-                    [<a class="link" href="
-                    {% url 'thread' thread.op.id %}#form"
-                        >{% trans "Reply" %}</a>]
+                    [{{ thread.op.pub_time }}] — [{{ thread.thread.bump_time }}]
 
                     {% if moderator %}
                         <span class="moderator_info">
@@ -135,59 +109,6 b''
                 {% endif %}
             </div>
             </div>
-            {% if thread.last_replies.exists %}
-                {% if thread.skipped_replies %}
-                    <div class="skipped_replies">
-                        <a href="{% url 'thread' thread.op.id %}">
-                        {% blocktrans with count=thread.skipped_replies %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
-                        </a>
-                    </div>
-                {% endif %}
-                <div class="last-replies">
-                    {% for post in thread.last_replies %}
-                        {% if thread.bumpable %}
-                            <div class="post" id="{{ post.id }}">
-                        {% else %}
-                            <div class="post dead_post" id="{{ post.id }}">
-                        {% endif %}
-                            {% if post.image %}
-                                <div class="image">
-                                    <a class="thumb"
-                                       href="{{ post.image.url }}"><img
-                                            src=" {{ post.image.url_200x150 }}"
-                                            alt="{{ post.id }}"
-                                            width="{{ post.image_pre_width }}"
-                                            height="{{ post.image_pre_height }}"
-                                            data-width="{{ post.image_width }}"
-                                            data-height="{{ post.image_height }}"/>
-                                    </a>
-                                </div>
-                            {% endif %}
-                            <div class="message">
-                                <div class="post-info">
-                                    <span class="title">{{ post.title }}</span>
-                                    <a class="post_id" href="
-                                {% url 'thread' thread.op.id %}#{{ post.id }}">
-                                        ({{ post.id }})</a>
-                                    [{{ post.pub_time }}]
-                                </div>
-                                {% autoescape off %}
-                                    {{ post.text.rendered|truncatewords_html:50 }}
-                                {% endautoescape %}
-                        </div>
-                    {% if post.is_referenced %}
-                        <div class="refmap">
-                            {% trans "Replies" %}:
-                            {% for ref_post in post.get_sorted_referenced_posts %}
-                                <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
-                                        >{% if not forloop.last %},{% endif %}
-                            {% endfor %}
-                        </div>
-                    {% endif %}
-                        </div>
-                    {% endfor %}
-                </div>
-            {% endif %}
         </div>
         {% endcache %}
         {% endfor %}
@@ -208,24 +129,6 b''
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
-    <div class="post-form-w">
-        <script src="{% static 'js/panel.js' %}"></script>
-        <div class="post-form">
-            <div class="form-title">{% trans "Create new thread" %}</div>
-            <form enctype="multipart/form-data" method="post">{% csrf_token %}
-                {{ form.as_div }}
-                <div class="form-submit">
-                    <input type="submit" value="{% trans "Post" %}"/>
-                </div>
-            </form>
-            <div>
-                {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
-            </div>
-            <div><a href="{% url "staticpage" name="help" %}">
-                {% trans 'Text syntax' %}</a></div>
-        </div>
-    </div>
-
 {% endblock %}
 
 {% block metapanel %}
@@ -239,11 +142,7 b''
                     class="current_page"
                 {% endifequal %}
                 href="
-            {% if tag %}
-                {% url "tag" tag_name=tag page=page %}
-            {% else %}
-                {% url "index" page=page %}
-            {% endif %}
+                {% url "archive" page=page %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}

boards/templates/boards/base.html

@@ -48,6 +48,7 b''
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    [<a href="{% url "archive" %}">{% trans 'Archive' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}

boards/templates/boards/posting_general.html

@@ -231,7 +231,7 b''
 {% block metapanel %}
 
     <span class="metapanel">
-        <b><a href="{% url "authors" %}">Neboard</a> 1.5 Aker</b>
+        <b><a href="{% url "authors" %}">Neboard</a> 1.6 Amon</b>
         {% trans "Pages:" %}[
         {% for page in pages %}
             <a

boards/templates/boards/thread.html

@@ -6,7 +6,7 b''
 {% load board %}
 
 {% block head %}
-    <title>Neboard - {{ thread.get_opening_post.get_title }}</title>
+    <title>Neboard - {{ thread.get_opening_post.get_title|striptags }}</title>
 {% endblock %}
 
 {% block content %}
@@ -33,6 +33,8 b''
     {% for post in posts %}
         {% if bumpable %}
             <div class="post" id="{{ post.id }}">
+        {% elif thread.archived %}
+            <div class="post archive_post" id="{{ post.id }}">
         {% else %}
             <div class="post dead_post" id="{{ post.id }}">
         {% endif %}
@@ -56,8 +58,10 b''
                 <a class="post_id" href="#{{ post.id }}">
                     ({{ post.id }})</a>
                 [{{ post.pub_time }}]
+            {% if not thread.archived %}
             [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                 ; return false;">&gt;&gt;</a>]
+            {% endif %}
 
                 {% if moderator %}
                     <span class="moderator_info">
@@ -98,6 +102,8 b''
     </div>
     {% endcache %}
 
+    {% if not thread.archived %}
+
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="form-title">{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}</div>
@@ -114,7 +120,9 b''
         </div>
     </div>
 
-    <script src="{% static 'js/thread_update.js' %}"></script>
+            <script src="{% static 'js/thread_update.js' %}"></script>
+    {% endif %}
+
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% endspaceless %}

boards/templates/boards/thread_gallery.html

@@ -6,7 +6,7 b''
 {% load board %}
 
 {% block head %}
-    <title>Neboard - {{ thread.get_opening_post.get_title }}</title>
+    <title>Neboard - {{ thread.get_opening_post.get_title|striptags }}</title>
 {% endblock %}
 
 {% block content %}

boards/urls.py

@@ -14,6 +14,9 b" urlpatterns = patterns('',"
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
 
+    url(r'^archive/$', views.archive, name='archive'),
+    url(r'^archive/page/(?P<page>\w+)/$', views.archive, name='archive'),
+
     # login page
     url(r'^login/$', views.login, name='login'),
 

boards/views/__init__.py

@@ -67,7 +67,7 b' def index(request, page=0):'
     context['current_page'] = int(page)
 
     page_count = Post.objects.get_thread_page_count()
-    context['pages'] = range(page_count)
+    context['pages'] = range(page_count) if page_count > 0 else [0]
     page = int(page)
     if page < page_count - 1:
         context['next_page'] = str(page + 1)
@@ -78,6 +78,28 b' def index(request, page=0):'
                   context)
 
 
+def archive(request, page=0):
+    context = _init_default_context(request)
+
+    threads = []
+    for thread_to_show in Post.objects.get_threads(page=int(page),
+                                                   archived=True):
+        threads.append(_get_template_thread(thread_to_show))
+
+    context['threads'] = threads
+    context['current_page'] = int(page)
+
+    page_count = Post.objects.get_thread_page_count(archived=True)
+    context['pages'] = range(page_count) if page_count > 0 else [0]
+    page = int(page)
+    if page < page_count - 1:
+        context['next_page'] = str(page + 1)
+    if page > 0:
+        context['prev_page'] = str(page - 1)
+
+    return render(request, 'boards/archive.html', context)
+
+
 @transaction.atomic
 def _new_post(request, form, opening_post=None):
     """Add a new post (in thread or as a reply)."""
@@ -184,7 +206,7 b' def thread(request, post_id, mode=MODE_N'
         kwargs = {}
 
     opening_post = get_object_or_404(Post, id=post_id)
-    if request.method == 'POST':
+    if request.method == 'POST' and not opening_post.thread_new.archived:
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         form.session = request.session

changelog.markdown

@@ -4,4 +4,7 b' styles.'
 * Showing notification in page title when new posts are loaded into the open
 thread.
 * Thread moderation fixes
-* Added new gallery with search links and image metadata
  No newline at end of file
+* Added new gallery with search links and image metadata
+
+# 1.6 Amon #
+* Deleted threads are moved to archive instead of permanent delete
  No newline at end of file