Download as
Browse Code »

Commit 214390d281106a701de56ab3c0ee7e80ec3f547c

Authored by fbormann
2 parents 22aaa17e 5cc2ad14
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 3 changed files with 5 additions and 10 deletions   Show diff stats
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @214390d
... ... @@ -70,22 +70,17 @@
70 70 <div class="dropdown">
71 71 <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
72 72 <ul class="dropdown-menu" aria-labelledby="dLabel">
73   - <li>Qualquer coisa</li>
  73 + <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
74 74 </ul>
75 75 </div>
76 76 </div>
77 77 <ul>
78 78 <li><i class="fa fa-file-text" aria-hidden="true"></i> <a href="#" data-toggle="modal" data-target="#ActivityModal">Activitie 1</a></li>
79   - </ul>
80   - </div>
81   - <div class="col-xs-4 col-md-4">
82   - <div class="panel-body">
83   - <button class="btn btn-primary btn-raised" onclick="createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans '+ Create Forum' %}</button>
84 79 <div class="foruns_list">
85 80 {% list_topic_foruns request topic %}
86 81 </div>
87   - </div>
88   - </div>
  82 + </ul>
  83 + </div>
89 84 {% list_topic_poll request topic %}
90 85 </div>
91 86 </div>
... ...
courses/templates/topic/list_topic_foruns.html
  Diff comments   View file @214390d
1 1 {% for forum in foruns %}
2   - <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}">{{ forum }}<br /></a>
  2 + <li><i class="fa fa-commenting" aria-hidden="true"></i> <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}"> {{ forum }}</a></li>
3 3 {% endfor %}
4 4 \ No newline at end of file
... ...
forum/static/js/forum.js
  Diff comments   View file @214390d
... ... @@ -83,7 +83,7 @@ function setForumCreateFormSubmit() {
83 83 success: function (data) {
84 84 data = data.split('-');
85 85  
86   - $('.foruns_list').append("<a id='forum_"+data[1]+"' href='"+data[0]+"'>"+data[2]+"<br /></a>");
  86 + $('.foruns_list').append("<li><i class='fa fa-commenting' aria-hidden='true'></i> <a id='forum_"+data[1]+"' href='"+data[0]+"'> "+data[2]+"</a></li>");
87 87  
88 88 $("#createForum").modal('hide');
89 89  
... ...