Merged with default branch

.hgtags

@@ -15,3 +15,4 b' f5cca33d29c673b67d43f310bebc4e3a21c6d04c'
 7f7c33ba6e3f3797ca866c5ed5d358a2393f1371 1.8
 a6b9dd9547bdc17b681502efcceb17aa5c09adf4 1.8.1
 8318fa1615d1946e4519f5735ae880909521990d 2.0
+e23590ee7e2067a3f0fc3cbcfd66404b47127feb 2.1

boards/context_processors.py

@@ -15,6 +15,8 b" CONTEXT_PPD = 'posts_per_day'"
 CONTEXT_TAGS = 'tags'
 CONTEXT_USER = 'user'
 
+PERMISSION_MODERATE = 'moderation'
+
 
 def user_and_ui_processor(request):
     context = {}
@@ -28,10 +30,13 b' def user_and_ui_processor(request):'
     context[CONTEXT_THEME_CSS] = 'css/' + theme + '/base_page.css'
 
     # This shows the moderator panel
-    moderate = settings_manager.has_permission(PERMISSION_MODERATE)
+    try:
+        moderate = request.user.has_perm('moderation')
+    except AttributeError:
+        moderate = False
     context[CONTEXT_MODERATOR] = moderate
 
     context[CONTEXT_VERSION] = settings.VERSION
     context[CONTEXT_SITE_NAME] = settings.SITE_NAME
 
-    return context
  No newline at end of file
+    return context

boards/mdx_neboard.py

@@ -159,10 +159,12 b' def bbcode_extended(markup):'
             u'<span class="comment">//%(value)s</span>')
     parser.add_simple_formatter('spoiler',
             u'<span class="spoiler">%(value)s</span>')
+    # TODO Use <s> here
     parser.add_simple_formatter('s',
             u'<span class="strikethrough">%(value)s</span>')
+    # TODO Why not use built-in tag?
     parser.add_simple_formatter('code',
-            u'<pre><code>%(value)s</pre></code>')
+            u'<pre><code>%(value)s</pre></code>', render_embedded=False)
 
     text = preparse_text(markup)
     return parser.format(text)

boards/models/image.py

@@ -57,3 +57,6 b' class PostImage(models.Model):'
             self.hash = md5.hexdigest()
         super(PostImage, self).save(*args, **kwargs)
 
+    def __str__(self):
+        return self.image.url
+

boards/settings.py

@@ -1,4 +1,4 b''
-VERSION = '1.8.1 Kara'
+VERSION = '2.1 Aya'
 SITE_NAME = 'n3b0a2d'
 
 CACHE_TIMEOUT = 600  # Timeout for caching, if cache is used

boards/templates/boards/base.html

@@ -46,12 +46,8 b''
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
-    {% if moderator %}
-        [<a href="{% url "logout" %}">{% trans 'Logout' %}</a>]
-    {% else %}
-        [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
-    {% endif %}
-    [<a href="{% url "search" %}">{% trans 'Search' %}</a>]
+    [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
+    [<a href="{% url 'search' %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}

boards/urls.py

@@ -1,8 +1,9 b''
 from django.conf.urls import patterns, url, include
+from django.contrib import admin
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
-    login, settings, all_tags, logout
+    settings, all_tags
 from boards.views.authors import AuthorsView
 from boards.views.delete_post import DeletePostView
 from boards.views.ban import BanUserView
@@ -15,17 +16,12 b' js_info_dict = {'
 }
 
 urlpatterns = patterns('',
-
     # /boards/
     url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
         name='index'),
 
-    # login page
-    url(r'^login/$', login.LoginView.as_view(), name='login'),
-    url(r'^logout/$', logout.LogoutView.as_view(), name='logout'),
-
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
         name='tag'),

neboard/urls.py

@@ -10,15 +10,10 b' from boards.views.not_found import NotFo'
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'neboard.views.home', name='home'),
-    # url(r'^neboard/', include('neboard.foo.urls')),
-
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
-    # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', include(admin.site.urls), name='admin'),
     url(r'^', include('boards.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

todo.txt

@@ -13,12 +13,11 b''
 * Post deletion confirmation page (or alert)
 * Get thread graph image using pygraphviz
 * Subscribing to tag via AJAX
-* Use django's native auth framework for administration
 * Add buttons to insert a named link or a named quote to the markup panel
 * Add support for "attention posts" that are shown in the header"
 
 = Bugs =
-* Search is very slow and sort order is confusing
+* Search sort order is confusing
 
 = Testing =
 * Make tests for every view