u/bodqhrohro/swineboard Commit - r260:9648bcc7

Using static template tag for resources.

neko259 -

r260:9648bcc7 default

parent child

boards/templates/boards/base.html

0 +15 -13

             {% load staticfiles %}
             {% load i18n %}
+            {% load static from staticfiles %}
             <!DOCTYPE html>
             <html>
             <head>
                 <link rel="stylesheet" type="text/css"
-                      href="{{ STATIC_URL }}css/base.css" media="all"/>
+                    href="{% static 'css/base.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css"
-                      href="{{ STATIC_URL }}css/{{ theme }}/base_page.css?6" media="all"/>
+            	href="{% static theme_css %}" media="all"/>
-                <link rel="alternate" type="application/rss+xml" href="rss/" title="
+                <link rel="alternate" type="application/rss+xml" href="rss/" title=
-                {% trans 'Feed' %}"/>
+            	"{% trans 'Feed' %}"/>
                 <link rel="icon" type="image/png"
-                      href="{{ STATIC_URL }}favicon.png">
+                    href="{% static 'favicon.png' %}">
                 <meta name="viewport" content="width=device-width, initial-scale=1"/>
                 <meta charset="utf-8"/>
                 {% block head %}{% endblock %}
             </head>
             <body>
-            <script src="{{ STATIC_URL }}js/jquery-2.0.1.min.js"></script>
+            <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
-            <script src="{{ STATIC_URL }}js/jquery-ui-1.10.3.custom.min.js"></script>
+            <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
-            <script src="{{ STATIC_URL }}js/jquery.mousewheel.js"></script>
+            <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
             <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
