unify breadcrumbs in:

* add topic * edit post see: #5
jedie · Oct 19, 2012 · ea19cdb · ea19cdb
1 parent 381e1e1
commit ea19cdb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/djangobb_forum/templates/djangobb_forum/add_topic.html b/djangobb_forum/templates/djangobb_forum/add_topic.html
@@ -2,16 +2,8 @@
 {% load forum_extras %}
 {% load i18n %}
 
+{% block breadcrumb_header %}{% include 'djangobb_forum/includes/breadcrumb_post.html' %}{% endblock breadcrumb_header %}
+
 {% block content %}
-<div class="linkst">
-	<div class="inbox">
-		{% if forum %}
-		<ul class="start"><li><a href="{% url djangobb:index %}">{% trans "Root" %}</a> </li><li>&raquo; {% link forum %}</li></ul>
-		{% else %}
-			<ul><li><a href="{% url djangobb:index %}">{% trans "Root" %}</a> </li><li>&raquo; {% link topic.forum %}</li><li>&raquo; {{ topic }}</li></ul>
-		{% endif %}
-		<div class="clearer"></div>
-	</div>
-</div>
 {% include "djangobb_forum/includes/post_form.html" %}
 {% endblock %}
diff --git a/djangobb_forum/templates/djangobb_forum/edit_post.html b/djangobb_forum/templates/djangobb_forum/edit_post.html
@@ -2,17 +2,11 @@
 {% load forum_extras %}
 {% load i18n %}
 
-{% block content %}
-<div class="linkst">
-	<div class="inbox">
-		<ul><li><a href="{% url djangobb:index %}">{% trans "Root" %}</a> </li><li>&raquo; {% link post.topic.forum %}</li><li>&raquo; {{ post.topic }}</li></ul>
-		<div class="clearer"></div>
-	</div>
-</div>
+{% block breadcrumb_header %}{% include 'djangobb_forum/includes/breadcrumb_post.html' %}{% endblock breadcrumb_header %}
 
+{% block content %}
 <div class="blockform">
 	<h2>{% trans "Edit post" %}</h2>
-
 	<div class="box">
 		<form method="post">
 			{% csrf_token %}

diff --git a/djangobb_forum/templates/djangobb_forum/includes/breadcrumb_post.html b/djangobb_forum/templates/djangobb_forum/includes/breadcrumb_post.html
@@ -0,0 +1,22 @@
+{% extends 'djangobb_forum/includes/breadcrumb_base.html' %}
+{% load forum_extras %}
+{% load i18n %}
+
+{% block breadcrumb %}{{ block.super }}  
+{% if post %}
+    <li>&raquo; {{ post.topic.forum.category }}</li>
+    <li>&raquo; {% link post.topic.forum %}</li>
+    <li>&raquo; {% link post.topic %}</li>
+{% elif forum %}
+    <li>&raquo; {{ forum.category }}</li>
+    <li>&raquo; {% link forum %}</li>
+{% else %}
+    <li>&raquo; {{ topic.forum.category }}</li>
+    <li>&raquo; {% link topic.forum %}</li>
+    <li>&raquo; {% link topic %}</li>
+{% endif %}
+{% endblock breadcrumb %}
+
+{% block rss_feed %}{% endblock rss_feed %}
+
+{% block paginate %}{% endblock paginate %}