Made "subscribe" and "hide" in tags as buttons with forms.

boards/static/css/base.css

@@ -1,81 +1,91 b''
 .ui-button {
    display: none;
 }
 
 .ui-dialog-content {
     padding: 0;
     min-height: 0;
 }
 
 .mark_btn {
     cursor: pointer;
 }
 
 .img-full {
     position: fixed;
     background-color: #CCC;
     border: 1px solid #000;
     cursor: pointer;
 }
 
 .strikethrough {
     text-decoration: line-through;
 }
 
 .post_preview {
     z-index: 300;
     position:absolute;
 }
 
 .gallery_image {
     display: inline-block;
 }
 
 @media print {
     .post-form-w {
         display: none;
     }
 }
 
 input[name="image"] {
      display: block;
      width: 100px;
      height: 100px;
      cursor: pointer;
      position: absolute;
      opacity: 0;
      z-index: 1;
 }
 
 .file_wrap {
      width: 100px;
      height: 100px;
      border: solid 1px white;
      display: inline-block;
 }
 
 form > .file_wrap {
     float: left;
 }
 
 .file-thumb {
     width: 100px;
     height: 100px;
     background-size: cover;
     background-position: center;
 }
 
 .compact-form-text {
     margin-left:110px;
 }
 
 textarea, input {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
 }
 
 .compact-form-text > textarea {
     height: 100px;
     width: 100%;
 }
+
+.post-button-form {
+    display: inline;
+}
+
+.post-button-form > input[type="submit"] {
+    border: none;
+    margin: 0;
+    padding: 0;
+}

boards/static/js/main.js

@@ -1,99 +1,116 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 if (window.Intl) {
     var LOCALE = window.navigator.language;
     var FORMATTER = new Intl.DateTimeFormat(
             LOCALE,
             {
                 weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
                 hour: 'numeric', minute: '2-digit', second: '2-digit'
             }
     );
 }
 
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
  */
 function hideEmailFromForm() {
     $('.form-email').parent().parent().hide();
 }
 
 /**
  * Highlight code blocks with code highlighter
  */
 function highlightCode(node) {
     node.find('pre code').each(function(i, e) {
         hljs.highlightBlock(e);
     });
 }
 
 /**
  * Translate timestamps to local ones for all <time> tags inside node.
  */
 function translate_time(node) {
     if (window.Intl === null) {
         return;
     }
 
     var elements;
 
     if (node === null) {
         elements = $('time');
     } else {
         elements = node.find('time');
     }
 
     if (!elements.length) {
         return;
     }
 
     elements.each(function() {
         var element = $(this);
         var dateAttr = element.attr('datetime');
         if (dateAttr) {
             var date = new Date(dateAttr);
             element.text(FORMATTER.format(date));
         }
     });
 }
 
+/**
+ * We use buttons viewed as a form with link and hidden inputs to ensure
+ * the search crawlers don't index or click them.
+ *
+ * But we need to submit the form by clicking the links. That's why these
+ * handlers are here.
+ */
+function addPostButtonActions() {
+    $('.post-button-form > a').each(function() {
+        $(this).click(function() {
+            $(this).parent().submit();
+        });
+    });
+}
+
 $( document ).ready(function() {
     hideEmailFromForm();
 
     $("a[href='#top']").click(function() {
         $("html, body").animate({ scrollTop: 0 }, "slow");
         return false;
     });
 
     addImgPreview();
 
     addRefLinkPreview();
 
     highlightCode($(document));
 
     translate_time(null);
+
+    addPostButtonActions();
 });

boards/templates/boards/posting_general.html

