Show tags as "#tag" instead of "Tag:"

boards/templates/boards/posting_general.html

@@ -1,222 +1,222 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 {% load cache %}
 
 {% block head %}
     {% if tag %}
         <title>Neboard - {{ tag.name }}</title>
     {% else %}
         <title>Neboard</title>
     {% endif %}
 {% endblock %}
 
 {% block content %}
 
 {% if tag %}
     <div class="tag_info">
-        <h2>{% trans 'Tag: ' %}{{ tag.name }}
+        <h2>#{{ tag.name }}
             {% if tag in user.fav_tags.all %}
                 <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
                 <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
         </h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% for thread in threads %}
             <div class="thread">
             {% if thread.bumpable %}
 		        <div class="post" id="{{ thread.thread.id }}">
             {% else %}
 		        <div class="post dead_post" id="{{ thread.thread.id }}">
             {% endif %}
             {% if thread.thread.image %}
                 <div class="image">
                     <a class="thumb"
                        href="{{ thread.thread.image.url }}"><img
                             src="{{ thread.thread.image.url_200x150 }}"
                             alt="{{ thread.thread.id }}"
                             data-width="{{ thread.thread.image_width }}"
                             data-height="{{ thread.thread.image_height }}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.thread.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.thread.id %}"
                     >(#{{ thread.thread.id }})</a>
                     [{{ thread.thread.pub_time }}]
                     [<a class="link" href="{% url 'thread' thread.thread.id %}#form"
                         >{% trans "Reply" %}</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="{% url 'delete' post_id=thread.thread.id %}?next={{ request.path }}"
                                 >{% trans 'Delete' %}</a>]
                             ({{ thread.thread.poster_ip }})
                             [<a href="{% url 'ban' post_id=thread.thread.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.thread.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
             </div>
             <div class="metadata">
                 {{ thread.thread.get_reply_count }} {% trans 'replies' %},
                 {{ thread.thread.get_images_count }} {% trans 'images' %}.
                 {% if thread.thread.tags %}
-                    <span class="tags">{% trans 'Tags' %}:
+                    <span class="tags">
                         {% for tag in thread.thread.tags.all %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
-                                {{ tag.name }}</a>
+                                #{{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
 		{% if thread.thread.referenced_posts.all %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in thread.thread.referenced_posts.all %}
 			<a href="{% url 'jumper' ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a>
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             {% if thread.thread.get_last_replies.exists %}
                 <div class="last-replies">
                     {% for post in thread.thread.get_last_replies %}
                         {% if thread.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="
                                 {% url 'thread' thread.thread.id %}#{{ post.id }}">
                                         (#{{ post.id }})</a>
                                     [{{ post.pub_time }}]
                                 </div>
                                 {% autoescape off %}
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
 			    {% if post.referenced_posts.all %}
 				<div class="refmap">
 				    {% trans "Replies" %}:
 				    {% for ref_post in post.referenced_posts.all %}
 				    <a href="{% url 'jumper' ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a>
 				    {% endfor %}
 				</div>
 			    {% endif %}
                         </div>
                     {% endfor %}
                 </div>
             {% endif %}
         </div>
         {% endfor %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
 	{% 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 '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">
                 <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-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>
             {% 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>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">Neboard</a> 1.3</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 %}
         [<a href="rss/">RSS</a>]
     </span>
 
 {% endblock %}

boards/templates/boards/thread.html

@@ -1,160 +1,160 b''
 {% 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 'js/thread.js' %}"></script>
 
 	{% if posts %}
         {% cache 600 thread_view posts.0.last_edit_time moderator LANGUAGE_CODE %}
             {% if bumpable %}
                 <div class="bar-bg">
                     <div class="bar-value" style="width:{{ bumplimit_progress }}%">
                     </div>
                     <div class="bar-text">
                         {{ posts_left }} {% trans 'posts to bumplimit' %}
                     </div>
                 </div>
             {% endif %}
         <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 %}
 		{% if post.referenced_posts.all %}
 		    <div class="refmap">
 			{% trans "Replies" %}:
 			{% for ref_post in post.referenced_posts.all %}
 			<a href="{% url 'jumper' ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a>
 			{% endfor %}
 		    </div>
 		{% endif %}
             </div>
             {% if post.id == posts.0.id %}
                 <div class="metadata">
-                    <span class="tags">{% trans 'Tags' %}:
+                    <span class="tags">
                         {% for tag in post.tags.all %}
                             <a class="tag" href="{% url 'tag' tag.name %}">
-                                {{ tag.name }}</a>
+                                #{{ 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 %}