Commit d2b7ca4dad3ec7afe9fcdf28186d5b2ff991860c
1 parent
1718b9c1
Exists in
master
and in
5 other branches
addes more menus #238
Showing
4 changed files
with
9 additions
and
67 deletions
Show diff stats
courses/templates/category/create.html
| 1 | -{% extends 'base.html' %} | 1 | +{% extends 'home.html' %} |
| 2 | 2 | ||
| 3 | {% load static i18n permission_tags %} | 3 | {% load static i18n permission_tags %} |
| 4 | {% load widget_tweaks %} | 4 | {% load widget_tweaks %} |
| @@ -11,17 +11,7 @@ | @@ -11,17 +11,7 @@ | ||
| 11 | {% endblock %} | 11 | {% endblock %} |
| 12 | 12 | ||
| 13 | {% block sidebar %} | 13 | {% block sidebar %} |
| 14 | - <div class="panel panel-primary navigation"> | ||
| 15 | - <div class="panel-heading"> | ||
| 16 | - <h5>{% trans 'Menu' %}</h5> | ||
| 17 | - </div> | ||
| 18 | - <div class="panel-body"> | ||
| 19 | - <ul class="nav nav-pills nav-stacked"> | ||
| 20 | - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li> | ||
| 21 | - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li> | ||
| 22 | - </ul> | ||
| 23 | - </div> | ||
| 24 | - </div> | 14 | +{{block.super}} |
| 25 | 15 | ||
| 26 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} | 16 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} |
| 27 | 17 |
courses/templates/category/index.html
| 1 | -{% extends 'base.html' %} | 1 | +{% extends 'home.html' %} |
| 2 | 2 | ||
| 3 | {% load static i18n %} | 3 | {% load static i18n %} |
| 4 | {% load static i18n permission_tags %} | 4 | {% load static i18n permission_tags %} |
| @@ -12,17 +12,7 @@ | @@ -12,17 +12,7 @@ | ||
| 12 | {% endblock %} | 12 | {% endblock %} |
| 13 | 13 | ||
| 14 | {% block sidebar %} | 14 | {% block sidebar %} |
| 15 | - <div class="panel panel-primary navigation"> | ||
| 16 | - <div class="panel-heading"> | ||
| 17 | - <h5>{% trans 'Menu' %}</h5> | ||
| 18 | - </div> | ||
| 19 | - <div class="panel-body"> | ||
| 20 | - <ul class="nav nav-pills nav-stacked"> | ||
| 21 | - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li> | ||
| 22 | - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li> | ||
| 23 | - </ul> | ||
| 24 | - </div> | ||
| 25 | - </div> | 15 | +{{block.super}} |
| 26 | 16 | ||
| 27 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} | 17 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} |
| 28 | 18 | ||
| @@ -83,7 +73,7 @@ | @@ -83,7 +73,7 @@ | ||
| 83 | </ul> | 73 | </ul> |
| 84 | </div> | 74 | </div> |
| 85 | </div> | 75 | </div> |
| 86 | - | 76 | + |
| 87 | </div> | 77 | </div> |
| 88 | </div> | 78 | </div> |
| 89 | </div> | 79 | </div> |
courses/templates/category/update.html
| 1 | -{% extends 'base.html' %} | 1 | +{% extends 'Home.html' %} |
| 2 | 2 | ||
| 3 | {% load static i18n %} | 3 | {% load static i18n %} |
| 4 | {% load static i18n permission_tags %} | 4 | {% load static i18n permission_tags %} |
| @@ -12,17 +12,7 @@ | @@ -12,17 +12,7 @@ | ||
| 12 | {% endblock %} | 12 | {% endblock %} |
| 13 | 13 | ||
| 14 | {% block sidebar %} | 14 | {% block sidebar %} |
| 15 | - <div class="panel panel-primary navigation"> | ||
| 16 | - <div class="panel-heading"> | ||
| 17 | - <h5>{% trans 'Menu' %}</h5> | ||
| 18 | - </div> | ||
| 19 | - <div class="panel-body"> | ||
| 20 | - <ul class="nav nav-pills nav-stacked"> | ||
| 21 | - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li> | ||
| 22 | - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li> | ||
| 23 | - </ul> | ||
| 24 | - </div> | ||
| 25 | - </div> | 15 | +{{block.super}} |
| 26 | 16 | ||
| 27 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} | 17 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} |
| 28 | 18 |
courses/templates/course/index.html
| 1 | -{% extends 'home_professor.html' %} | 1 | +{% extends 'home.html' %} |
| 2 | 2 | ||
| 3 | {% load static i18n permission_tags %} | 3 | {% load static i18n permission_tags %} |
| 4 | {% load django_bootstrap_breadcrumbs %} | 4 | {% load django_bootstrap_breadcrumbs %} |
| @@ -11,35 +11,7 @@ | @@ -11,35 +11,7 @@ | ||
| 11 | {% endblock %} | 11 | {% endblock %} |
| 12 | 12 | ||
| 13 | {% block sidebar %} | 13 | {% block sidebar %} |
| 14 | - <div class="panel panel-primary"> | ||
| 15 | - <div class="panel-heading"> | ||
| 16 | - <h4>{% trans 'Menu' %}</h4> | ||
| 17 | - </div> | ||
| 18 | - <div class="panel-body"> | ||
| 19 | - <ul class="nav nav-pills nav-stacked"> | ||
| 20 | - {% if user|has_role:'student' or not user.is_staff %} | ||
| 21 | - <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li> | ||
| 22 | - <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li> | ||
| 23 | - {% endif %} | ||
| 24 | - <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li> | ||
| 25 | - {% if user|has_role:'system_admin' %} | ||
| 26 | - <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> | ||
| 27 | - {% endif %} | ||
| 28 | - {% if user|has_role:'system_admin' or user|has_role:'professor' %} | ||
| 29 | - <li> | ||
| 30 | - <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a> | ||
| 31 | - <div id="courses_list" class="collapse"> | ||
| 32 | - <ul class="nav nav-pill nav-stacked accordion_list"> | ||
| 33 | - {% for course in courses_list %} | ||
| 34 | - <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li> | ||
| 35 | - {% endfor %} | ||
| 36 | - </ul> | ||
| 37 | - </div> | ||
| 38 | - </li> | ||
| 39 | - {% endif %} | ||
| 40 | - </ul> | ||
| 41 | - </div> | ||
| 42 | - </div> | 14 | +{{block.super}} |
| 43 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} | 15 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} |
| 44 | <div class="panel panel-primary"> | 16 | <div class="panel panel-primary"> |
| 45 | <div class="panel-heading"> | 17 | <div class="panel-heading"> |