Fixed captcha design. Added setting to enable or disable captcha. This refs #39

boards/forms.py

@@ -95,6 +95,5 b' class ThreadCaptchaForm(ThreadForm):'
     captcha = CaptchaField()
 
 
-
 class SettingsForm(forms.Form):
     theme = forms.ChoiceField(choices=settings.THEMES, widget=forms.RadioSelect)
  No newline at end of file

boards/urls.py

@@ -22,9 +22,5 b" urlpatterns = patterns('',"
     # /boards/theme/theme_name/
     url(r'^settings$', views.settings, name='settings'),
     url(r'^tags$', views.all_tags, name='tags'),
-)
-
-#enable captcha support
-urlpatterns += patterns('',
     url(r'^captcha/', include('captcha.urls')),
-)
+)
  No newline at end of file

boards/utils.py

@@ -1,6 +1,7 b''
 """
 This module contains helper functions and helper classes.
 """
+from neboard import settings
 
 
 def check_if_human(request):
@@ -10,4 +11,4 b' def check_if_human(request):'
     """
 
     # FIXME: need to insert checking logic
-    return True
+    return not settings.ENABLE_CAPTCHA

boards/views.py

@@ -22,7 +22,7 b' def index(request, page=0):'
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
-                          error_class=PlainErrorList)
+                               error_class=PlainErrorList)
 
         if form.is_valid():
             return _new_post(request, form)
@@ -119,13 +119,12 b' def tag(request, tag_name, page=0):'
 def thread(request, post_id):
     """Get all thread posts"""
 
-    postFormClass = (PostForm
-                       if utils.check_if_human(request)
-                       else PostCaptchaForm)
+    postFormClass = (PostForm if utils.check_if_human(request) else
+                     PostCaptchaForm)
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
-                        error_class=PlainErrorList)
+                             error_class=PlainErrorList)
         if form.is_valid():
             return _new_post(request, form, post_id)
     else:

neboard/settings.py

@@ -190,4 +190,6 b' THEMES = ['
 DEFAULT_THEME = 'md'
 
 POPULAR_TAGS = 10
-LAST_REPLIES_COUNT = 3
  No newline at end of file
+LAST_REPLIES_COUNT = 3
+
+ENABLE_CAPTCHA = True
  No newline at end of file

templates/posting_general.html

@@ -106,32 +106,31 b''
 
         <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">
+                <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">
-            <BR />
-            {{ form.captcha }}
-            <BR />
-
             <input type="submit" value="{% trans "Post" %}"/></div>
         <div>Tags must be delimited by spaces. Text or image is required
             </div>

templates/thread.html

@@ -81,12 +81,11 b''
                     <div class="form-input">{{ form.image }}</div>
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
+                <div class="form-row">
+                    {{ form.captcha }}
+                </div>
             </div>
 
-            <BR />
-            {{ form.captcha }}
-            <BR />
-
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
             <div>Use <a