Forum

inyoka_theme_default/static/style/inyoka/forum.less

@@ -17,11 +17,15 @@
       &:extend(.panel-heading);
       &:extend(.panel-default > .panel-heading);
 
-      & > h3 {
+      & > h1 {
         &:extend(.panel-title all);
 
         font-size: @font-size-h3;
       }
+
+      &-category {
+        padding-right: @font-size-h3;
+      }
     }
     & > ul {
       &:extend(.list-group all);
@@ -31,13 +35,18 @@
       &:extend(.list-group-item all);
       &:extend(.panel > .list-group .list-group-item all);
 
-      & > h4 {
+      & > h2 {
         &:extend(list-group-item-heading all);
+
+        font-size: @font-size-h4;
       }
       & > p {
         &:extend(list-group-item-text all);
       }
     }
+    &-edit-category {
+      &:extend(.pull-right);
+    }
   }
 
   &-topic-list {
@@ -48,14 +57,49 @@
       &:extend(.panel-heading);
       &:extend(.panel-default > .panel-heading);
 
-      & > h3 {
+      & > h1 {
         &:extend(.panel-title);
+        font-size: @font-size-h3;
       }
     }
     & > ul {
       &:extend(.list-group);
       &:extend(.panel > .list-group);
     }
+    &-created {
+      &:extend(.text-muted);
+    }
+    &-last-post {
+      &:extend(.text-muted);
+      .make-sm-column(4);
+      .make-xs-column(12);
+    }
+    &-link {
+      .make-sm-column(8);
+      .make-xs-column(12);
+    }
+
+    &-post {
+      .make-sm-column(4);
+      .make-xs-column(12);
+    }
+    &-topic {
+      .make-sm-column(4);
+      .make-xs-column(12);
+
+      &-all-posts a {
+        &:extend(.text-muted);
+      }
+    }
+    &-forum {
+      .make-sm-column(4);
+      .make-xs-column(12);
+
+      &-all-posts a {
+        &:extend(.text-muted);
+      }
+    }
+
     &-item {
       &:extend(.list-group-item);
       &:extend(.panel > .list-group .list-group-item);
@@ -67,6 +111,25 @@
         &:extend(.list-group-item:last-child);
         &:extend(.panel > .list-group:last-child .list-group-item:last-child);
       }
+
+      &.with-forum {
+        .forum-topic-list {
+          &-last-post {
+            &:extend(.text-muted);
+            .make-sm-column(3);
+            .make-xs-column(12);
+          }
+          &-location {
+            &:extend(.text-muted);
+            .make-sm-column(3);
+            .make-xs-column(12);
+          }
+          &-link {
+            .make-sm-column(6);
+            .make-xs-column(12);
+          }
+        }
+      }
     }
   }
 
@@ -85,8 +148,18 @@
       &:extend(.panel-heading);
       &:extend(.panel-default > .panel-heading);
     }
-    & > &-body {
+    &:target > &-heading {
+      background-color: @active-target-bg;
+    }
+    &-body {
       &:extend(.panel-body);
+
+      &-signature {
+        border-top: 1px solid lighten(@post-signature, 30%);
+        color: @post-signature;
+        padding-top: 1em;
+        margin-top: 2em;
+      }
     }
     & > &-footer {
       &:extend(.panel-footer);
@@ -97,4 +170,25 @@
     &:extend(.bg-warning all);
     padding: 1em;
   }
+
+  &-reportlist {
+    .table-responsive();
+
+    > table {
+      td {
+        padding: @table-cell-padding;
+      }
+
+      tbody tr:nth-of-type(2n) {
+        border-bottom: 1px solid @table-border-color;
+      }
+
+      thead {
+        border-bottom: 2px solid @table-border-color;
+      }
+    }
+    &-content {
+      white-space: pre-wrap;
+    }
+  }
 }

inyoka_theme_default/static/style/inyoka/variables.less

@@ -20,9 +20,8 @@
 @diff-removed-line: #fcc;
 @diff-removed: #e99;
 @diff-ellipsis: @table-bg-accent;
-
+@post-signature: @gray-light;
 @team-member: #008A00;
