u/bodqhrohro/swineboard Commit - r1042:603aff15

Made normal and gallery view use the same super-template with the same...

neko259 -

r1042:603aff15 default

parent child

boards/templates/boards/base.html

0 +31 -31

             {% load staticfiles %}
             {% load i18n %}
             {% load l10n %}
             {% load static from staticfiles %}
             <!DOCTYPE html>
             <html>
             <head>
                 <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static 'css/3party/highlight.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
                 <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
                 <link rel="icon" type="image/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 'js/jquery-2.0.1.min.js' %}"></script>
+                <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
-            <script src="{% static '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 'js/jquery.mousewheel.js' %}"></script>
+                <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
-            <script src="{% url 'js_info_dict' %}"></script>
+                <script src="{% url 'js_info_dict' %}"></script>
-            <div class="navigation_panel header">
+                <div class="navigation_panel header">
-                <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
+                    <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
-                {% autoescape off %}
+                    {% autoescape off %}
-                    {{ tags_str }},
+                        {{ tags_str }},
-                {% endautoescape %}
+                    {% endautoescape %}
-                <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
+                    <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
-                        >[...]</a>,
+                            >[...]</a>,
-                <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>.
+                    <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>.
-                {% if username %}
+                    {% if username %}
-                    <a href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}"><b>{{ new_notifications_count }}</b> {% trans 'notifications' %}</a>.
+                        <a href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}"><b>{{ new_notifications_count }}</b> {% trans 'notifications' %}</a>.
-                {% endif %}
+                    {% endif %}
-                <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
+                    <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
-            </div>
+                </div>
-            {% block content %}{% endblock %}
+                {% block content %}{% endblock %}
-            <script src="{% static 'js/3party/highlight.min.js' %}"></script>
+                <script src="{% static 'js/3party/highlight.min.js' %}"></script>
-            <script src="{% static 'js/popup.js' %}"></script>
+                <script src="{% static 'js/popup.js' %}"></script>
-            <script src="{% static 'js/image.js' %}"></script>
+                <script src="{% static 'js/image.js' %}"></script>
-            <script src="{% static 'js/refpopup.js' %}"></script>
+                <script src="{% static 'js/refpopup.js' %}"></script>
-            <script src="{% static 'js/main.js' %}"></script>
+                <script src="{% static 'js/main.js' %}"></script>
-            <div class="navigation_panel footer">
+                <div class="navigation_panel footer">
-                {% block metapanel %}{% endblock %}
+                    {% block metapanel %}{% endblock %}
-                [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
+                    [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
-                {% with ppd=posts_per_day|floatformat:2 %}
+                    {% with ppd=posts_per_day|floatformat:2 %}
-                    {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
+                        {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
-                {% endwith %}
+                    {% endwith %}
-                <a class="link" href="#top" id="up">{% trans 'Up' %}</a>
+                    <a class="link" href="#top" id="up">{% trans 'Up' %}</a>
-            </div>
+                </div>
             </body>
             </html>

boards/templates/boards/thread.html

0 +4 -58

@@ -1,89 +1,35 b''
1	{% extends "boards/base.html" %}	1	{% extends "boards/base.html" %}
2		2
3	{% load i18n %}	3	{% load i18n %}
4	{% load cache %}	4	{% load cache %}
5	{% load static from staticfiles %}	5	{% load static from staticfiles %}
6	{% load board %}	6	{% load board %}
7		7
8	{% block head %}	8	{% block head %}
9	<title>{{ opening_post.get_title\|striptags\|truncatewords:10 }}	9	<title>{{ opening_post.get_title\|striptags\|truncatewords:10 }}
10	- {{ site_name }}</title>	10	- {{ site_name }}</title>
11	{% endblock %}	11	{% endblock %}
12		12
13	{% block content %}
14	{% get_current_language as LANGUAGE_CODE %}
15
16	{% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
17
18	<div class="image-mode-tab">
19	<a class="current_mode" href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,
20	<a href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery mode' %}</a>
21	</div>
22
23	{% if bumpable %}
24	<div class="bar-bg">
25	<div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
26	</div>
27	<div class="bar-text">
28	<span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
29	</div>
30	</div>
31	{% endif %}
32
33	<div class="thread">
34	{% for post in thread.get_replies %}
35	{% post_view post moderator=moderator %}
36	{% endfor %}
37	</div>
38
39	{% if not thread.archived %}
40	<div class="post-form-w">
41	<script src="{% static 'js/panel.js' %}"></script>
42	<div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}</div>
43	<div class="post-form" id="compact-form">
44	<div class="swappable-form-full">
45	<form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
46	<div class="compact-form-text"></div>
47	{{ form.as_div }}
48	<div class="form-submit">
49	<input type="submit" value="{% trans "Post" %}"/>
50	</div>
51	(ctrl-enter)
52	</form>
53	</div>
54	<div><a href="{% url "staticpage" name="help" %}">
55	{% trans 'Text syntax' %}</a></div>
56	</div>
57	</div>
58
59	<script src="{% static 'js/jquery.form.min.js' %}"></script>
60	{% endif %}
61
62	<script src="{% static 'js/form.js' %}"></script>
63	<script src="{% static 'js/thread.js' %}"></script>
64	<script src="{% static 'js/thread_update.js' %}"></script>
65	<script src="{% static 'js/3party/centrifuge.js' %}"></script>
66
67	{% endcache %}
68	{% endblock %}
69
70	{% block metapanel %}	13	{% block metapanel %}
71		14
72	{% get_current_language as LANGUAGE_CODE %}	15	{% get_current_language as LANGUAGE_CODE %}
73		16
74	<span class="metapanel"	17	<span class="metapanel"
75	data-last-update="{{ last_update }}"	18	data-last-update="{{ last_update }}"
76	data-ws-token="{{ ws_token }}"	19	data-ws-token="{{ ws_token }}"
77	data-ws-project="{{ ws_project }}"	20	data-ws-project="{{ ws_project }}"
78	data-ws-host="{{ ws_host }}"	21	data-ws-host="{{ ws_host }}"
79	data-ws-port="{{ ws_port }}">	22	data-ws-port="{{ ws_port }}">
		23
		24	{% block thread_meta_panel %}
		25	{% endblock %}
		26
80	{% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}	27	{% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
81	<button id="autoupdate">{% trans 'Update' %}</button>
82	<span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},	28	<span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},
83	<span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.	29	<span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
84	{% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time\|date:'c' }}">{{ thread.last_edit_time\|date:'r' }}</time></span>	30	{% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time\|date:'c' }}">{{ thread.last_edit_time\|date:'r' }}</time></span>
85	[<a href="rss/">RSS</a>]	31	[<a href="rss/">RSS</a>]
86	{% endcache %}	32	{% endcache %}
87	</span>	33	</span>
88		34
89	{% endblock %}	35	{% endblock %}

boards/templates/boards/thread_gallery.html

0 +1 -17

-            {% extends "boards/base.html" %}
+            {% extends "boards/thread.html" %}
             {% load i18n %}
             {% load cache %}
             {% load static from staticfiles %}
             {% load board %}
             {% block head %}
                 <meta name="robots" content="noindex">
                 <title>{{ thread.get_opening_post.get_title|striptags|truncatewords:10 }}
                     - {{ site_name }}</title>
             {% endblock %}
             {% block content %}
                 {% spaceless %}
                 {% get_current_language as LANGUAGE_CODE %}
                 {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE request.get_host %}
                 <div class="image-mode-tab">
                     <a href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
                     <a class="current_mode" href="{% url 'thread_gallery' thread.get_opening_post.id %}">{% trans 'Gallery mode' %}</a>
                 </div>
                 <div id="posts-table">
                 {% for post in posts %}
                     <div class="gallery_image">
                     {% with post.get_first_image as image %}
                         <div>
                             <a
                                     class="thumb"
                                     href="{{ image.image.url }}"><img
                                     src="{{ image.image.url_200x150 }}"
                                     alt="{{ post.id }}"
                                     width="{{ image.pre_width }}"
                                     height="{{ image.pre_height }}"
                                     data-width="{{ image.width }}"
                                     data-height="{{ image.height }}"/>
                             </a>
                         </div>
                         <div class="gallery_image_metadata">
                             {{ image.width }}x{{ image.height }}
                             {% image_actions image.image.url request.get_host %}
                             <br />
                             <a href="{{ post.get_url }}">>>{{ post.id }}</a>
                         </div>
                     {% endwith %}
                     </div>
                 {% endfor %}
                 </div>
                 {% endcache %}
                 {% endspaceless %}
             {% endblock %}
-            {% block metapanel %}
-                {% get_current_language as LANGUAGE_CODE %}
-                <span class="metapanel" data-last-update="{{ last_update }}">
-                    {% cache 600 thread_gallery_meta thread.last_edit_time moderator LANGUAGE_CODE %}
-                        <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }}
-                        {% trans 'messages' %},
-                        <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
-                        {% trans 'Last update: ' %}<time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time|date:'r' }}</time>
-                        [<a href="rss/">RSS</a>]
-                    {% endcache %}
-                </span>
-            {% endblock %}

