Commit 2c7c7fd0d35682e8b35d24b6e574ff1929777efe
1 parent
1454431b
Exists in
master
and in
3 other branches
markers cloud is working but still have to think about edge cases
Showing
3 changed files
with
8 additions
and
4 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
| @@ -17,6 +17,12 @@ | @@ -17,6 +17,12 @@ | ||
| 17 | .users-cloud li:nth-of-type(5n - 3) { | 17 | .users-cloud li:nth-of-type(5n - 3) { |
| 18 | font-size: 3em; | 18 | font-size: 3em; |
| 19 | } | 19 | } |
| 20 | + | ||
| 21 | +.div-users-cloud{ | ||
| 22 | + height: 200px; | ||
| 23 | + margin-left: 20%; | ||
| 24 | + width: 70%; | ||
| 25 | +} | ||
| 20 | /* initial page ends */ | 26 | /* initial page ends */ |
| 21 | /* sidebar menu */ | 27 | /* sidebar menu */ |
| 22 | 28 |
categories/views.py
| @@ -28,7 +28,7 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView): | @@ -28,7 +28,7 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView): | ||
| 28 | 28 | ||
| 29 | login_url = reverse_lazy("users:login") | 29 | login_url = reverse_lazy("users:login") |
| 30 | redirect_field_name = 'next' | 30 | redirect_field_name = 'next' |
| 31 | - queryset = Category.objects.all() | 31 | + queryset = Category.objects.all().order_by('name') |
| 32 | template_name = 'categories/list.html' | 32 | template_name = 'categories/list.html' |
| 33 | context_object_name = 'categories' | 33 | context_object_name = 'categories' |
| 34 | paginate_by = 10 | 34 | paginate_by = 10 |
| @@ -57,8 +57,6 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView): | @@ -57,8 +57,6 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView): | ||
| 57 | def get_context_data(self, **kwargs): | 57 | def get_context_data(self, **kwargs): |
| 58 | context = super(IndexView, self).get_context_data(**kwargs) | 58 | context = super(IndexView, self).get_context_data(**kwargs) |
| 59 | 59 | ||
| 60 | - categories = self.get_queryset().order_by('name') | ||
| 61 | - context['categories'] = categories | ||
| 62 | context['settings_menu_active'] = "settings_menu_active" | 60 | context['settings_menu_active'] = "settings_menu_active" |
| 63 | 61 | ||
| 64 | return context | 62 | return context |
subjects/templates/subjects/initial.html
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | {% block content %} | 5 | {% block content %} |
| 6 | 6 | ||
| 7 | <div id="" class="col-md-12"> | 7 | <div id="" class="col-md-12"> |
| 8 | - <div class="users-cloud"> | 8 | + <div class="users-cloud div-users-cloud"> |
| 9 | <ul class=" users-cloud"> | 9 | <ul class=" users-cloud"> |
| 10 | {% for marker in markers %} | 10 | {% for marker in markers %} |
| 11 | <li>{{marker.name}}</li> | 11 | <li>{{marker.name}}</li> |