From 7a871050496de6db6481924051168d6f4e649895 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Fri, 20 Jan 2017 18:16:13 -0300
Subject: [PATCH] fixed minor issues

---
 amadeus/templates/base.html                  |  2 +-
 subjects/templates/subjects/list_search.html | 15 +++++++++++----
 subjects/views.py                            |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 5777c4b..b2a9cd3 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -76,7 +76,7 @@
             </div>
             <div class="navbar-collapse collapse navbar-responsive-collapse">
                 <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center">
-                    <form id="SearchForm" action="{% url 'subjects:search'  %}" method="get" accept-charset="utf-8" class="navbar-form">
+                    <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
                         <div class="input-group">
                             <div class="form-group is-empty" >
                                 <input type="text" class="form-control top-search" placeholder="{% trans 'Search for subjects and resources' %}" name="search">
diff --git a/subjects/templates/subjects/list_search.html b/subjects/templates/subjects/list_search.html
index 6af8830..3549fd1 100644
--- a/subjects/templates/subjects/list_search.html
+++ b/subjects/templates/subjects/list_search.html
@@ -3,6 +3,13 @@
 {% load static i18n pagination %}
 {% load django_bootstrap_breadcrumbs subject_counter %}
 
+{% block breadcrumbs %}
+	{% clear_breadcrumbs %}
+   	{% breadcrumb 'Home' 'subjects:home' %}
+   	{% breadcrumb  "Subjects" 'subjects:index' %}
+
+{% endblock breadcrumbs %}
+
 {% block content %}
 
 	 {% if messages %}
@@ -20,11 +27,11 @@
     <div id="core-subjects-options-div">
         <ul class="core-subjects-options">
             {% if all %}
-                <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "My subjects" %} ({{ totals.my_subjects }})</li></a>
-                <a href="{% url 'subjects:search' 'all' %}?search={{tags}}" ><li class="active">{% trans "All subjects" %} ({{ totals.all_subjects }})</li></a>
+                <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
+                <a href="" ><li class="active">{% trans "Resources" %} ({{ totals.all_subjects }})</li></a>
             {% else %}
-                <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "My subjects" %} ({{ totals.my_subjects }})</li></a>
-                <a href="{% url 'subjects:search' 'all' %}?search={{tags}}" ><li>{% trans "All subjects" %} ({{ totals.all_subjects }})</li></a>
+                <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
+                <a href="" ><li>{% trans "Resources" %} ({{ totals.all_subjects }})</li></a>
             {% endif %}
             
         </ul>
diff --git a/subjects/views.py b/subjects/views.py
index fdb2c34..aadd9ea 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -367,14 +367,14 @@ class SubjectSearchView(LoginRequiredMixin, ListView):
         
         context['tags'] = self.tags
         context['all'] = False
-        context['title'] = _('My Subjects')
+        context['title'] = _('Subjects')
 
         context['show_buttons'] = True #So it shows subscribe and access buttons
         context['totals'] = self.totals
         
         if self.kwargs.get('option'):
             context['all'] = True
-            context['title'] = _('All Subjects')
+            context['title'] = _('Subjects')
 
         context['subjects_menu_active'] = 'subjects_menu_active'
 
--
libgit2 0.21.2