-            <script src="{{ STATIC_URL }}js/refmaps.js"></script>
+            <script src="{% static 'js/refmaps.js' %}"></script>
-            <script src="{{ STATIC_URL }}js/panel.js"></script>
+            <script src="{% static 'js/panel.js' %}"></script>
-            <script src="{{ STATIC_URL }}js/popup.js"></script>
+            <script src="{% static 'js/popup.js' %}"></script>
-            <script src="{{ STATIC_URL }}js/image.js"></script>
+            <script src="{% static 'js/image.js' %}"></script>
-            <script src="{{ STATIC_URL }}js/main.js?1"></script>
+            <script src="{% static 'js/main.js' %}"></script>
             <div class="navigation_panel">
                 <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
                 {% for tag in tags %}
                     <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
                             >{{ tag.name }}</a>
                 {% endfor %}
                 <a class="tag" href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
                         >[...]</a>
                 <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
             </div>
             {% block content %}{% endblock %}
             <div class="navigation_panel">
                 {% block metapanel %}{% endblock %}
                 [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
                 <a class="link" href="#top">{% trans 'Up' %}</a>
             </div>
             <div class="footer">
                 <!-- Put your banners here -->
             </div>
             </body>
             </html>

boards/templates/boards/thread.html

0 +2 -1

             {% extends "boards/base.html" %}
             {% load i18n %}
             {% load markup %}
             {% load cache %}
+            {% load static from staticfiles %}
             {% block head %}
                 <title>Neboard - {{ posts.0.get_title }}</title>
             {% endblock %}
             {% block content %}
                 {% get_current_language as LANGUAGE_CODE %}
-                <script src="{{ STATIC_URL }}js/thread.js"></script>
+                <script src="{% static 'js/thread.js' }%"></script>
             	{% if posts %}
                     {% cache 600 thread_view posts.0.last_edit_time moderator LANGUAGE_CODE %}
                     <div class="thread">
             	    {% for post in posts %}
                         {% if 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 }}"
                                         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="#{{ post.id }}">
                                     (#{{ post.id }})</a>
                                 [{{ post.pub_time }}]
                             [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                                 ; return false;">&gt;&gt;</a>]
                                 {% if moderator %}
                                     <span class="moderator_info">
                                         [<a href="{% url 'delete' post_id=post.id %}"
                                             >{% trans 'Delete' %}</a>]
                                         ({{ post.poster_ip }})
                                         [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                                             >{% trans 'Ban IP' %}</a>]
                                     </span>
                                 {% endif %}
                             </div>
                             {% autoescape off %}
                             {{ post.text.rendered }}
                             {% endautoescape %}
                         </div>
                         {% if post.id == posts.0.id %}
                             <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>
                     {% endcache %}
             	{% 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" %} #{{ posts.0.id }}</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 'Formatting' %}</div>
                                 <div class="form-input" id="mark_panel">
                                     <span class="mark_btn" id="quote"><span class="quote">&gt;{% trans 'quote' %}</span></span>
                                     <span class="mark_btn" id="italic"><i>{% trans 'italic' %}</i></span>
                                     <span class="mark_btn" id="bold"><b>{% trans 'bold' %}</b></span>
                                     <span class="mark_btn" id="spoiler"><span class="spoiler">{% trans 'spoiler' %}</span></span>
                                     <span class="mark_btn" id="comment"><span class="comment">// {% trans 'comment' %}</span></span>
                                 </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-email">
                                 <div class="form-label">{% trans 'e-mail' %}</div>
                                 <div class="form-input">{{ form.email }}</div>
                                 <div class="form-errors">{{ form.email.errors }}</div>
                             </div>
                             <div class="form-row">
                                 {{ form.captcha }}
                                 <div class="form-errors">{{ form.captcha.errors }}</div>
                             </div>
                             <div class="form-row">
                                 <div class="form-errors">{{ form.other.errors }}</div>
                             </div>
                         </div>
                         <div class="form-submit"><input type="submit"
                                                         value="{% trans "Post" %}"/></div>
                         <div><a href="{% url "staticpage" name="help" %}">
                             {% trans 'Text syntax' %}</a></div>
                     </div>
                 </form>
             {% endblock %}
             {% block metapanel %}
                 {% get_current_language as LANGUAGE_CODE %}
                 <span class="metapanel">
                     {% cache 600 thread_meta posts.0.last_edit_time moderator LANGUAGE_CODE %}
                         {{ posts.0.get_reply_count }} {% trans 'replies' %},
                         {{ posts.0.get_images_count }} {% trans 'images' %}.
                         {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
                         [<a href="rss/">RSS</a>]
                     {% endcache %}
                 </span>
             {% endblock %}

boards/views.py

0 +4 -1

             import hashlib
             import string
             from django.core import serializers
             from django.core.urlresolvers import reverse
             from django.http import HttpResponseRedirect
             from django.http.response import HttpResponse
             from django.template import RequestContext
             from django.shortcuts import render, redirect, get_object_or_404
             from django.utils import timezone
             from boards import forms
             import boards
             from boards import utils
             from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
                 ThreadCaptchaForm, PostCaptchaForm, LoginForm, ModeratorSettingsForm
             from boards.models import Post, Tag, Ban, User, RANK_USER, SETTING_MODERATE
             from boards import authors
             from boards.utils import get_client_ip
             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)
                     form.session = request.session
                     if form.is_valid():
                         return _new_post(request, form)
                 else:
                     form = threadFormClass(error_class=PlainErrorList, **kwargs)
                 threads = []
                 for thread in Post.objects.get_threads(page=int(page)):
                     threads.append({'thread': thread,
                                     'bumpable': thread.can_bump()})
                 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).exists()
                 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 = string.lower(tag_name.strip())
                             if len(tag_name) > 0:
                                 tag, created = Tag.objects.get_or_create(name=tag_name)
                                 tags.append(tag)
                 op = None if thread_id == boards.models.NO_PARENT else \
                     get_object_or_404(Post, id=thread_id)
                 post = Post.objects.create_post(title=title, text=text, ip=ip,
                                                 thread=op, image=image,
                                                 tags=tags, user=_get_user(request))
                 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 = []
                 for thread in Post.objects.get_threads(tag=tag, page=int(page)):
                     threads.append({'thread': thread,
                                     'bumpable': thread.can_bump()})
                 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
                 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)
                     form.session = request.session
                     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
                 context['bumpable'] = posts[0].can_bump()
                 return render(request, 'boards/thread.html', context)
             def login(request):
                 """Log in with user id"""
                 context = _init_default_context(request)
                 if request.method == 'POST':
                     form = LoginForm(request.POST, request.FILES,
                                      error_class=PlainErrorList)
                     form.session = request.session
                     if form.is_valid():
                         user = User.objects.get(user_id=form.cleaned_data['user_id'])
                         request.session['user_id'] = user.id
                         return redirect(index)
                 else:
                     form = LoginForm()
                 context['form'] = form
                 return render(request, 'boards/login.html', context)
             def settings(request):
                 """User's settings"""
                 context = _init_default_context(request)
                 user = _get_user(request)
                 is_moderator = user.is_moderator()
                 if request.method == 'POST':
                     if is_moderator:
                         form = ModeratorSettingsForm(request.POST,
                                                       error_class=PlainErrorList)
                     else:
                         form = SettingsForm(request.POST, error_class=PlainErrorList)
                     if form.is_valid():
                         selected_theme = form.cleaned_data['theme']
                         user.save_setting('theme', selected_theme)
                         if is_moderator:
                             moderate = form.cleaned_data['moderate']
                             user.save_setting(SETTING_MODERATE, moderate)
                         return redirect(settings)
                 else:
                     selected_theme = _get_theme(request)
                     if is_moderator:
                         form = ModeratorSettingsForm(initial={'theme': selected_theme,
                                                      'moderate': context['moderator']},
                                             error_class=PlainErrorList)
                     else:
                         form = SettingsForm(initial={'theme': selected_theme},
                                             error_class=PlainErrorList)
                 context['form'] = form
                 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 not post.thread:
                     return redirect(thread, post_id=post.id)
                 else:
                     return redirect(reverse(thread, kwargs={'post_id': post.thread.id})
                                     + '#' + str(post.id))
             def authors(request):
                 """Show authors list"""
                 context = _init_default_context(request)
                 context['authors'] = boards.authors.authors
                 return render(request, 'boards/authors.html', context)
             def delete(request, post_id):
                 """Delete post"""
                 user = _get_user(request)
                 post = get_object_or_404(Post, id=post_id)
                 if user.is_moderator():
                     # TODO Show confirmation page before deletion
                     Post.objects.delete_post(post)
                 if not post.thread:
                     return _redirect_to_next(request)
                 else:
                     return redirect(thread, post_id=post.thread.id)
             def ban(request, post_id):
                 """Ban user"""
                 user = _get_user(request)
                 post = get_object_or_404(Post, id=post_id)
                 if user.is_moderator():
                     # TODO Show confirmation page before ban
                     Ban.objects.get_or_create(ip=post.poster_ip)
                 return _redirect_to_next(request)
             def you_are_banned(request):
                 """Show the page that notifies that user is banned"""
                 context = _init_default_context(request)
                 return render(request, 'boards/staticpages/banned.html', context)
             def page_404(request):
                 """Show page 404 (not found error)"""
                 context = _init_default_context(request)
                 return render(request, 'boards/404.html', context)
             def tag_subscribe(request, tag_name):
                 """Add tag to favorites"""
                 user = _get_user(request)
                 tag = get_object_or_404(Tag, name=tag_name)
                 if not tag in user.fav_tags.all():
                     user.fav_tags.add(tag)
                 return _redirect_to_next(request)
             def tag_unsubscribe(request, tag_name):
                 """Remove tag from favorites"""
                 user = _get_user(request)
                 tag = get_object_or_404(Tag, name=tag_name)
                 if tag in user.fav_tags.all():
                     user.fav_tags.remove(tag)
                 return _redirect_to_next(request)
             def static_page(request, name):
                 """Show a static page that needs only tags list and a CSS"""
                 context = _init_default_context(request)
                 return render(request, 'boards/staticpages/' + name + '.html', context)
             def api_get_post(request, post_id):
                 """
                 Get the JSON of a post. This can be
                 used as and API for external clients.
                 """
                 post = get_object_or_404(Post, id=post_id)
                 json = serializers.serialize("json", [post], fields=(
                     "pub_time", "_text_rendered", "title", "text", "image",
                     "image_width", "image_height", "replies", "tags"
                 ))
                 return HttpResponse(content=json)
             def get_post(request, post_id):
                 """ Get the html of a post. Used for popups. """
                 post = get_object_or_404(Post, id=post_id)
                 context = RequestContext(request)
                 context["post"] = post
                 return render(request, 'boards/post.html', context)
             def _get_theme(request, user=None):
                 """Get user's CSS theme"""
                 if not user:
                     user = _get_user(request)
                 theme = user.get_setting('theme')
                 if not theme:
                     theme = neboard.settings.DEFAULT_THEME
                 return theme
             def _init_default_context(request):
                 """Create context with default values that are used in most views"""
                 context = RequestContext(request)
                 user = _get_user(request)
                 context['user'] = user
                 context['tags'] = user.get_sorted_fav_tags()
-                context['theme'] = _get_theme(request, user)
+                theme = _get_theme(request, user)
+                context['theme'] = theme
+                context['theme_css'] = 'css/' + theme + '/base_page.css'
                 moderate = user.get_setting(SETTING_MODERATE)
                 if moderate == 'True':
                     context['moderator'] = user.is_moderator()
                 else:
                     context['moderator'] = False
                 return context
             def _get_user(request):
                 """Get current user from the session"""
                 session = request.session
                 if not 'user_id' in session:
                     request.session.save()
                     md5 = hashlib.md5()
                     md5.update(session.session_key)
                     new_id = md5.hexdigest()
                     time_now = timezone.now()
                     user = User.objects.create(user_id=new_id, rank=RANK_USER,
                                                registration_time=time_now)
                     session['user_id'] = user.id
                 else:
                     user = User.objects.get(id=session['user_id'])
                 return user
             def _redirect_to_next(request):
                 if 'next' in request.GET:
                     next_page = request.GET['next']
                     return HttpResponseRedirect(next_page)
                 else:
                     return redirect(index)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages