Download as
Browse Code »

Commit d6574e852ece66d94bc28f6579a4c9048cc3df42

Authored by Julio Toscano
Committed by GitHub
2 parents 231b9309 1718b9c1
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge pull request #273 from amadeusproject/bugs_front 

added menus #238
Showing 4 changed files with 1 additions and 71 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @d6574e8
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
66 {% breadcrumb 'Home' 'app:index' %} 66 {% breadcrumb 'Home' 'app:index' %}
67 {% endblock %} 67 {% endblock %}
68 68
  69 +
69 {% block render_breadcrumbs %} 70 {% block render_breadcrumbs %}
70 {% render_breadcrumbs %} 71 {% render_breadcrumbs %}
71 {% endblock %} 72 {% endblock %}
app/templates/home_professor.html
  Diff comments   View file @d6574e8
@@ -15,18 +15,6 @@ @@ -15,18 +15,6 @@
15 {% endblock %} 15 {% endblock %}
16 16
17 {% block sidebar %} 17 {% block sidebar %}
18 - <div class="panel panel-primary">  
19 - <div class="panel-heading">  
20 - <h5>{% trans 'Menu' %}</h5>  
21 - </div>  
22 - <div class="panel-body">  
23 - <ul class="nav nav-pills nav-stacked">  
24 - <li><a href="javascript:void(0)">{% trans 'Pending tasks' %}</a></li>  
25 - <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>  
26 - <li><a href="{% url 'course:manage' %}">{% trans 'Manage Course' %}</a></li>  
27 - </ul>  
28 - </div>  
29 - </div>  
30 {% endblock %} 18 {% endblock %}
31 19
32 {% block content %} 20 {% block content %}
app/templates/home_student.html
  Diff comments   View file @d6574e8
@@ -16,19 +16,6 @@ @@ -16,19 +16,6 @@
16 16
17 17
18 {% block sidebar %} 18 {% block sidebar %}
19 - <div class="panel panel-primary">  
20 - <div class="panel-heading">  
21 - <h4>{% trans 'Menu' %}</h4>  
22 - </div>  
23 - <div class="panel-body">  
24 - <ul class="nav nav-pills nav-stacked">  
25 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
26 - <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>  
27 - <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>  
28 - <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>  
29 - </ul>  
30 - </div>  
31 - </div>  
32 {% endblock %} 19 {% endblock %}
33 20
34 {% block content %} 21 {% block content %}
core/templates/base.html
  Diff comments   View file @d6574e8
@@ -119,52 +119,6 @@ @@ -119,52 +119,6 @@
119 <div class="row"> 119 <div class="row">
120 <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2"> 120 <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
121 {% block sidebar %} 121 {% block sidebar %}
122 - <div class="panel panel-primary navigation">  
123 - <div class="panel-heading">  
124 - <h4>{% trans "Menu" %}</h4>  
125 - </div>  
126 - <div class="panel-body">  
127 - <ul class="nav nav-pills nav-stacked">  
128 - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>  
129 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
130 - {% if user|has_role:'student' or not user.is_staff %}  
131 - <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>  
132 - <li><a href="{% url 'core:all_courses' %}">{% trans 'All Courses' %}</a></li>  
133 - {% endif %}  
134 - {% if user|has_role:'system_admin' %}  
135 - <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>  
136 - {% endif %}  
137 - {% if user|has_role:'system_admin' or user|has_role:'professor' %}  
138 - <li>  
139 - <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>  
140 - <div id="courses_list" class="collapse">  
141 - <ul class="nav nav-pill nav-stacked accordion_list">  
142 - {% for course in courses_list %}  
143 - <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>  
144 - {% endfor %}  
145 - </ul>  
146 - </div>  
147 - </li>  
148 - {% endif %}  
149 - </ul>  
150 - </div>  
151 - </div>  
152 -  
153 - {% if user|has_role:'professor' or user|has_role:'system_admin' %}  
154 -  
155 - <div class="panel panel-primary navigation">  
156 - <div class="panel-heading">  
157 - <h3 class="panel-title">{% trans 'Category' %}</h3>  
158 - </div>  
159 - <div class="panel-body">  
160 - <ul class="nav nav-pills nav-stacked">  
161 - <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category'%}</a></li>  
162 - <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>  
163 - </ul>  
164 - </div>  
165 - </div>  
166 -  
167 - {% endif %}  
168 {% endblock %} 122 {% endblock %}
169 </div> 123 </div>
170 <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10"> 124 <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">