Download as
Browse Code »

Commit c79e0e4eb6f04ded31c7417081d805fb3b4409f9

Authored by Gustavo Bernardo
2 parents d69d2302 7b2633ae
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Showing 4 changed files with 2 additions and 10 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @c79e0e4
@@ -77,13 +77,10 @@ @@ -77,13 +77,10 @@
77 </div> 77 </div>
78 <div class="panel-body"> 78 <div class="panel-body">
79 <ul class="nav nav-pills nav-stacked"> 79 <ul class="nav nav-pills nav-stacked">
80 - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>  
81 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
82 {% if user|has_role:'student' or not user.is_staff %} 80 {% if user|has_role:'student' or not user.is_staff %}
83 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li> 81 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
84 <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li> 82 <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
85 {% endif %} 83 {% endif %}
86 - <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>  
87 {% if user|has_role:'system_admin' %} 84 {% if user|has_role:'system_admin' %}
88 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> 85 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
89 <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li> 86 <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
core/templates/base.html
  Diff comments   View file @c79e0e4
@@ -127,7 +127,6 @@ @@ -127,7 +127,6 @@
127 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li> 127 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
128 <li><a href="{% url 'core:all_courses' %}">{% trans 'All Courses' %}</a></li> 128 <li><a href="{% url 'core:all_courses' %}">{% trans 'All Courses' %}</a></li>
129 {% endif %} 129 {% endif %}
130 - <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>  
131 {% if user|has_role:'system_admin' %} 130 {% if user|has_role:'system_admin' %}
132 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> 131 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
133 {% endif %} 132 {% endif %}
courses/templates/course/index.html
  Diff comments   View file @c79e0e4
@@ -17,8 +17,6 @@ @@ -17,8 +17,6 @@
17 </div> 17 </div>
18 <div class="panel-body"> 18 <div class="panel-body">
19 <ul class="nav nav-pills nav-stacked"> 19 <ul class="nav nav-pills nav-stacked">
20 - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>  
21 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
22 {% if user|has_role:'student' or not user.is_staff %} 20 {% if user|has_role:'student' or not user.is_staff %}
23 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li> 21 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
24 <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li> 22 <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
@@ -130,8 +128,8 @@ @@ -130,8 +128,8 @@
130 </div> 128 </div>
131 </div> 129 </div>
132 </div> 130 </div>
133 -  
134 - 131 +
  132 +
135 {% endfor %} 133 {% endfor %}
136 </div> 134 </div>
137 {% if user|has_role:'professor' or user|has_role:'system_admin' %} 135 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
courses/templates/subject/index.html
  Diff comments   View file @c79e0e4
@@ -28,8 +28,6 @@ @@ -28,8 +28,6 @@
28 </div> 28 </div>
29 <div class="panel-body"> 29 <div class="panel-body">
30 <ul class="nav nav-pills nav-stacked"> 30 <ul class="nav nav-pills nav-stacked">
31 - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>  
32 - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>  
33 {% if user|has_role:'student' or not user.is_staff %} 31 {% if user|has_role:'student' or not user.is_staff %}
34 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li> 32 <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
35 <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li> 33 <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>