From e8c4decabe23ba0a8c76a710c11b6022c202e0d9 Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Wed, 28 Dec 2016 13:26:00 -0300
Subject: [PATCH] added right tooltip on sidebar menu, fixed margin outside them

---
 amadeus/static/css/base/amadeus.css       |  2 +-
 amadeus/static/js/amadeus.js              |  3 ++-
 amadeus/templates/base.html               | 19 ++++++++++++-------
 categories/templates/categories/list.html |  2 +-
 categories/views.py                       |  7 +------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 2fac418..5911595 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -9,7 +9,7 @@
     background-color: #26A69A;
     color: white;
     width: 80%;
-    margin-bottom: 3%;
+    margin: 10px;
     text-align: center;
 }
 
diff --git a/amadeus/static/js/amadeus.js b/amadeus/static/js/amadeus.js
index b8ece14..7b4b1a7 100755
--- a/amadeus/static/js/amadeus.js
+++ b/amadeus/static/js/amadeus.js
@@ -221,4 +221,5 @@ var Amadeus = {
             });
         }
     }
-};
\ No newline at end of file
+};
+
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index e748598..a95a06d 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -108,7 +108,7 @@
                         <a href="" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a> 
                         <ul class="dropdown-menu pull-right">
                             <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-                            <li><a href="{% url 'categories:index' %}">{% trans 'Manage Courses' %}</a></li>
+                            <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
                             <li><a href="{% url 'categories:index' %}">{% trans 'System' %}</a></li>
                             <div id="horizontal-line"></div>
                             <li><a href="{% url 'categories:index' %}">{% trans 'Mail Sender' %}</a></li>
@@ -139,21 +139,21 @@
             <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
                 {% block sidebar %}
                    <ul id="sidebar-menu">
-                       <li class="item">
+                       <li class="item"  data-toggle="tooltip" data-placement="right" title="{% trans "My Subjects" %}">
                             <i class="fa fa-graduation-cap" aria-hidden="true"></i>
                        </li>
-                       <li class="item">
-                            <i class="fa fa-list" aria-hidden="true"></i>
+                       <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
+                            <i class="fa fa-list" aria-hidden="true" ></i>
                        </li>
-                       <li class="item">
+                       <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
                             <i class="fa fa-envelope-o" aria-hidden="true"></i>
                        </li>
 
-                         <li class="item">
+                         <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
                             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                        </li>
 
-                       <li class="item">
+                       <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
                             <i class="fa fa-bar-chart" aria-hidden="true"></i>
                        </li>
 
@@ -184,6 +184,11 @@
         $('.text_wysiwyg').summernote({
             height: 200
         });
+
+        /* Initialize tooltips*/
+        $(function () {
+          $('[data-toggle="tooltip"]').tooltip()
+        })
     </script>
 </body>
 
diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index ad34d9e..8465815 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -66,7 +66,7 @@
              {% if not user.is_staff  %}
             <div class="col-md-5 pull-right">
             
-              <a href=""><i class="fa fa-list" aria-hidden="true"></i></a>
+              <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
               <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
 
               <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
diff --git a/categories/views.py b/categories/views.py
index d095ec6..56a8ec2 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -36,7 +36,7 @@ class IndexView(LoginRequiredMixin, ListView):
         else:
             context['page_template'] = "categories/home_teacher_student.html"
 
-        context['title'] = _('Home')
+        context['title'] = _('Categories')
 
         if self.request.is_ajax():
             if self.request.user.is_staff:
@@ -52,11 +52,6 @@ class IndexView(LoginRequiredMixin, ListView):
         categories = self.get_queryset().order_by('name')
         
         
-            
-        
-
-        
-        context['title'] = _('Categories')
         context['categories'] = categories
 
         return context
--
libgit2 0.21.2