Make a lot of pimp in the Forum

forum/templates/forum/forum.jinja

@@ -6,13 +6,14 @@
 {% endblock %}
 
 {% block content %}
-    <div>
+<div>
     <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
     {% for f in forum.get_parent_list()|reverse %}
     > <a href="{{ f.get_absolute_url() }}">{{ f }}</a>
     {% endfor %}
     > <a href="{{ forum.get_absolute_url() }}">{{ forum }}</a>
-    </div>
+</div>
+<div id="forum">
     <h3>{{ forum.name }}</h3>
     <p>
     {% if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID) or user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
@@ -34,6 +35,7 @@
             </div>
         </div>
     </div>
+    {{ display_forum(forum, user, True) }}
     {% for f in forum.children.all() %}
     {{ display_forum(f, user) }}
     {% endfor %}
@@ -58,7 +60,13 @@
     {% for t in topics %}
     {{ display_topic(t, user) }}
     {% endfor %}
+    <p style="text-align: right; background: #d8e7f3;">
+    {% for p in topics.paginator.page_range %}
+        <span class="ib" style="background: {% if p == topics.number %}white{% endif %}; margin: 0;"><a href="?topic_page={{ p }}">{{ p }}</a></span>
+    {% endfor %}
+    </p>
     {% endif %}
+</div>
 {% endblock %}
 
 

forum/templates/forum/last_unread.jinja

@@ -15,9 +15,17 @@
         <a class="ib" href="{{ url('forum:mark_all_as_read') }}">{% trans %}Mark all as read{% endtrans %}</a>
         <a class="ib" href="{{ url('forum:last_unread') }}">{% trans %}Refresh{% endtrans %}</a>
     </p>
-    {% for t in forumtopic_list %}
+    {% for t in page_obj.object_list %}
     {{ display_topic(t, user, True) }}
     {% endfor %}
+
+    <p style="text-align: right; background: #d8e7f3;">
+    {% for p in paginator.page_range %}
+        <span class="ib" style="background: {% if p == paginator.number %}white{% endif %}; margin: 0;">
+            <a href="?page={{ p }}">{{ p }}</a>
+        </span>
+    {% endfor %}
+    </p>
 {% endblock %}
 
 

forum/templates/forum/macros.jinja

@@ -1,37 +1,43 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
-{% macro display_forum(forum, user) %}
-<div class="forum {% if forum.is_category %}category{% endif %}">
+{% macro display_forum(forum, user, is_root=False) %}
+<div class="forum {% if is_root %}category{% endif %}">
     <div class="ib w_big">
-        {% if not forum.is_category %}
+        {% if not is_root %}
         <a class="ib w_big" href="{{ url('forum:view_forum', forum_id=forum.id) }}">
         {% else %}
         <div class="ib w_big">
         {% endif %}
-            <h5>{{ forum.name }}</h5>
+            <div class="title">{{ forum.name }}</div>
             <p>{{ forum.description }}</p>
-        {% if not forum.is_category %}
+        {% if not is_root %}
         </a>
         {% else %}
         </div>
         {% endif %}
         {% if user.is_owner(forum) %}
+        <div class="tools">
         <a class="ib" href="{{ url('forum:edit_forum', forum_id=forum.id) }}">{% trans %}Edit{% endtrans %}</a>
         <a class="ib" href="{{ url('forum:delete_forum', forum_id=forum.id) }}">{% trans %}Delete{% endtrans %}</a>
+        </div>
         {% endif %}
     </div>
-    {% if not forum.is_category %}
+    {% if not is_root %}
     <div class="ib w_small">
-        <div class="ib w_medium">
+        <p class="ib w_medium">
             {{ forum.topic_number }}
-        </div>
-        <div class="ib w_medium" style="font-size: x-small; text-align: center">
+        </p>
+        <div class="ib w_medium last_message" style="font-size: x-small; text-align: center">
             {% if forum.last_message %}
             {{ forum.last_message.author }} <br/>
             <a href="{{ forum.last_message.get_absolute_url() }}">
+                <date>
                 {{ forum.last_message.date|localtime|date(DATETIME_FORMAT) }}
-                {{ forum.last_message.date|localtime|time(DATETIME_FORMAT) }}<br/>
+                {{ forum.last_message.date|localtime|time(DATETIME_FORMAT) }}
+                </date><br>
+                <span>
                 {{ forum.last_message.topic }}
+                </span>
             </a>
             {% endif %}
         </div>
@@ -48,33 +54,33 @@
         {% else %}
         <a class="ib w_big" href="{{ url('forum:view_topic', topic_id=topic.id) }}">
         {% endif %}
-            <h5>{{ topic.title }}</h5>
+            <div class="title">{{ topic.title }}</div>
             <p>{{ topic.description }}</p>
         </a>
         {% if user.can_edit(topic) %}
-        <div class="ib" style="text-align: center;">
+        <div class="ib tools" style="text-align: center;">
             <a href="{{ url('forum:edit_topic', topic_id=topic.id) }}">{% trans %}Edit{% endtrans %}</a>
         </div>
         {% endif %}
     </div>
-    <div class="ib w_medium">
+    <div class="ib w_medium last_message">
         <div class="ib w_medium">
-            <div class="ib w_medium" style="text-align: center;">
+            <p class="ib w_medium" style="text-align: center;">
                 {{ user_profile_link(topic.author) }}
-            </div>
-            <div class="ib w_medium" style="text-align: center;">
+            </p>
+            <p class="ib w_medium" style="text-align: center;">
                 {{ topic.messages.count() }}