@@ -1,190 +1,193 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load board %}
 {% load static %}
 
 {% block head %}
     {% if tag %}
         <title>{{ tag.name }} - {{ site_name }}</title>
     {% else %}
         <title>{{ site_name }}</title>
     {% endif %}
 
     {% if current_page.has_previous %}
         <link rel="prev" href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
     {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>
-            {% if is_favorite %}
-                <a href="{% url 'tag' tag.name %}?method=unsubscribe&next={{ request.path }}"
-                   class="fav" rel="nofollow">★</a>
-            {% else %}
-                <a href="{% url 'tag' tag.name %}?method=subscribe&next={{ request.path }}"
-                   class="not_fav" rel="nofollow">★</a>
-            {% endif %}
-            {% if is_hidden %}
-                <a href="{% url 'tag' tag.name %}?method=unhide&next={{ request.path }}"
-                   title="{% trans 'Show tag' %}"
-                   class="fav" rel="nofollow">H</a>
-            {% else %}
-                <a href="{% url 'tag' tag.name %}?method=hide&next={{ request.path }}"
-                   title="{% trans 'Hide tag' %}"
-                   class="not_fav" rel="nofollow">H</a>
-            {% endif %}
+            <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
+                <input type="hidden" name="method"
+                {% if is_favorite %}
+                    <input type="hidden" name="method" value="unsubscribe" />
+                    <a class="fav" href="#">★</a>
+                {% else %}
+                    <input type="hidden" name="method" value="subscribe" />
+                    <a class="not_fav" href="#">★</a>
+                {% endif %}
+            </form>
+            <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
+                {% if is_hidden %}
+                    <input type="hidden" name="method" value="unhide" />
+                    <a class="fav" href="#">H</a>
+                {% else %}
+                    <input type="hidden" name="method" value="hide" />
+                    <a class="not_fav" href="#">H</a>
+                {% endif %}
+            </form>
             {% autoescape off %}
                 {{ tag.get_view }}
             {% endautoescape %}
             {% if moderator %}
             <span class="moderator_info">[<a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a>]</span>
             {% endif %}
         </h2>
         <p>{% blocktrans with thread_count=tag.get_thread_count post_count=tag.get_post_count %}This tag has {{ thread_count }} threads and {{ post_count }} posts.{% endblocktrans %}</p>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if current_page.has_previous %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.previous_page_number %}
             {% else %}
                 {% url "index" page=current_page.previous_page_number %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
                 {% post_view thread.get_opening_post moderator is_opening=True thread=thread truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
                             {% with skipped_replies_count=thread.get_skipped_replies_count %}
                                 {% if skipped_replies_count %}
                                     <div class="skipped_replies">
                                         <a href="{% url 'thread' thread.get_opening_post_id %}">
                                             {% blocktrans with count=skipped_replies_count %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                                         </a>
                                     </div>
                                 {% endif %}
                             {% endwith %}
                             <div class="last-replies">
                                 {% for post in last_replies %}
                                     {% post_view post is_opening=False moderator=moderator truncated=True %}
                                 {% endfor %}
                             </div>
                         {% endif %}
                     {% endwith %}
                 {% endif %}
             </div>
             {% endcache %}
         {% endfor %}
 
         {% if current_page.has_next %}
             <div class="page_link">
                 <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=current_page.next_page_number %}
             {% else %}
                 {% url "index" page=current_page.next_page_number %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="post-form">
             <div class="form-title">{% trans "Create new thread" %}</div>
             <div class="swappable-form-full">
             <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
                 </div>
                 (ctrl-enter)
             </form>
             </div>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </div>
 
     <script src="{% static 'js/form.js' %}"></script>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
         <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=paginator.page_range|first %}
             {% else %}
                 {% url "index" page=paginator.page_range|first %}
             {% endif %}
         ">&lt;&lt;</a>
         [
         {% for page in paginator.center_range %}
             <a
                 {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}
         ]
         <a href="
             {% if tag %}
                 {% url "tag" tag_name=tag.name page=paginator.page_range|last %}
             {% else %}
                 {% url "index" page=paginator.page_range|last %}
             {% endif %}
         ">&gt;&gt;</a>
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/views/tag_threads.py

@@ -1,100 +1,99 b''
 from django.shortcuts import get_object_or_404
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
         SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS
 from boards.models import Tag, Thread
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin, RedirectNextMixin
 from boards.forms import ThreadForm, PlainErrorList
 
 PARAM_HIDDEN_TAGS = 'hidden_tags'
 PARAM_TAG = 'tag'
 PARAM_IS_FAVORITE = 'is_favorite'
 PARAM_IS_HIDDEN = 'is_hidden'
 
 __author__ = 'neko259'
 
 
 class TagView(AllThreadsView, DispatcherMixin, RedirectNextMixin):
 
     tag_name = None
 
     def get_threads(self):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         return tag.get_threads()
 
     def get_context_data(self, **kwargs):
         params = super(TagView, self).get_context_data(**kwargs)
 
         settings_manager = get_settings_manager(kwargs['request'])
 
         tag = get_object_or_404(Tag, name=self.tag_name)
         params[PARAM_TAG] = tag
 
         fav_tag_names = settings_manager.get_setting(SETTING_FAVORITE_TAGS)
         hidden_tag_names = settings_manager.get_setting(SETTING_HIDDEN_TAGS)
 
         params[PARAM_IS_FAVORITE] = fav_tag_names is not None and tag.name in fav_tag_names
         params[PARAM_IS_HIDDEN] = hidden_tag_names is not None and tag.name in hidden_tag_names
 
         return params
 
     def get(self, request, tag_name, page=DEFAULT_PAGE, form=None):
         self.tag_name = tag_name
 
-        dispatch_result = self.dispatch_method(request)
-        if dispatch_result:
-            return dispatch_result
-        else:
-            return super(TagView, self).get(request, page, form)
+        return super(TagView, self).get(request, page, form)
+
 
     def post(self, request, tag_name, page=DEFAULT_PAGE):
-        form = ThreadForm(request.POST, request.FILES,
-                          error_class=PlainErrorList)
-        form.session = request.session
+        self.tag_name = tag_name
 
-        if form.is_valid():
-            return self.create_thread(request, form)
-        if form.need_to_ban:
-            # Ban user because he is suspected to be a bot
-            self._ban_current_user(request)
+        if 'method' in request.POST:
+            self.dispatch_method(request)
+            form = None
+        else:
+            form = ThreadForm(request.POST, request.FILES,
+                              error_class=PlainErrorList)
+            form.session = request.session
+
+            if form.is_valid():
+                return self.create_thread(request, form)
+            if form.need_to_ban:
+                # Ban user because he is suspected to be a bot
+                self._ban_current_user(request)
 
         return self.get(request, tag_name, page, form)
 
     def subscribe(self, request):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_fav_tag(tag)
 
-        return self.redirect_to_next(request)
-
     def unsubscribe(self, request):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_fav_tag(tag)
 
-        return self.redirect_to_next(request)
-
     def hide(self, request):
         """
         Adds tag to user's hidden tags. Threads with this tag will not be
         shown.
         """
 
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_hidden_tag(tag)
 
     def unhide(self, request):
         """
         Removed tag from user's hidden tags.
         """
 
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_hidden_tag(tag)