Commit 4ae3901205ea4f640b6708bf0cc0cb06820bde11
Exists in
master
and in
2 other branches
Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
students_group/templates/groups/_form.html
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | <div class="panel-heading"> |
| 10 | 10 | <div class="row"> |
| 11 | 11 | <div class="col-md-12"> |
| 12 | - <a data-parent="#professors_accordion" data-toggle="collapse" href="#participants"> | |
| 12 | + <a data-parent="#professors_accordion" data-toggle="collapse" href="#group_participants"> | |
| 13 | 13 | <h4 class="panel-title"> |
| 14 | 14 | <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label> |
| 15 | 15 | </h4> |
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | </div> |
| 18 | 18 | </div> |
| 19 | 19 | </div> |
| 20 | - <div id="participants" class="panel-collapse collapse"> | |
| 20 | + <div id="group_participants" class="panel-collapse collapse"> | |
| 21 | 21 | <p><em>{% trans 'Attribute students to group' %}:</em></p> |
| 22 | 22 | {% render_field field class='form-control' %} |
| 23 | 23 | </div> | ... | ... |
topics/templates/topics/list.html
| ... | ... | @@ -54,12 +54,12 @@ |
| 54 | 54 | <ul class="dropdown-menu"> |
| 55 | 55 | <li><a href="{% url 'pdf_files:create' topic.slug %}"><i class="fa fa-file-pdf-o"></i> {% trans "PDF File" %}</a></li> |
| 56 | 56 | <li><a href="{% url 'youtube:create' topic.slug %}"><i class="fa fa-video-camera"></i> {% trans 'YouTube Video' %}</a></li> |
| 57 | - <li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li> | |
| 57 | + <!-- <li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li> --> | |
| 58 | 58 | <li><a href="{% url 'file_links:create' topic.slug %}"><i class="fa fa-file-archive-o"></i> {% trans 'File Link' %}</a></li> |
| 59 | 59 | <li><a href="{% url 'links:create' topic.slug %}" > <i class="fa fa-globe"></i> {% trans "Link to Website" %}</a> |
| 60 | 60 | <li><a href="{% url 'goals:create' topic.slug %}"><i class="fa fa-line-chart"></i> {% trans 'Topic Goals' %}</a></li> |
| 61 | 61 | <li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li> |
| 62 | - <li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li> | |
| 62 | + <!-- <li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li> --> | |
| 63 | 63 | <li><a href="{% url 'webconferences:create' topic.slug %}"><i class="fa fa-desktop"></i> {% trans 'Web Conference' %}</a></li> |
| 64 | 64 | |
| 65 | 65 | </ul> | ... | ... |