-
 //** Custom border-radius
 
 @border-radius-base:        0;

inyoka_theme_default/templates/forum/base.html

@@ -16,10 +16,6 @@
   {{ _('Forum') }} - {{ super() }}
 {% endblock %}
 
-{% block scripts %}
-  <script src="{{ href('static', 'js', 'forum.js') }}"></script>
-{% endblock %}
-
 {% block breadcrumb %}
   {{ macros.breadcrumb_item(_('Forum'), href('forum')) }}
 {% endblock %}

inyoka_theme_default/templates/forum/delete_topic.html

@@ -0,0 +1,35 @@
+{#
+    forum/delete_topic.html
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    This template is flashed to ensure that the user wants to delete the
+    selected topic.
+
+    :copyright: (c) 2013-2016 by the Inyoka Team, see AUTHORS for more details.
+    :license: BSD, see LICENSE for more details.
+#}
+{% import 'macros.html' as macros %}
+
+{% set submit_label = _('Delete') if action == 'delete' else _('Hide') %}
+
+{% call macros.outer_form(csrf_token(), action=topic|url(action)|e, submit_label=submit_label) %}
+  <p>
+    {% if action == 'delete' %}
+      {% trans title=topic.title|e -%}
+        Do you really want to delete the topic “{{ title }}”? This action cannot be undone!
+      {% endtrans %}
+    {% else %}
+      {% trans title=topic.title|e -%}
+        Do you really want to hide the topic “{{ title }}”?
+      {% endtrans %}
+    {% endif %}
+  </p>
+  {% if action == 'delete' %}
+    <p>
+      <label for="delete_topic_reason">{% trans %}Reason:{% endtrans %}</label>
+      <input name="reason" id="delete_topic_reason" />
+    </p>
+  {% endif %}
+
+  <input type="submit" name="cancel" value="{% trans %}Cancel{% endtrans %}" />
+{% endcall%}

inyoka_theme_default/templates/forum/forum.html

@@ -20,32 +20,59 @@
   {{ forum }} - {{ super() }}
 {% endblock title %}
 
-{% import 'macros.html' as macros %}
-{% set rendered_pagination = macros.render_pagination(pagination) %}
-
 {% block breadcrumb %}
   {{ super() }}
 
-  {% if forum.parent.parent %}
-    {{ macros.breadcrumb_item(forum.parent, forum.parent|url) }}
-  {% endif %}
-  {{ macros.breadcrumb_item(forum) }}
+  {% for parent in forum.parents|reverse %}
+    {{ macros.breadcrumb_item(parent.name, parent|url) }}
+  {% endfor %}
+
+  {{ macros.breadcrumb_item(forum, forum|url) }}
 {% endblock %}
 
 {% block sidebar %}
-  {% call macros.sidebar() %}
-    {% if is_subscribed %}
-      {{ macros.sidebar_item(_('Unsubscribe'), forum|url('unsubscribe')) }}
-    {% else %}
-      {{ macros.sidebar_item(_('Subscribe'), forum|url('subscribe')) }}
+  {% if USER.is_authenticated() %}
+    {% call macros.sidebar() %}
+      {% if is_subscribed %}
+        {{ macros.sidebar_item(_('Unsubscribe'), forum|url('unsubscribe')) }}
+      {% else %}
+        {{ macros.sidebar_item(_('Subscribe'), forum|url('subscribe')) }}
+      {% endif %}
+
+      {% if can_create %}
+        {{ macros.sidebar_item(_('New topic'), forum|url('newtopic')) }}
+      {% endif %}
+
+      {{ macros.sidebar_item(_('Mark as read'), forum|url('markread')) }}
+    {% endcall %}
+  {% endif %}
+
+  {% call macros.sidebar(_('Filter (just this forum)')) %}
+    {% if USER.is_authenticated() %}
+      {{ macros.sidebar_item(_('Involved topics'), href('forum', 'egosearch', forum.slug|e)) }}
+      {{ macros.sidebar_item(_('My posts'), href('forum', 'author', USER.username|e, 'forum', forum.slug|e)) }}
+      {{ macros.sidebar_item(_('Created topics'), href('forum', 'topic_author', USER.username)|e, forum.slug|e) }}
     {% endif %}
-    {{ macros.sidebar_item(_('New topic'), forum|url('newtopic')) }}
-    {{ macros.sidebar_item(_('Mark as read'), forum|url('markread')) }}
+
+    {{ macros.sidebar_item(_('New posts'), href('forum', 'newposts', forum.slug|e)) }}
+    {{ macros.sidebar_item(_('Unanswered topics'), href('forum', 'unanswered', forum.slug|e)) }}
+    {{ macros.sidebar_item(_('Unsolved topics'), href('forum', 'unsolved', forum.slug|e)) }}
+    {{ macros.sidebar_item(_('24 hours'), href('forum', 'last24', forum.slug|e)) }}
+    {{ macros.sidebar_item(_('12 hours'), href('forum', 'last12', forum.slug|e)) }}
+    {{ macros.sidebar_item(_('6 hours'), href('forum', 'last6', forum.slug|e)) }}
   {% endcall %}
+
+  {% if USER.has_perm('forum.change_forum') %}
+    {% call macros.sidebar_admin() %}
+      {{ macros.sidebar_item(_('Edit forum'), forum|url('edit')) }}
+    {% endcall %}
+  {% endif %}
 {% endblock %}
 
 {% block content %}
+  {% set rendered_pagination = macros.render_pagination(pagination) %}
   {{ rendered_pagination }}
+
   {% if subforums %}
     <div class="forum-list">
       <div class="forum-list-heading">
@@ -55,65 +82,27 @@ <h1>
           </a>
         </h1>
       </div>
+
       <ul class="collapse in" id="subforums">
         {% for forum in subforums %}
           <a href="{{ forum|url }}" class="forum-list-item">
-            <h4>{{ forum }}</h4>
+            <h2>{{ forum }}</h2>
             <p>{{ forum.description }}</p>
           </a>
         {% endfor %}
       </ul>
     </div>
   {% endif %}
+
   <div class="forum-topic-list">
     <div class="forum-topic-list-heading">
-      <h3>
+      <h1>
         {% trans %}Topics{% endtrans %}
-      </h3>
+      </h1>
     </div>
-    <ul>
-      {% for topic in topics %}
-        <li class="forum-topic-list-item" title="{{ topic.first_post.text|truncate(500)|e }}" data-toggle="tooltip"
-            data-trigger="manual">
-          <div class="row">
-            <div class="col-sm-8">
-              {% if topic.sticky %}<strong>{% trans %}Sticky:{% endtrans %}</strong>{% endif %}
-              {% if topic.has_poll %}<strong>{% trans %}Poll:{% endtrans %}</strong>{% endif %}
-              <a href="{{ topic|url }}">{{ topic }}</a><br />
-              <small class="text-muted">
-                {% trans %}
-                  Created on:
-                {% endtrans %}
-                <time
-                    datetime="{{ topic.first_post.pub_date|datetime('c') }}">{{ topic.first_post.pub_date|datetime }}</time>
-              </small>
-            </div>
-            <div class="col-sm-4 hidden-xs">
-              <a href="{{ topic.last_post|url }}" class="pull-right">
-                <time
-                    datetime="{{ topic.last_post.pub_date|datetime('c') }}">{{ topic.last_post.pub_date|datetime }}</time>
-              </a><br />
-              <small class="text-muted pull-right">
-                {% trans author=topic.last_post.author|e, link=topic.last_post.author|url %}
-                  Last post by <a href="{{ link }}">{{ author }}</a>
-                {% endtrans %}
-              </small>
-            </div>
-            <div class="col-sm-4 visible-xs">
-              <small class="text-muted">
-                {% trans %}
-                  Last post:
-                {% endtrans %}
-                <a href="{{ topic.last_post|url }}">
-                  <time
-                      datetime="{{ topic.last_post.pub_date|datetime('c') }}">{{ topic.last_post.pub_date|datetime }}</time>
-                </a>
-              </small>
-            </div>
-          </div>
-        </li>
-      {% endfor %}
-    </ul>
+
+    {% include 'forum/topiclist-ul-body.html' %}
   </div>
+
   {{ rendered_pagination }}
 {% endblock %}