Templates moved to fit django documentation structure.

-neboard
    -boards
        -templates
            boards
              template1.html
              template2.html
              etc...

boards/templates/boards/posting_general.html

@@ -1,164 +1,164 b''
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
     {% if tag %}
         <title>Neboard - {{ tag }}</title>
     {% else %}
         <title>Neboard</title>
     {% endif %}
 {% endblock %}
 
 {% block content %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>{% trans 'Tag: ' %}{{ tag }}</h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% for thread in threads %}
             <div class="thread">
             {% if thread.can_bump %}
                 <div class="post">
             {% else %}
                 <div class="post dead_post">
             {% endif %}
             {% if thread.image %}
                 <div class="image">
                     <a class="fancy"
                        href="{{ thread.image.url }}"><img
                 src="{{ thread.image.url_200x150 }}"
                 alt="{% trans 'Post image' %}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.id %}">
                         (#{{ thread.id }})</a>
                     [{{ thread.pub_time }}]
                     [<a class="link" href="{% url 'thread' thread.id %}#form"
                         >{% trans "Reply" %}</a>]
                 </div>
                 {% autoescape off %}
                     {{ thread.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
             </div>
             <div class="metadata">
                 {{ thread.get_reply_count }} {% trans 'replies' %},
                 {{ thread.get_images_count }} {% trans 'images' %}.
                 {% if thread.tags.all %}
                     <span class="tags">{% trans 'Tags' %}:
                         {% for tag in thread.tags.all %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 {{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
             {% if thread.get_last_replies %}
                 <div class="last-replies">
                     {% for post in thread.get_last_replies %}
                         {% if thread.can_bump %}
                             <div class="post">
                         {% else %}
                             <div class="post dead_post">
                         {% endif %}
                             {% if post.image %}
                                 <div class="image">
                                     <a class="fancy"
                                        href="{{ post.image.url }}"><img
                                 src=" {{ post.image.url_200x150 }}"
                                 alt="{% trans 'Post image' %}" />
                                     </a>
                                 </div>
                             {% endif %}
                             <div class="message">
                                 <div class="post-info">
                                     <span class="title">{{ post.title }}</span>
                                     <a class="post_id" href="
                                 {% url 'thread' thread.id %}#{{ post.id }}">
                                         (#{{ post.id }})</a>
                                     [{{ post.pub_time }}]
                                 </div>
                                 {% autoescape off %}
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
                         </div>
                     {% endfor %}
                 </div>
             {% endif %}
         </div>
         {% endfor %}
     {% else %}
         No threads found.
         <hr />
 	{% endif %}
 
     <form enctype="multipart/form-data" method="post">{% csrf_token %}
     <div class="post-form-w">
 
         <div class="form-title">{% trans "Create new thread" %}</div>
         <div class="post-form">
             <div class="form-row">
                 <div class="form-label">{% trans 'Title' %}</div>
                 <div class="form-input">{{ form.title }}</div>
                 <div class="form-errors">{{ form.title.errors }}</div>
             </div>
             <div class="form-row">
                 <div class="form-label">{% trans 'Text' %}</div>
                 <div class="form-input">{{ form.text }}</div>
                 <div class="form-errors">{{ form.text.errors }}</div>
             </div>
             <div class="form-row">
                 <div class="form-label">{% trans 'Image' %}</div>
                 <div class="form-input">{{ form.image }}</div>
                 <div class="form-errors">{{ form.image.errors }}</div>
             </div>
             <div class="form-row">
                 <div class="form-label">{% trans 'Tags' %}</div>
                 <div class="form-input">{{ form.tags }}</div>
                 <div class="form-errors">{{ form.tags.errors }}</div>
             </div>
             <div class="form-row">
                 {{ form.captcha }}
             </div>
         </div>
         <div class="form-submit">
             <input type="submit" value="{% trans "Post" %}"/></div>
         <div>Tags must be delimited by spaces. Text or image is required
             </div>
         <div>Use <a
                 href="http://daringfireball.net/projects/markdown/basics">
             markdown</a> syntax for posting.</div>
     </div>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="https://bitbucket.org/neko259/neboard/">Neboard</a>
             2013-05 (dev)</b>
         {% trans "Pages:" %}
         {% for page in pages %}
             [<a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>]
         {% endfor %}
     </span>
 
 {% endblock %}

boards/templates/boards/settings.html

@@ -1,34 +1,34 b''
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 
 {% block head %}
     <title>Neboard settings</title>
 {% endblock %}
 
 {% block content %}
 
     <div class="post-form-w">
     <div class="post-form">
         <span class="form-title">{% trans "Theme" %}</span>
         <form method="post">{% csrf_token %}
             {% for choice in form.fields.theme.choices %}
                 <div class="settings_item">
                     <label for="{{ choice.0 }}">
                     <input type="radio" name="theme"
                            id="{{ choice.0 }}"
                            value="{{ choice.0 }}"
                            {% ifequal form.initial.theme choice.0 %}
                             checked
                            {% endifequal %}
                             />
                         {{ choice.1 }}
                     </label>
                 </div>
             {% endfor %}
         <input type="submit" value="{% trans "Save" %}" />
         </form>
     </div>
     </div>
 
 {% endblock %}
  No newline at end of file

boards/templates/boards/tags.html

@@ -1,24 +1,24 b''
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
     <title>Neboard - {% trans "tags" %}</title>
 {% endblock %}
 
 {% block content %}
 
     <div class="post">
 	{% if tags %}
 		{% for tag in all_tags %}
             <a class="tag" href="{% url 'tag' tag.name %}">
                 {{ tag.name }}</a><br />
 		{% endfor %}
 	{% else %}
 		No tags found.
         <hr />
 	{% endif %}
     </div>
 
 {% endblock %}
  No newline at end of file

boards/templates/boards/thread.html

@@ -1,112 +1,112 b''
-{% extends "base.html" %}
+{% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
     <title>Neboard - {{ posts.0.title }}</title>
 {% endblock %}
 
 {% block content %}
     <script src="{{ STATIC_URL }}js/thread.js"></script>
 
 	{% if posts %}
         <div id="posts">
 		{% for post in posts %}
             {% if posts.0.can_bump %}
                 <div class="post" id="{{ post.id }}">
             {% else %}
                 <div class="post dead_post" id="{{ post.id }}">
             {% endif %}
             {% if post.image %}
                 <div class="image">
                     <a
                             class="fancy"
                             href="{{ post.image.url }}"><img
                             src="{{ post.image.url_200x150 }}"
                             alt="{% trans 'Post image' %}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ post.title }}</span>
                     <a class="post_id" href="#{{ post.id }}">
                         (#{{ post.id }})</a>
                     [{{ post.pub_time }}]
                     {% if post.is_get %}
                         <span class="get">
                             {% trans "Get!" %}
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                 {{ post.text.rendered }}
                 {% endautoescape %}
             </div>
             {% if post.tags.all %}
                 <div class="metadata">
                     <span class="tags">{% trans 'Tags' %}:
                         {% for tag in post.tags.all %}
                             <a class="tag" href="{% url 'tag' tag.name %}">
                                 {{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 </div>
             {% endif %}
             </div>
 		{% endfor %}
         </div>
 	{% else %}
 		No thread found.
         <hr />
 	{% endif %}
 
     <form id="form" enctype="multipart/form-data" method="post"
             >{% csrf_token %}
         <div class="post-form-w">
             <div class="form-title">{% trans "Reply to thread" %}</div>
             <div class="post-form">
                 <div class="form-row">
                     <div class="form-label">{% trans 'Title' %}</div>
                     <div class="form-input">{{ form.title }}</div>
                     <div class="form-errors">{{ form.title.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Text' %}</div>
                     <div class="form-input">{{ form.text }}</div>
                     <div class="form-errors">{{ form.text.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Image' %}</div>
                     <div class="form-input">{{ form.image }}</div>
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
                 <div class="form-row">
                     {{ form.captcha }}
                 </div>
             </div>
 
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
             <div><a href="http://daringfireball.net/projects/markdown/basics">
                 {% trans 'Basic markdown syntax.' %}</a></div>
             <div>{% trans 'Example: ' %}*<i>{% trans 'italic' %}</i>*,
                 **<b>{% trans 'bold' %}</b>**</div>
             <div>{% trans 'Quotes can be inserted with' %} "&gt;"</div>
             <div>{% trans 'Links to answers can be inserted with' %} "&gt;&gt;
                 123"</div>
         </div>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         {{ posts.0.get_reply_count }} {% trans 'replies' %},
         {{ posts.0.get_images_count }} {% trans 'images' %}.
         {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
     </span>
 
 {% endblock %}
  No newline at end of file

boards/views.py

@@ -1,212 +1,212 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
 import neboard
 
 
 def index(request, page=0):
     context = RequestContext(request)
 
     threadFormClass = (ThreadForm
                        if utils.check_if_human(request)
                        else ThreadCaptchaForm)
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList)
 
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = threadFormClass(error_class=PlainErrorList)
 
     threads = Post.objects.get_threads(page=int(page))
 
     # TODO Get rid of the duplicate code in index and tag views
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
     context['pages'] = range(Post.objects.get_thread_page_count())
 
-    return render(request, 'posting_general.html',
+    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)."""
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     ip = _get_client_ip(request)
 
     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 = RequestContext(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag_name
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
     context['pages'] = range(Post.objects.get_thread_page_count(tag=tag))
 
     context['form'] = form
 
-    return render(request, 'posting_general.html',
+    return render(request, 'boards/posting_general.html',
                   context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     postFormClass = (PostForm if utils.check_if_human(request) else
                      PostCaptchaForm)
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList)
         if form.is_valid():
             return _new_post(request, form, post_id)
     else:
         form = postFormClass(error_class=PlainErrorList)
 
     posts = Post.objects.get_thread(post_id)
 
     context = RequestContext(request)
 
     context['posts'] = posts
     context['form'] = form
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
 
-    return render(request, 'thread.html', context)
+    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, 'login.html', {'error': 'Login error'})
+            response = render(request, 'boards/login.html', {'error': 'Login error'})
     else:
-        response = render(request, 'login.html', {})
+        response = render(request, 'boards/login.html', {})
 
     return response
 
 
 def logout(request):
     request.session['admin'] = False
     return HttpResponseRedirect('/')
 
 
 def settings(request):
     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, 'settings.html', context)
+        return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
     context = RequestContext(request)
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
-    return render(request, 'tags.html', context)
+    return render(request, 'boards/tags.html', context)
 
 
 def _get_theme(request):
     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