boards/views/thread/normal.py

0 +1 -1

             from boards import settings
             from boards.views.thread import ThreadView
-            TEMPLATE_NORMAL = 'boards/thread.html'
+            TEMPLATE_NORMAL = 'boards/thread_normal.html'
             CONTEXT_OP = 'opening_post'
             CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
             CONTEXT_POSTS_LEFT = 'posts_left'
             CONTEXT_BUMPABLE = 'bumpable'
             FORM_TITLE = 'title'
             FORM_TEXT = 'text'
             FORM_IMAGE = 'image'
             MODE_GALLERY = 'gallery'
             MODE_NORMAL = 'normal'
             class NormalThreadView(ThreadView):
                 def get_template(self):
                     return TEMPLATE_NORMAL
                 def get_data(self, thread):
                     params = dict()
                     bumpable = thread.can_bump()
                     params[CONTEXT_BUMPABLE] = bumpable
                     if bumpable:
                         left_posts = settings.MAX_POSTS_PER_THREAD \
                                      - thread.get_reply_count()
                         params[CONTEXT_POSTS_LEFT] = left_posts
                         params[CONTEXT_BUMPLIMIT_PRG] = str(
                             float(left_posts) / settings.MAX_POSTS_PER_THREAD * 100)
                     params[CONTEXT_OP] = thread.get_opening_post()
                     return params

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