Templates and static files updated

ellmetha · Mar 31, 2015 · 94703c0 · 94703c0
1 parent 7e0ce51
commit 94703c0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/machina/static/machina/css/board_theme.css b/machina/static/machina/css/board_theme.css
@@ -7,6 +7,9 @@
 #main_container {
   margin-bottom: 40px;
 }
+#main_container .moderation-link-wrapper {
+  margin-top: -20px;
+}
 .preview .post-preview .post-content-wrapper hr {
   margin-top: 5px;
   margin-bottom: 10px;

diff --git a/machina/static/machina/less/board_pages/common.less b/machina/static/machina/less/board_pages/common.less
@@ -17,4 +17,8 @@
 
 #main_container{
 	margin-bottom: 40px;
+
+	.moderation-link-wrapper{
+		margin-top: -20px;
+	}
 }
diff --git a/machina/templates/machina/board_base.html b/machina/templates/machina/board_base.html
@@ -3,6 +3,7 @@
 {% load static %}
 {% load i18n %}
 {% load compress %}
+{% load forum_moderation_tags %}
 
 {% block title %}{{ MACHINA_FORUM_NAME|default:"Forum" }} &mdash; {% block sub-title %}{% endblock sub-title %}{% endblock title %}
 
@@ -56,6 +57,11 @@
                 {% block breadcrumb %}
                     {% include "machina/partials/breadcrumb.html" %}
                 {% endblock breadcrumb %}
+                {% if request.user|can_access_moderation_panel %}
+                    <div class="pull-right moderation-link-wrapper">
+                        <a href="#" class="btn btn-link"><i class="fa fa-wrench">&nbsp;</i>{% trans "Moderation panel" %}</a>
+                    </div>
+                {% endif %}
             </div>
         </div>
         <div class="row">

diff --git a/machina/templates/machina/forum/forum_detail.html b/machina/templates/machina/forum/forum_detail.html
@@ -18,7 +18,7 @@ <h1>{{ forum.name }}</h1>
             <div class="forumlist-top-controls col-xs-12">
                 {% if request.user.is_authenticated %}
                     <div class="pull-right">
-                        <a href="{% url 'forum-tracking:mark-subforums-read' forum.pk %}" class="btn btn-link"><i class="fa fa-check-circle-o"></i>&nbsp;{% trans "Mark subforums read" %}</a>
+                        <a href="{% url 'forum-tracking:mark-subforums-read' forum.pk %}" class="btn btn-link"><i class="fa fa-check-circle-o">&nbsp;</i>{% trans "Mark subforums read" %}</a>
                     </div>
                 {% endif %}
             </div>

diff --git a/machina/templates/machina/forum/index.html b/machina/templates/machina/forum/index.html
@@ -10,7 +10,7 @@
 		<div class="forumlist-top-controls col-xs-12">
 			{% if request.user.is_authenticated %}
 				<div class="pull-right">
-					<a href="{% url 'forum-tracking:mark-all-forums-read' %}" class="btn btn-link"><i class="fa fa-check-circle-o"></i>&nbsp;{% trans "Mark forums read" %}</a>
+					<a href="{% url 'forum-tracking:mark-all-forums-read' %}" class="btn btn-link"><i class="fa fa-check-circle-o">&nbsp;</i>{% trans "Mark forums read" %}</a>
 				</div>
 				<a href="{% url 'forum-tracking:unread-topics' %}" class="btn btn-link">{% trans "View unread topics" %}</a>
 			{% endif %}

diff --git a/machina/templates/machina/partials/breadcrumb.html b/machina/templates/machina/partials/breadcrumb.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <ul class="breadcrumb">
-    <li><a href="{% url 'forum:index' %}"><i class="fa fa-home"></i> {% trans "Forum index" %}</a></li>
+    <li><a href="{% url 'forum:index' %}"><i class="fa fa-home">&nbsp;</i>{% trans "Forum index" %}</a></li>
     {% if forum %}
         {% for ancestor in forum.get_ancestors %}
             <li><a href="{% url 'forum:forum' ancestor.slug ancestor.id %}">{{ ancestor.name }}</a></li>