From a143d808302ec73c9cc6a54245a04e8bee39d5f2 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 4 Jan 2017 15:32:04 -0200
Subject: [PATCH] Adjusts

---
 amadeus/static/css/base/amadeus.css       | 20 +++++++++++++-------
 amadeus/templates/base.html               |  2 +-
 categories/templates/categories/home.html |  2 +-
 categories/templates/categories/list.html |  2 +-
 categories/views.py                       |  2 ++
 subjects/templates/subjects/list.html     |  6 +++---
 subjects/views.py                         | 26 +++++++++++++-------------
 7 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 41d6387..7d3cc8a 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -37,6 +37,10 @@
     color: white;
 }
 
+#sidebar-menu > .subjects_menu_active {
+    background-color: #00695C;
+}
+
 #sidebar-menu > .item:hover{
     background-color: #00695C;
 }
@@ -109,23 +113,25 @@
 }
 
 #core-subjects-options-div{
-      width: 100%;
+    width: 100%;
     margin-bottom: 2%;
     height: 30px;
 }
 
 .core-subjects-options  li{
-  float:left;
-  padding: 10px;
-  background-color: #FFFFFF;
-  margin: 1px;
- 
+    float:left;
+    padding: 10px;
+    background-color: #FFFFFF;
+    margin: 1px;
     border-bottom: 10px;
     border-bottom-style: solid;
+    border-bottom-color: #D2D2D2;
+    color: #A0A0A0;
 }
 
 .core-subjects-options  li.active{
-  border-bottom-color: green;
+    color: inherit;
+    border-bottom-color: green;
 }
 
 #delete-category-footer{
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index cda8a67..659b2c3 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -142,7 +142,7 @@
             <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1">
                 {% block sidebar %}
                    <ul id="sidebar-menu">
-                        <li class="item" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
+                        <li class="item {{ subjects_menu_active }}" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
                             <a href="{% url 'subjects:index' %}">
                                 <i class="fa fa-graduation-cap" aria-hidden="true"></i>
                             </a>
diff --git a/categories/templates/categories/home.html b/categories/templates/categories/home.html
index 6317d2f..526c3fa 100755
--- a/categories/templates/categories/home.html
+++ b/categories/templates/categories/home.html
@@ -4,7 +4,7 @@
 
 {% block breadcrumbs %}
     {% clear_breadcrumbs %}
-    {% breadcrumb 'Home' 'categories:index' %}
+    {% breadcrumb 'Home' 'subjects:home' %}
 {% endblock %}
 
 {% block style %}
diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index 8c35196..a2dbc8c 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'categories/home.html' %}
 
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
diff --git a/categories/views.py b/categories/views.py
index da5c184..ea20765 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -110,6 +110,7 @@ class CreateCategory(views.SuperuserRequiredMixin, HasRoleMixin, LogMixin, Creat
             context['settings_menu_active'] = "settings_menu_active"
         else:
             context['template_extends'] = 'subjects/list.html'
+            context['subjects_menu_active'] = 'subjects_menu_active';
 
         return context
 
@@ -198,6 +199,7 @@ class UpdateCategory(LogMixin, UpdateView):
             context['settings_menu_active'] = "settings_menu_active"
         else:
             context['template_extends'] = 'subjects/list.html'
+            context['subjects_menu_active'] = 'subjects_menu_active';
 
         return context
 
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 2135dcd..4ca037d 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'categories/home.html' %}
 
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
@@ -28,10 +28,10 @@
         <ul class="core-subjects-options">
             {% if all %}
                 <a href="{% url 'subjects:index' %}"><li >{% trans "My subjects" %}</li></a>
-                <a href="{% url 'subjects:index' 'all' %}" ><li class="active">{% trans "all subjects" %}</li></a>
+                <a href="{% url 'subjects:index' 'all' %}" ><li class="active">{% trans "All subjects" %}</li></a>
             {% else %}
                 <a href="{% url 'subjects:index' %}"><li class="active">{% trans "My subjects" %}</li></a>
-                <a href="{% url 'subjects:index' 'all' %}" ><li>{% trans "all subjects" %}</li></a>
+                <a href="{% url 'subjects:index' 'all' %}" ><li>{% trans "All subjects" %}</li></a>
             {% endif %}
             
         </ul>
diff --git a/subjects/views.py b/subjects/views.py
index 58eea8c..9654d5a 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -81,7 +81,7 @@ class IndexView(LoginRequiredMixin, ListView):
         else:
             context['page_template'] = "categories/home_teacher_student.html"
 
-        context['title'] = _('Categories')
+        
 
         if self.request.is_ajax():
             if self.request.user.is_staff:
@@ -93,34 +93,31 @@ class IndexView(LoginRequiredMixin, ListView):
 
     def get_context_data(self, **kwargs):
         context = super(IndexView, self).get_context_data(**kwargs)
-        if self.request.user.is_staff:
-            categories = self.get_queryset().order_by('name').filter(visible=True)
 
-            context['all'] = False
+        context['all'] = False
+        context['title'] = _('My Subjects')
             
-            if self.kwargs.get('option'):
-                context['all'] = True
+        if self.kwargs.get('option'):
+            context['all'] = True
+            context['title'] = _('All Subjects')
 
+        if self.request.user.is_staff:
+            categories = self.get_queryset().order_by('name').filter(visible=True)
         else:
             if self.kwargs.get('option'):
                 categories = self.get_queryset().order_by('name').filter(visible=True)
-                context['all'] = True
                 for category in categories:
                     category.subjects = Subject.objects.filter(category= category)
             else:
-                context['all'] = False
                 categories = self.get_queryset().filter(visible=True)
                 for category in categories:
                     category.subjects = Subject.objects.filter(category= category)
 
                 categories = [category for category in categories if category.subjects.count() > 0 or self.request.user in category.coordinators.all()] 
                 #So I remove all categories that doesn't have the possibility for the user to be on
-               
-        
-      
-           
         
         context['categories'] = categories
+        context['subjects_menu_active'] = 'subjects_menu_active';
 
         return context
 
@@ -142,8 +139,11 @@ class SubjectCreateView(CreateView):
     def get_context_data(self, **kwargs):
         context = super(SubjectCreateView, self).get_context_data(**kwargs)
         context['slug'] = self.kwargs['slug']
-        context['template_extends'] = 'categories/list.html'
+        context['template_extends'] = 'subjects/list.html'
+        context['subjects_menu_active'] = 'subjects_menu_active';
+        
         return context
+
     def form_valid(self, form):
         
         self.object = form.save()
--
libgit2 0.21.2