Download as
Browse Code »

Commit 34ef0865d74ea2686e3740017895740e589b47bb

Authored by Matheus Lins
1 parent 99b89574
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

fixing template curses

Showing 3 changed files with 60 additions and 9 deletions   Show diff stats
app/templates/home_professor.html
  Diff comments   View file @34ef086
... ... @@ -6,7 +6,7 @@
6 6 <div class="row">
7 7 <div class="col-md-12">
8 8 <ul class="breadcrumb">
9   - <li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
  9 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
10 10 </ul>
11 11 </div>
12 12 </div>
... ...
courses/templates/course/view.html
  Diff comments   View file @34ef086
1   -{% extends 'app/base.html' %}
  1 +{% extends 'home_professor.html' %}
2 2  
3 3 {% load static i18n permission_tags %}
4 4  
5 5 {% block breadcrumbs %}
6   - <ol class="breadcrumb">
7   - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
8   - <li class="active">{{ course }}</li>
9   - </ol>
  6 + <div class="row">
  7 + <div class="col-md-12">
  8 + <ul class="breadcrumb">
  9 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  10 + <li class="active">{{ course }}</li>
  11 + </ul>
  12 + </div>
  13 + </div>
10 14 {% endblock %}
11 15  
  16 +
12 17 {% block sidebar %}
13   - <div class="list-group">
  18 +
  19 +{{block.super}}
  20 +<div class="row">
  21 + <div class="col-md-12">
  22 + <div class="panel panel-primary navigation">
  23 + <div class="panel-heading">
  24 + <h5>{% trans 'Subjects' %}</h5>
  25 + </div>
  26 + <div class="panel-body">
  27 + <ul class="nav nav-pills nav-stacked">
  28 + {% for subject in subjects %}
  29 + <li><a href="">{{subject.name}}</a></li>
  30 + {% endfor %}
  31 + </ul>
  32 + </div>
  33 + </div>
  34 + </div>
  35 +</div>
  36 +<!--<div class="list-group">
14 37 <a href="{% url 'course:manage' %}" class="list-group-item">
15 38 {% trans 'Courses' %}
16 39 </a>
... ... @@ -40,11 +63,12 @@
40 63 {% trans 'Delete Course' %}
41 64 </a>
42 65 {% endif %}
43   - </div>
  66 + </div> -->
44 67 {% endblock %}
45 68  
46 69 {% block content %}
47   - <div class="row">
  70 +
  71 +<div class="row">
48 72 <div class="col-sm-3">
49 73 <img src="{{ course.image.url }}" class="img-responsive" />
50 74 </div>
... ... @@ -70,4 +94,23 @@
70 94 </p>
71 95 </div>
72 96 </div>
  97 + <div class="row">
  98 + <div class="col-md-12">
  99 + <h3>Subjects</h3>
  100 + {% for subject in subjects %}
  101 + <div class="panel panel-info">
  102 + <div class="panel-heading">
  103 + <h3 class="panel-title">Subject 1</h3>
  104 + </div>
  105 + <div class="panel-body">
  106 + Dummy Info
  107 + </div>
  108 + </div>
  109 + {% endfor %}
  110 + </div>
  111 + </div>
  112 +
73 113 {% endblock %}
  114 +
  115 +{% block rightbar %}
  116 +{% endblock rightbar %}
... ...
courses/views.py
  Diff comments   View file @34ef086
... ... @@ -81,6 +81,14 @@ class View(LoginRequiredMixin, generic.DetailView):
81 81 context_object_name = 'course'
82 82 template_name = 'course/view.html'
83 83  
  84 + def get_context_data(self, **kwargs):
  85 + context = super(View, self).get_context_data(**kwargs)
  86 + course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
  87 + subjects = Subject.objects.filter(Q(visible=True) | Q(professors__in=[self.request.user]) | Q(course = course))
  88 + context['subjects'] = subjects
  89 +
  90 + return context
  91 +
84 92 class DeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
85 93  
86 94 allowed_roles = ['professor', 'system_admin']
... ...