Download as
Browse Code »

Commit e432b15132cd7e889f11962fce8412018764e180

Authored by Julio Toscano
Committed by GitHub
2 parents 4f89b002 2cd68f04
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge pull request #275 from amadeusproject/bugs_front 

added others menus #238
Showing 4 changed files with 7 additions and 99 deletions   Show diff stats
courses/templates/course/view.html
  Diff comments   View file @e432b15
... ... @@ -22,37 +22,7 @@
22 22 {% endblock %}
23 23  
24 24 {% block sidebar %}
25   - <div class="panel panel-primary">
26   - <div class="panel-heading">
27   - <h4>{% trans 'Menu' %}</h4>
28   - </div>
29   - <div class="panel-body">
30   - <ul class="nav nav-pills nav-stacked">
31   - <li><a href="{% url 'core:home' %}">{% trans "Home" %}</a></li>
32   - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
33   - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
34   - <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
35   - <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
36   - {# <li><a href="{% url 'course:participants' %}">{% trans 'Participants' %}</a></li> #}
37   - {% if user|has_role:'system_admin' %}
38   - <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
39   - {% endif %}
40   - {% if user|has_role:'system_admin' or user|has_role:'professor' %}
41   - <li>
42   - <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
43   - <div id="courses_list" class="collapse">
44   - <ul class="nav nav-pill nav-stacked accordion_list">
45   - {% for course in courses_list %}
46   - <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
47   - {% endfor %}
48   - </ul>
49   - </div>
50   - </li>
51   - {% endif %}
52   - </ul>
53   - </div>
54   - </div>
55   -
  25 +{{ block.super}}
56 26 <div class="panel panel-primary">
57 27 <div class="panel-heading">
58 28 <h5>{% trans 'Categories' %}</h5>
... ...
courses/templates/subject/index.html
  Diff comments   View file @e432b15
1   -{% extends 'base.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n permission_tags professor_access %}
4 4  
... ... @@ -22,35 +22,7 @@
22 22 </ol>
23 23 {% endblock %}
24 24 {% block sidebar %}
25   - <div class="panel panel-primary">
26   - <div class="panel-heading">
27   - <h4>{% trans 'Menu' %}</h4>
28   - </div>
29   - <div class="panel-body">
30   - <ul class="nav nav-pills nav-stacked">
31   - {% if user|has_role:'student' or not user.is_staff %}
32   - <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
33   - <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
34   - {% endif %}
35   - <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
36   - {% if user|has_role:'system_admin' %}
37   - <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
38   - {% endif %}
39   - {% if user|has_role:'system_admin' or user|has_role:'professor' %}
40   - <li>
41   - <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
42   - <div id="courses_list" class="collapse">
43   - <ul class="nav nav-pill nav-stacked accordion_list">
44   - {% for course in courses_list %}
45   - <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
46   - {% endfor %}
47   - </ul>
48   - </div>
49   - </li>
50   - {% endif %}
51   - </ul>
52   - </div>
53   - </div>
  25 +{{block.super}}
54 26  
55 27  
56 28 {% endblock %}
... ...
courses/templates/subject_category/index.html
  Diff comments   View file @e432b15
1   -{% extends 'base.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n permission_tags professor_access%}
4 4  
... ... @@ -12,27 +12,7 @@
12 12 {% endblock %}
13 13  
14 14 {% block sidebar %}
15   -
16   - <div class="panel panel-primary">
17   -
18   - <div class="panel-heading">
19   - <h3 class="panel-title">{{course}}</h3>
20   - </div>
21   -
22   - <div class="panel-body">
23   - {% for category in subject_categories %}
24   - <div class="row">
25   - <div class="col-md-12 col-sm-12">
26   - <a href="" class="btn btn-default text-left">{{subject}}</a>
27   - </div>
28   - </div>
29   - {% endfor %}
30   - </div>
31   - </div>
32   -
33   - {% if user|has_role:'system_admin' or user|has_role:'professor' %}
34   - <a href="" class="btn btn-primary btn-md btn-block">{% trans "Create Subject Category" %}</a>
35   - {% endif %}
  15 +{{block.super}}
36 16 {% endblock %}
37 17  
38 18 {% block content %}
... ...
courses/templates/topic/index.html
  Diff comments   View file @e432b15
1   -{% extends 'base.html' %}
  1 +{% extends 'home.html' %}
2 2  
3 3 {% load static i18n permission_tags professor_access %}
4 4  
... ... @@ -27,21 +27,7 @@
27 27 {% endblock %}
28 28  
29 29 {% block sidebar %}
30   -
31   - <div class="panel panel-primary">
32   - <div class="panel-heading">
33   - <h5>{% trans 'Menu' %}</h5>
34   - </div>
35   - <div class="panel-body">
36   - <ul class="nav nav-pills nav-stacked">
37   - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
38   - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
39   - </ul>
40   - </div>
41   - </div>
42   -
43   -
44   -
  30 +{{block.super}}
45 31 {% endblock %}
46 32  
47 33 {% block content %}
... ...