Download as
Browse Code »

Commit 7a871050496de6db6481924051168d6f4e649895

Authored by Felipe Henrique de Almeida Bormann
1 parent 3d56034a
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

fixed minor issues

Showing 3 changed files with 14 additions and 7 deletions   Show diff stats
amadeus/templates/base.html
  Diff comments   View file @7a87105
... ... @@ -76,7 +76,7 @@
76 76 </div>
77 77 <div class="navbar-collapse collapse navbar-responsive-collapse">
78 78 <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">
79   - <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
  79 + <form id="SearchForm" action="{% url 'subjects:search' %}" method="get" accept-charset="utf-8" class="navbar-form">
80 80 <div class="input-group">
81 81 <div class="form-group is-empty" >
82 82 <input type="text" class="form-control top-search" placeholder="{% trans 'Search for subjects and resources' %}" name="search">
... ...
subjects/templates/subjects/list_search.html
  Diff comments   View file @7a87105
... ... @@ -3,6 +3,13 @@
3 3 {% load static i18n pagination %}
4 4 {% load django_bootstrap_breadcrumbs subject_counter %}
5 5  
  6 +{% block breadcrumbs %}
  7 + {% clear_breadcrumbs %}
  8 + {% breadcrumb 'Home' 'subjects:home' %}
  9 + {% breadcrumb "Subjects" 'subjects:index' %}
  10 +
  11 +{% endblock breadcrumbs %}
  12 +
6 13 {% block content %}
7 14  
8 15 {% if messages %}
... ... @@ -20,11 +27,11 @@
20 27 <div id="core-subjects-options-div">
21 28 <ul class="core-subjects-options">
22 29 {% if all %}
23   - <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "My subjects" %} ({{ totals.my_subjects }})</li></a>
24   - <a href="{% url 'subjects:search' 'all' %}?search={{tags}}" ><li class="active">{% trans "All subjects" %} ({{ totals.all_subjects }})</li></a>
  30 + <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
  31 + <a href="" ><li class="active">{% trans "Resources" %} ({{ totals.all_subjects }})</li></a>
25 32 {% else %}
26   - <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "My subjects" %} ({{ totals.my_subjects }})</li></a>
27   - <a href="{% url 'subjects:search' 'all' %}?search={{tags}}" ><li>{% trans "All subjects" %} ({{ totals.all_subjects }})</li></a>
  33 + <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "Subjects" %} ({{ totals.my_subjects }})</li></a>
  34 + <a href="" ><li>{% trans "Resources" %} ({{ totals.all_subjects }})</li></a>
28 35 {% endif %}
29 36  
30 37 </ul>
... ...
subjects/views.py
  Diff comments   View file @7a87105
... ... @@ -367,14 +367,14 @@ class SubjectSearchView(LoginRequiredMixin, ListView):
367 367  
368 368 context['tags'] = self.tags
369 369 context['all'] = False
370   - context['title'] = _('My Subjects')
  370 + context['title'] = _('Subjects')
371 371  
372 372 context['show_buttons'] = True #So it shows subscribe and access buttons
373 373 context['totals'] = self.totals
374 374  
375 375 if self.kwargs.get('option'):
376 376 context['all'] = True
377   - context['title'] = _('All Subjects')
  377 + context['title'] = _('Subjects')
378 378  
379 379 context['subjects_menu_active'] = 'subjects_menu_active'
380 380  
... ...