Commit 1454431baa6c5053153e8776a0250c8f5a392d15
1 parent
b19157cd
Exists in
master
and in
3 other branches
added markers to cloud
Showing
2 changed files
with
5 additions
and
4 deletions
Show diff stats
subjects/templates/subjects/initial.html
@@ -7,8 +7,8 @@ | @@ -7,8 +7,8 @@ | ||
7 | <div id="" class="col-md-12"> | 7 | <div id="" class="col-md-12"> |
8 | <div class="users-cloud"> | 8 | <div class="users-cloud"> |
9 | <ul class=" users-cloud"> | 9 | <ul class=" users-cloud"> |
10 | - {% for user in users %} | ||
11 | - <li>{{user.social_name}}</li> | 10 | + {% for marker in markers %} |
11 | + <li>{{marker.name}}</li> | ||
12 | {% endfor %} | 12 | {% endfor %} |
13 | </ul> | 13 | </ul> |
14 | </div> | 14 | </div> |
subjects/views.py
@@ -21,6 +21,7 @@ from log.mixins import LogMixin | @@ -21,6 +21,7 @@ from log.mixins import LogMixin | ||
21 | from log.decorators import log_decorator_ajax | 21 | from log.decorators import log_decorator_ajax |
22 | from log.models import Log | 22 | from log.models import Log |
23 | 23 | ||
24 | +from .models import Marker | ||
24 | import time | 25 | import time |
25 | from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger | 26 | from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger |
26 | from .forms import CreateSubjectForm | 27 | from .forms import CreateSubjectForm |
@@ -53,8 +54,8 @@ class HomeView(LoginRequiredMixin, ListView): | @@ -53,8 +54,8 @@ class HomeView(LoginRequiredMixin, ListView): | ||
53 | context['title'] = _('Home') | 54 | context['title'] = _('Home') |
54 | 55 | ||
55 | #bringing users | 56 | #bringing users |
56 | - users = User.objects.all() | ||
57 | - context['users'] = users | 57 | + markers = Marker.objects.all() |
58 | + context['markers'] = markers | ||
58 | return context | 59 | return context |
59 | 60 | ||
60 | 61 |