From ae1b43d366c4c793229aa048bda84c520ae8f58f Mon Sep 17 00:00:00 2001
From: "ajurna@gmail.com" <br!ll0alpha>
Date: Wed, 30 Mar 2016 11:37:49 +0100
Subject: [PATCH] removed breadcrumbs logic to its own template removed
 breadcrumbs block from templates added breadcrumbs that were missing from
 settings page

---
 comic/templates/base.html                |  8 +++++---
 comic/templates/comic/breadcrumbs.html   |  7 +++++++
 comic/templates/comic/comic_list.html    |  9 ---------
 comic/templates/comic/read_comic.html    | 10 +---------
 comic/templates/comic/settings_page.html |  9 ---------
 comic/templates/comic/setup.html         | 10 ----------
 comic/templates/comic/users_page.html    | 10 ----------
 comic/views.py                           |  8 ++++++--
 8 files changed, 19 insertions(+), 52 deletions(-)
 create mode 100644 comic/templates/comic/breadcrumbs.html

diff --git a/comic/templates/base.html b/comic/templates/base.html
index 2e485cd..8d599e0 100644
--- a/comic/templates/base.html
+++ b/comic/templates/base.html
@@ -41,16 +41,18 @@
         <div id="navbar" class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
             {% for page, link in menu.menu_items.items %}
-              <li {% if menu.current_page = page %} class="active"{% endif %}><a href="{{ link }}">{{ page }}</a></li>
+              <li {% if menu.current_page == page %} class="active"{% endif %}><a href="{{ link }}">{{ page }}</a></li>
             {% endfor %}
           </ul>
         </div><!--/.nav-collapse -->
       </div>
     </nav>
     <ol class="breadcrumb">
-        {% block breadcrumb %}
+        {% if breadcrumbs %}
+          {% include "comic/breadcrumbs.html" %}
+        {% else %}
             <li><a href="/">Home</a></li>
-        {% endblock %}
+        {% endif %}
     </ol>
 
         {% block content %}{% endblock %}
diff --git a/comic/templates/comic/breadcrumbs.html b/comic/templates/comic/breadcrumbs.html
new file mode 100644
index 0000000..c5718e9
--- /dev/null
+++ b/comic/templates/comic/breadcrumbs.html
@@ -0,0 +1,7 @@
+{% for crumb in breadcrumbs %}
+    {% if not forloop.last %}
+        <li><a href="{{ crumb.url }}">{{ crumb.name }}</a></li>
+    {% else %}
+        <li class="active">{{ crumb.name }}</li>
+    {% endif %}
+{% endfor %}
\ No newline at end of file
diff --git a/comic/templates/comic/comic_list.html b/comic/templates/comic/comic_list.html
index 2d20905..278cb99 100644
--- a/comic/templates/comic/comic_list.html
+++ b/comic/templates/comic/comic_list.html
@@ -1,15 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ title }}{% endblock %}
 
-{% block breadcrumb %}
-    {% for crumb in breadcrumbs %}
-        {% if not forloop.last %}
-            <li><a href="{{ crumb.url }}">{{ crumb.name }}</a></li>
-        {% else %}
-            <li class="active">{{ crumb.name }}</li>
-        {% endif %}
-    {% endfor %}
-{% endblock %}
 {% block content %}
 <div class="container">
     <h2 class="center">Comics</h2>
diff --git a/comic/templates/comic/read_comic.html b/comic/templates/comic/read_comic.html
index 9f3d31b..a4dcf61 100644
--- a/comic/templates/comic/read_comic.html
+++ b/comic/templates/comic/read_comic.html
@@ -1,14 +1,6 @@
 {% extends "base.html" %}
 {% block title %}{{ title }}{% endblock %}
-{% block breadcrumb %}
-    {% for crumb in breadcrumbs %}
-        {% if not forloop.last %}
-            <li><a href="{{ crumb.url }}">{{ crumb.name }}</a></li>
-        {% else %}
-            <li class="active">{{ crumb.name }}</li>
-        {% endif %}
-    {% endfor %}
-{% endblock %}
+
 {% block content %}
 <div class="container comic_box">
 <center>
diff --git a/comic/templates/comic/settings_page.html b/comic/templates/comic/settings_page.html
index 3072d46..f01050c 100644
--- a/comic/templates/comic/settings_page.html
+++ b/comic/templates/comic/settings_page.html
@@ -2,15 +2,6 @@
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block breadcrumb %}
-    {% for crumb in breadcrumbs %}
-        {% if not forloop.last %}
-            <li><a href="{{ crumb.url }}">{{ crumb.name }}</a></li>
-        {% else %}
-            <li class="active">{{ crumb.name }}</li>
-        {% endif %}
-    {% endfor %}
-{% endblock %}
 
 {% block content %}
 <div class="container">
diff --git a/comic/templates/comic/setup.html b/comic/templates/comic/setup.html
index 4896c5d..b2c801e 100644
--- a/comic/templates/comic/setup.html
+++ b/comic/templates/comic/setup.html
@@ -2,16 +2,6 @@
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block breadcrumb %}
-    {% for crumb in breadcrumbs %}
-        {% if not forloop.last %}
-            <li><a href="{{ crumb.url }}">{{ crumb.name }}</a></li>
-        {% else %}
-            <li class="active">{{ crumb.name }}</li>
-        {% endif %}
-    {% endfor %}
-{% endblock %}
-
 {% block content %}
 {% if error_message %}
 <div class="alert alert-danger" role="alert">{{ error_message|safe }}</div>
diff --git a/comic/templates/comic/users_page.html b/comic/templates/comic/users_page.html
index 7e87b3a..65d4c54 100644
--- a/comic/templates/comic/users_page.html
+++ b/comic/templates/comic/users_page.html
@@ -2,16 +2,6 @@
 
 {% block title %}CBWebReader - Users{% endblock %}
 
-{% block breadcrumb %}
-    {% for crumb in breadcrumbs %}
-        {% if not forloop.last %}
-            <li><a href="{{ crumb.url }}">{{ crumb.name }}</a></li>
-        {% else %}
-            <li class="active">{{ crumb.name }}</li>
-        {% endif %}
-    {% endfor %}
-{% endblock %}
-
 {% block content %}
 <div class="container">
     <table class="table table-striped table-bordered table-hover">
diff --git a/comic/views.py b/comic/views.py
index 6171f6b..6e4a750 100644
--- a/comic/views.py
+++ b/comic/views.py
@@ -149,6 +149,9 @@ def user_add_page(request):
 @user_passes_test(lambda u: u.is_superuser)
 def settings_page(request):
     success_message = []
+    crumbs = [
+        ('Settings', '/comic/settings/'),
+    ]
     if request.POST:
         form = SettingsForm(request.POST)
         if form.is_valid():
@@ -169,13 +172,14 @@ def settings_page(request):
             recaptcha_public_key.save()
             success_message.append('Settings updated.')
     form = SettingsForm(initial=SettingsForm.get_initial_values())
-    context = RequestContext(request, {
+    context = {
         'error_message': form.errors,
         'success_message': '</br>'.join(success_message),
         'form': form,
         'menu': Menu(request.user, 'Settings'),
         'title': 'CBWebReader - Settings',
-    })
+        'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
+    }
     return render(request, 'comic/settings_page.html', context)