Download as
Browse Code »

Commit 63fa0cecf3a9c59bda38266bfacb05c3a2468d94

Authored by Matheus Lins
2 parents 709834ba 29f01fe5
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

fixing some issues in detail courses

Showing 4 changed files with 21 additions and 7 deletions   Show diff stats
courses/templates/course/view.html
  Diff comments   View file @63fa0ce
@@ -31,6 +31,22 @@ @@ -31,6 +31,22 @@
31 <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li> 31 <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
32 <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li> 32 <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
33 <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li> 33 <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
  34 + {# <li><a href="{% url 'course:participants' %}">{% trans 'Participants' %}</a></li> #}
  35 + {% if user|has_role:'system_admin' %}
  36 + <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
  37 + {% endif %}
  38 + {% if user|has_role:'system_admin' or user|has_role:'professor' %}
  39 + <li>
  40 + <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
  41 + <div id="courses_list" class="collapse">
  42 + <ul class="nav nav-pill nav-stacked accordion_list">
  43 + {% for course in courses_list %}
  44 + <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
  45 + {% endfor %}
  46 + </ul>
  47 + </div>
  48 + </li>
  49 + {% endif %}
34 </ul> 50 </ul>
35 </div> 51 </div>
36 </div> 52 </div>
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @63fa0ce
@@ -19,11 +19,6 @@ @@ -19,11 +19,6 @@
19 </div><!--column --> 19 </div><!--column -->
20 <div class="col-xs-3 col-md-2 divMoreActions"> 20 <div class="col-xs-3 col-md-2 divMoreActions">
21 <div class="btn-group"> 21 <div class="btn-group">
22 - <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">  
23 - <i class="fa fa-eye fa-2x" aria-hidden="true"></i>  
24 - </button>  
25 - </div>  
26 - <div class="btn-group">  
27 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 22 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
28 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 23 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
29 </button> 24 </button>
courses/templates/subject/index.html
  Diff comments   View file @63fa0ce
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li> 23 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
24 <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li> 24 <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
25 {% endif %} 25 {% endif %}
  26 + <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
26 {% if user|has_role:'system_admin' %} 27 {% if user|has_role:'system_admin' %}
27 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> 28 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
28 {% endif %} 29 {% endif %}
users/templates/users/profile.html
  Diff comments   View file @63fa0ce
@@ -45,9 +45,11 @@ @@ -45,9 +45,11 @@
45 <div class="row"> 45 <div class="row">
46 <div class="col-md-4"> 46 <div class="col-md-4">
47 {% if user.image %} 47 {% if user.image %}
48 - <div style="background-image: url('{{ user.image.url }}'); background-size: 100% 100%; background-repeat: no-repeat; margin-left: 8em;" alt="photoUser" class="img-circle img-responsive img-list-user"></div> 48 + <div style="width: 200px; overflow:hidden; margin-left: 8em;">
  49 + <img src="{{ user.image.url }}" class="img-circle img-responsive img-list-user" >
  50 + </div>
49 {% else %} 51 {% else %}
50 - {% if usser.gender == 'M' %} 52 + {% if user.gender == 'M' %}
51 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;"> 53 <img src="{% static 'img/male_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;">
52 {% else %} 54 {% else %}
53 <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;"> 55 <img src="{% static 'img/female_avatar.png' %}" alt="Avatar" class="img-circle img-responsive img-list-user" style="margin-left: 8em;">