|
@@ -19,13 +19,19 @@
|
|
|
<div class="pull-right" style="padding-bottom: 10px">
|
|
|
<div class="btn btn-group">
|
|
|
{% if current_user|delete_topic(topic.first_post.user_id, topic.forum) %}
|
|
|
- <a href="{{ url_for('forum.delete_topic', topic_id=topic.id) }}" class="btn btn-danger"><span class="fa fa-trash-o"></span> Delete Topic</a>
|
|
|
+ <a href="{{ url_for('forum.delete_topic', topic_id=topic.id) }}" class="btn btn-danger">
|
|
|
+ <span class="fa fa-trash-o"></span> Delete Topic
|
|
|
+ </a>
|
|
|
{% endif %}
|
|
|
{% if current_user|lock_topic(topic.forum) %}
|
|
|
{% if not topic.locked %}
|
|
|
- <a href="{{ url_for('forum.lock_topic', topic_id=topic.id) }}" class="btn btn-warning"><span class="fa fa-lock"></span> Lock Topic</a>
|
|
|
+ <a href="{{ url_for('forum.lock_topic', topic_id=topic.id) }}" class="btn btn-warning">
|
|
|
+ <span class="fa fa-lock"></span> Lock Topic
|
|
|
+ </a>
|
|
|
{% else %}
|
|
|
- <a href="{{ url_for('forum.unlock_topic', topic_id=topic.id) }}" class="btn btn-warning"><span class="fa fa-unlock"></span> Unlock Topic</a>
|
|
|
+ <a href="{{ url_for('forum.unlock_topic', topic_id=topic.id) }}" class="btn btn-warning">
|
|
|
+ <span class="fa fa-unlock"></span> Unlock Topic
|
|
|
+ </a>
|
|
|
{% endif %}
|
|
|
{% endif %}
|
|
|
</div>
|
|
@@ -33,13 +39,19 @@
|
|
|
{% if current_user.is_authenticated() %}
|
|
|
<div class="btn btn-group">
|
|
|
{% if current_user.is_tracking_topic(topic) %}
|
|
|
- <a href="{{ url_for('forum.untrack_topic', topic_id=topic.id) }}" class="btn btn-default"><span class="fa fa-star"></span> Untrack Topic</a>
|
|
|
+ <a href="{{ url_for('forum.untrack_topic', topic_id=topic.id) }}" class="btn btn-default"><span class="fa fa-star">
|
|
|
+ </span> Untrack Topic
|
|
|
+ </a>
|
|
|
{% else %}
|
|
|
- <a href="{{ url_for('forum.track_topic', topic_id=topic.id) }}" class="btn btn-default"><span class="fa fa-star"></span> Track Topic</a>
|
|
|
+ <a href="{{ url_for('forum.track_topic', topic_id=topic.id) }}" class="btn btn-default">
|
|
|
+ <span class="fa fa-star"></span> Track Topic
|
|
|
+ </a>
|
|
|
{% endif %}
|
|
|
|
|
|
{% if current_user|post_reply(topic.forum) and not (topic.locked or topic.forum.locked) %}
|
|
|
- <a href="{{ url_for('forum.new_post', topic_id=topic.id) }}" class="btn btn-primary"><span class="fa fa-pencil"></span> Reply</a>
|
|
|
+ <a href="{{ url_for('forum.new_post', topic_id=topic.id) }}" class="btn btn-primary">
|
|
|
+ <span class="fa fa-pencil"></span> Reply
|
|
|
+ </a>
|
|
|
{% endif %}
|
|
|
</div>
|
|
|
{% endif %}
|
|
@@ -55,15 +67,18 @@
|
|
|
</span>
|
|
|
<span class="pull-left">
|
|
|
<a href="
|
|
|
- {% if posts.page > 1 %}
|
|
|
+ {%- if posts.page > 1 -%}
|
|
|
{{ url_for('forum.view_topic', topic_id=topic.id) }}?page={{ posts.page }}#pid{{ post.id }}
|
|
|
- {% else %}
|
|
|
+ {%- else -%}
|
|
|
{{ url_for('forum.view_topic', topic_id=topic.id) }}#pid{{ post.id }}
|
|
|
- {% endif %}
|
|
|
+ {%- endif -%}
|
|
|
">{{ post.date_created|format_date('%d %B %Y') }}</a>
|
|
|
{% if post.user_id and post.date_modified %}
|
|
|
<small>
|
|
|
- (Last modified: {{ post.date_modified|format_date }} by <a href="{{ url_for('user.profile', username=post.user.username) }}">{{ post.user.username }}</a>.)
|
|
|
+ (Last modified: {{ post.date_modified|format_date }} by
|
|
|
+ <a href="{{ url_for('user.profile', username=post.user.username) }}">
|
|
|
+ {{ post.modified_by }}
|
|
|
+ </a>.)
|
|
|
</small>
|
|
|
{% endif %}
|
|
|
</span>
|
|
@@ -81,15 +96,17 @@
|
|
|
</td>
|
|
|
{% endif %}
|
|
|
<td>
|
|
|
- <a href="{{ url_for('user.profile', username=post.user.username) }}"><span style="color: green;"><strong><em>{{ post.user.username }}</em></strong></span></a>
|
|
|
-
|
|
|
- {% if post.user|is_online %}
|
|
|
+ <a href="{{ url_for('user.profile', username=post.user.username) }}">
|
|
|
+ <span style="font-weight:bold">{{ post.user.username }}</span> <!-- TODO: Implement userstyles -->
|
|
|
+ </a>
|
|
|
+ {%- if post.user|is_online %}
|
|
|
<span class="label label-success">Online</span>
|
|
|
- {% else %}
|
|
|
+ {%- else %}
|
|
|
<span class="label label-default">Offline</span>
|
|
|
- {% endif %}
|
|
|
- <br />
|
|
|
- {{ post.user.primary_group.name }}<br />
|
|
|
+ {%- endif %}
|
|
|
+ <div class="profile primary-group">
|
|
|
+ {{ post.user.primary_group.name }}
|
|
|
+ </div>
|
|
|
</td>
|
|
|
|
|
|
<td class="pull-right">
|