Download as
Browse Code »

Commit e8c4decabe23ba0a8c76a710c11b6022c202e0d9

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

added right tooltip on sidebar menu, fixed margin outside them

Showing 5 changed files with 17 additions and 16 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @e8c4dec
... ... @@ -9,7 +9,7 @@
9 9 background-color: #26A69A;
10 10 color: white;
11 11 width: 80%;
12   - margin-bottom: 3%;
  12 + margin: 10px;
13 13 text-align: center;
14 14 }
15 15  
... ...
amadeus/static/js/amadeus.js
  Diff comments   View file @e8c4dec
... ... @@ -221,4 +221,5 @@ var Amadeus = {
221 221 });
222 222 }
223 223 }
224   -};
225 224 \ No newline at end of file
  225 +};
  226 +
... ...
amadeus/templates/base.html
  Diff comments   View file @e8c4dec
... ... @@ -108,7 +108,7 @@
108 108 <a href="" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a>
109 109 <ul class="dropdown-menu pull-right">
110 110 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
111   - <li><a href="{% url 'categories:index' %}">{% trans 'Manage Courses' %}</a></li>
  111 + <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
112 112 <li><a href="{% url 'categories:index' %}">{% trans 'System' %}</a></li>
113 113 <div id="horizontal-line"></div>
114 114 <li><a href="{% url 'categories:index' %}">{% trans 'Mail Sender' %}</a></li>
... ... @@ -139,21 +139,21 @@
139 139 <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
140 140 {% block sidebar %}
141 141 <ul id="sidebar-menu">
142   - <li class="item">
  142 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "My Subjects" %}">
143 143 <i class="fa fa-graduation-cap" aria-hidden="true"></i>
144 144 </li>
145   - <li class="item">
146   - <i class="fa fa-list" aria-hidden="true"></i>
  145 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
  146 + <i class="fa fa-list" aria-hidden="true" ></i>
147 147 </li>
148   - <li class="item">
  148 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
149 149 <i class="fa fa-envelope-o" aria-hidden="true"></i>
150 150 </li>
151 151  
152   - <li class="item">
  152 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
153 153 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
154 154 </li>
155 155  
156   - <li class="item">
  156 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
157 157 <i class="fa fa-bar-chart" aria-hidden="true"></i>
158 158 </li>
159 159  
... ... @@ -184,6 +184,11 @@
184 184 $('.text_wysiwyg').summernote({
185 185 height: 200
186 186 });
  187 +
  188 + /* Initialize tooltips*/
  189 + $(function () {
  190 + $('[data-toggle="tooltip"]').tooltip()
  191 + })
187 192 </script>
188 193 </body>
189 194  
... ...
categories/templates/categories/list.html
  Diff comments   View file @e8c4dec
... ... @@ -66,7 +66,7 @@
66 66 {% if not user.is_staff %}
67 67 <div class="col-md-5 pull-right">
68 68  
69   - <a href=""><i class="fa fa-list" aria-hidden="true"></i></a>
  69 + <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
70 70 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
71 71  
72 72 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
... ...
categories/views.py
  Diff comments   View file @e8c4dec
... ... @@ -36,7 +36,7 @@ class IndexView(LoginRequiredMixin, ListView):
36 36 else:
37 37 context['page_template'] = "categories/home_teacher_student.html"
38 38  
39   - context['title'] = _('Home')
  39 + context['title'] = _('Categories')
40 40  
41 41 if self.request.is_ajax():
42 42 if self.request.user.is_staff:
... ... @@ -52,11 +52,6 @@ class IndexView(LoginRequiredMixin, ListView):
52 52 categories = self.get_queryset().order_by('name')
53 53  
54 54  
55   -
56   -
57   -
58   -
59   - context['title'] = _('Categories')
60 55 context['categories'] = categories
61 56  
62 57 return context
... ...