-            </div>
+            </p>
         </div>
-        <div class="ib w_medium" style="text-align: center;">
+        <p class="ib w_medium" style="text-align: center;">
             {% set last_msg = topic.last_message %}
             {% if last_msg %}
             {{ user_profile_link(last_msg.author) }} <br/>
             <a href="{{ last_msg.get_absolute_url() }}">
-                {{ last_msg.date|date(DATETIME_FORMAT) }} {{ last_msg.date|time(DATETIME_FORMAT) }}
+                <date>{{ last_msg.date|date(DATETIME_FORMAT) }} {{ last_msg.date|time(DATETIME_FORMAT) }}</date>
             </a>
             {% endif %}
-        </div>
+        </p>
     </div>
 </div>
 {% endmacro %}
@@ -92,26 +98,24 @@
         <strong><a href="{{ m.author.get_absolute_url() }}">{{ m.author.get_short_name() }}</a></strong>
     </div>
     <div class="msg_content  {% if m.deleted %}deleted{% endif %}" {% if m.id == first_unread_message_id %}id="first_unread"{% endif %}>
-        <div style="display: inline-block; width: 74%;">
-            {% if m.title %}
-            <h5>{{ m.title }}</h5>
-            {% endif %}
-        </div>
-        <div style="display: inline-block; width: 25%;">
-            <span><a href="{{ url('forum:new_message', topic_id=m.topic.id) }}?quote_id={{ m.id }}">
-                    {% trans %}Reply as quote{% endtrans %}</a></span>
-            {% if user.can_edit(m) %}
-            <span> <a href="{{ url('forum:edit_message', message_id=m.id) }}">{% trans %}Edit{% endtrans %}</a></span>
-            {% endif %}
-            {% if m.can_be_moderated_by(user) %}
-            {% if m.deleted %}
-            <span> <a href="{{ url('forum:undelete_message', message_id=m.id) }}">{% trans %}Undelete{% endtrans %}</a></span>
-            {% else %}
-            <span> <a href="{{ url('forum:delete_message', message_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></span>
-            {% endif %}
-            {% endif %}
-            <br/>
-            <span>{{ m.date|localtime|date(DATETIME_FORMAT) }} {{ m.date|localtime|time(DATETIME_FORMAT) }}</span>
+        <div class="msg_header">
+            <div class="ib w_big title">{{ m.title }}</div>
+            <div class="ib w_small">
+                <span><a href="{{ url('forum:new_message', topic_id=m.topic.id) }}?quote_id={{ m.id }}">
+                        {% trans %}Reply as quote{% endtrans %}</a></span>
+                {% if user.can_edit(m) %}
+                <span> <a href="{{ url('forum:edit_message', message_id=m.id) }}">{% trans %}Edit{% endtrans %}</a></span>
+                {% endif %}
+                {% if m.can_be_moderated_by(user) %}
+                {% if m.deleted %}
+                <span> <a href="{{ url('forum:undelete_message', message_id=m.id) }}">{% trans %}Undelete{% endtrans %}</a></span>
+                {% else %}
+                <span> <a href="{{ url('forum:delete_message', message_id=m.id) }}">{% trans %}Delete{% endtrans %}</a></span>
+                {% endif %}
+                {% endif %}
+                <br/>
+                <span>{{ m.date|localtime|date(DATETIME_FORMAT) }} {{ m.date|localtime|time(DATETIME_FORMAT) }}</span>
+            </div>
         </div>
         <hr>
         <div>

forum/templates/forum/main.jinja

@@ -7,9 +7,10 @@
 {% endblock %}
 
 {% block content %}
-    <p>
-    <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a> >
-    </p>
+<p>
+<a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a> >
+</p>
+<div id="forum">
     <h3>{% trans %}Forum{% endtrans %}</h3>
     <p>
         <a class="ib" href="{{ url('forum:last_unread') }}">{% trans %}View last unread messages{% endtrans %}</a>
@@ -19,14 +20,28 @@
         <a href="{{ url('forum:new_forum') }}">{% trans %}New forum{% endtrans %}</a>
     </p>
     {% endif %}
+    <div>
+        <div class="ib w_big">
+            {% trans %}Title{% endtrans %}
+        </div>
+        <div class="ib w_small">
+            <div class="ib w_medium">
+                {% trans %}Topics{% endtrans %}
+            </div>
+            <div class="ib w_small">
+                {% trans %}Last message{% endtrans %}
+            </div>
+        </div>
+    </div>
     {% for f in forum_list %}
-    <div style="padding: 4px; margin: 4px">
-    {{ display_forum(f, user) }}
+    <div>
+    {{ display_forum(f, user, True) }}
         {% for c in f.children.all() %}
         {{ display_forum(c, user) }}
         {% endfor %}
     </div>
     {% endfor %}
+</div>
 {% endblock %}
 
 

forum/templates/forum/topic.jinja

@@ -35,6 +35,7 @@
     > <a href="{{ topic.get_absolute_url() }}">{{ topic }}</a>
     </p>
     <h3>{{ topic.title }}</h3>
+<div id="forum">
     <p>{{ topic.description }}</p>
     <p><a href="{{ url('forum:new_message', topic_id=topic.id) }}">{% trans %}Reply{% endtrans %}</a></p>
 
@@ -62,6 +63,7 @@
         <span class="ib" style="background: {% if p == msgs.number %}white{% endif %}; margin: 0;"><a href="?page={{ p }}">{{ p }}</a></span>
     {% endfor %}
     </p>
+</div>
 {% endblock %}