Neboard - {{ thread.get_replies.0.get

@@ -40,6 +46,8 @@ href="{{ post.image.url }}"> {{ post.id }}

diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html new file mode 100644 --- /dev/null +++ b/boards/templates/boards/thread_gallery.html @@ -0,0 +1,66 @@ +{% extends "boards/base.html" %} + +{% load i18n %} +{% load cache %} +{% load static from staticfiles %} +{% load board %} + +{% block head %} + Neboard - {{ thread.get_opening_post.get_title }} +{% endblock %} + +{% block content %} + {% spaceless %} + {% get_current_language as LANGUAGE_CODE %} + + + + {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE %} +

+ {% trans 'Normal mode' %}, + {% trans 'Gallery mode' %} +

+ +

+ {% for post in thread.get_replies %} + {% if post.image %} +

+ +

+ {{ post.image_width }}x{{ post.image_height }} + {% image_actions post.image.url request.get_host %} +

+ {% endif %} + {% endfor %} +

+ {% endcache %} + + {% endspaceless %} +{% endblock %} + +{% block metapanel %} + + {% get_current_language as LANGUAGE_CODE %} + + + {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %} + {{ thread.get_reply_count }} {% trans 'replies' %}, + {{ thread.get_images_count }} {% trans 'images' %}. + {% trans 'Last update: ' %}{{ thread.last_edit_time }} + [RSS] + {% endcache %} + + +{% endblock %} diff --git a/boards/templatetags/board.py b/boards/templatetags/board.py --- a/boards/templatetags/board.py +++ b/boards/templatetags/board.py @@ -6,6 +6,17 @@ from django import template register = template.Library() +actions = [ + { + 'name': 'google', + 'link': 'http://google.com/searchbyimage?image_url=%s', + }, + { + 'name': 'iqdb', + 'link': 'http://iqdb.org/?url=%s', + }, +] + @register.simple_tag(name='post_url') def post_url(*args, **kwargs): @@ -21,3 +32,18 @@ def post_url(*args, **kwargs): link = reverse(thread, kwargs={'post_id': post_id}) return link + + +@register.simple_tag(name='image_actions') +def image_actions(*args, **kwargs): + image_link = args[0] + if len(args) > 1: + image_link = 'http://' + args[1] + image_link # TODO https? + + result = '' + + for action in actions: + result += '[' + \ + action['name'] + ']' + + return result diff --git a/boards/thumbs.py b/boards/thumbs.py --- a/boards/thumbs.py +++ b/boards/thumbs.py @@ -3,6 +3,7 @@ django-thumbs by Antonio Melé http://django.es """ +from django.core.files.images import ImageFile from django.db.models import ImageField from django.db.models.fields.files import ImageFieldFile from PIL import Image @@ -13,13 +14,13 @@ import cStringIO def generate_thumb(img, thumb_size, format): """ Generates a thumbnail image and returns a ContentFile object with the thumbnail - + Parameters: =========== img File object - + thumb_size desired thumbnail size, ie: (200,120) - + format format of the original image ('jpeg','gif','png',...) (this format will be used for the generated thumbnail, too) """ @@ -41,7 +42,7 @@ def generate_thumb(img, thumb_size, form # crop it image2 = image.crop( (xnewsize, ynewsize, xsize - xnewsize, ysize - ynewsize)) - # load is necessary after crop + # load is necessary after crop image2.load() # thumbnail of the cropped image (with ANTIALIAS to make it look better) image2.thumbnail(thumb_size, Image.ANTIALIAS) @@ -160,7 +161,9 @@ class ImageWithThumbsField(ImageField): """ def __init__(self, verbose_name=None, name=None, width_field=None, - height_field=None, sizes=None, **kwargs): + height_field=None, sizes=None, + preview_width_field=None, preview_height_field=None, + **kwargs): self.verbose_name = verbose_name self.name = name self.width_field = width_field @@ -168,6 +171,46 @@ class ImageWithThumbsField(ImageField): self.sizes = sizes super(ImageField, self).__init__(**kwargs) + if sizes is not None and len(sizes) == 1: + self.preview_width_field = preview_width_field + self.preview_height_field = preview_height_field + + def update_dimension_fields(self, instance, force=False, *args, **kwargs): + """ + Update original image dimension fields and thumb dimension fields + (only if 1 thumb size is defined) + """ + + super(ImageWithThumbsField, self).update_dimension_fields(instance, + force, *args, + **kwargs) + thumb_width_field = self.preview_width_field + thumb_height_field = self.preview_height_field + + if thumb_width_field is None or thumb_height_field is None \ + or len(self.sizes) != 1: + return + + original_width = getattr(instance, self.width_field) + original_height = getattr(instance, self.height_field) + + if original_width > 0 and original_height > 0: + thumb_width, thumb_height = self.sizes[0] + + w_scale = float(thumb_width) / original_width + h_scale = float(thumb_height) / original_height + scale_ratio = min(w_scale, h_scale) + + if scale_ratio >= 1: + thumb_width_ratio = original_width + thumb_height_ratio = original_height + else: + thumb_width_ratio = int(original_width * scale_ratio) + thumb_height_ratio = int(original_height * scale_ratio) + + setattr(instance, thumb_width_field, thumb_width_ratio) + setattr(instance, thumb_height_field, thumb_height_ratio) + from south.modelsinspector import add_introspection_rules add_introspection_rules([], ["^boards\.thumbs\.ImageWithThumbsField"]) diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -31,6 +31,7 @@ urlpatterns = patterns('', # /boards/thread/ url(r'^thread/(?P\w+)/$', views.thread, name='thread'), + url(r'^thread/(?P\w+)/(?P\w+)/$', views.thread, name='thread_mode'), url(r'^settings/$', views.settings, name='settings'), url(r'^tags/$', views.all_tags, name='tags'), url(r'^captcha/', include('captcha.urls')), diff --git a/boards/views/__init__.py b/boards/views/__init__.py --- a/boards/views/__init__.py +++ b/boards/views/__init__.py @@ -7,7 +7,7 @@ import re from django.core import serializers from django.core.urlresolvers import reverse -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, Http404 from django.http.response import HttpResponse from django.template import RequestContext from django.shortcuts import render, redirect, get_object_or_404 @@ -30,6 +30,8 @@ import neboard BAN_REASON_SPAM = 'Autoban: spam bot' +MODE_GALLERY = 'gallery' +MODE_NORMAL = 'normal' def index(request, page=0): @@ -62,6 +64,7 @@ def index(request, page=0): # TODO Make this generic for tag and threads list pages context['threads'] = None if len(threads) == 0 else threads context['form'] = form + context['current_page'] = int(page) page_count = Post.objects.get_thread_page_count() context['pages'] = range(page_count) @@ -154,6 +157,7 @@ def tag(request, tag_name, page=0): context = _init_default_context(request) context['threads'] = None if len(threads) == 0 else threads context['tag'] = tag + context['current_page'] = int(page) page_count = Post.objects.get_thread_page_count(tag=tag) context['pages'] = range(page_count) @@ -169,7 +173,7 @@ def tag(request, tag_name, page=0): context) -def thread(request, post_id): +def thread(request, post_id, mode=MODE_NORMAL): """Get all thread posts""" if utils.need_include_captcha(request): @@ -209,7 +213,14 @@ def thread(request, post_id): context["last_update"] = _datetime_to_epoch(thread_to_show.last_edit_time) context["thread"] = thread_to_show - return render(request, 'boards/thread.html', context) + if MODE_NORMAL == mode: + document = 'boards/thread.html' + elif MODE_GALLERY == mode: + document = 'boards/thread_gallery.html' + else: + raise Http404 + + return render(request, document, context) def login(request): diff --git a/changelog.markdown b/changelog.markdown new file mode 100644 --- /dev/null +++ b/changelog.markdown @@ -0,0 +1,7 @@ +# 1.5 Aker # +* Saving image previews size. No space will be shown below images in some +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 diff --git a/readme.markdown b/readme.markdown --- a/readme.markdown +++ b/readme.markdown @@ -27,7 +27,7 @@ Site: http://neboard.me/ # INSTALLATION # 1. Install all dependencies over pip or system-wide -2. Setup a database in neboard/settings.py +2. Setup a database in `neboard/settings.py` 3. Run `./manage.py syncdb` and ensure the database was created 4. Run `./manage.py migrate boards` to apply all south migrations @@ -41,6 +41,15 @@ See django-admin command help for detail Also consider using wsgi or fcgi interfaces on production servers. +# UPGRADE # + +1. Backup your project data. +2. Save the settings in `neboard/settings.py` and `boards/settings.py` +3. Copy the project contents over the old project directory +4. Run migrations by `./manage.py migrate boards` + +You can also just clone the mercurial project and pull it to update + # CONCLUSION # Enjoy our software and thank you! diff --git a/todo.txt b/todo.txt --- a/todo.txt +++ b/todo.txt @@ -12,6 +12,7 @@ denied". Use second only for autoban for [DONE] Split up post model into post and thread, and move everything that is used only in 1st post to thread model. [DONE] Show board speed in the lower panel (posts per day) +[DONE] Save image thumbnails size to the separate field [NOT STARTED] Tree view (JS) [NOT STARTED] Adding tags to images filename @@ -22,7 +23,6 @@ and move everything that is used only in [NOT STARTED] Javascript disabling engine [NOT STARTED] Group tags by first letter in all tags list [NOT STARTED] Character counter in the post field -[NOT STARTED] Save image thumbnails size to the separate field [NOT STARTED] Whitelist functionality. Permin autoban of an address [NOT STARTED] Statistics module. Count views (optional, may result in bad performance), posts per day/week/month, users (or IPs)