Download as
Browse Code »

Commit 993d6cda12433b7e75d1acb8e63e1e178dd47063

Authored by juliotoscano
1 parent 330d3766
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modifying bug topic #234

Showing 4 changed files with 11 additions and 14 deletions   Show diff stats
courses/static/js/topic_editation_presentation.js
  Diff comments   View file @993d6cd
1 1 $(document).ready(function(){
2   - $(".editation").css('display','none');
  2 + $(".editation").hide();
3 3 });
4 4 function show_editation(id_topic){
5   - $(".presentation_"+ id_topic).css('display','none');
6   - $(".editation_"+ id_topic).css('display','block');
  5 + $(".presentation_"+ id_topic).hide();
  6 + $(".editation_"+ id_topic).show();
7 7 };
8 8  
9 9 function show_presentation(id_topic){
10   - $(".editation_"+ id_topic).css('display','none');
11   - $(".presentation_"+ id_topic).css('display','block');
  10 + $(".editation_"+ id_topic).hide();
  11 + $(".presentation_"+ id_topic).show();
12 12 };
13 13  
14 14  
... ...
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @993d6cd
... ... @@ -4,6 +4,7 @@
4 4 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
5 5 <script src="{% static 'js/file.js' %}"></script>
6 6 <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
  7 + <script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
7 8 <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
8 9 {% endblock %}
9 10 <div class="panel panel-default cards-detail">
... ... @@ -60,8 +61,8 @@
60 61 <div class="dropdown">
61 62 <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>
62 63 <ul class="dropdown-menu" aria-labelledby="dLabel">
63   - <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans 'Create a Link' %}</a></li>
64   - <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
  64 + <li><a href="javascript:modal.get('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans 'Create a Link' %}</a></li>
  65 + <li><a href="javascript:modal.get('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
65 66 </ul>
66 67 </div>
67 68 </div>
... ... @@ -244,10 +245,6 @@
244 245 </div>
245 246 <!--EndModal-->
246 247  
247   -<!-- MODAL LINK EDIT-->
248   -
249   -
250   -<!-- EndModal -->
251 248  
252 249  
253 250 <div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
... ...
courses/templates/topic/link_topic_list.html
  Diff comments   View file @993d6cd
1 1 {% load static i18n list_topic_foruns permission_tags %}
2 2 <div id="list-topic{{ topic.id }}-links">
3 3 {% for link in links%}
4   - <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
  4 + <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
5 5 {% endfor %}
6 6 </div>
7 7 <div class = 'row' id ="divModalLink">
... ...
courses/templates/topic/link_topic_list_edit.html
  Diff comments   View file @993d6cd
... ... @@ -2,8 +2,8 @@
2 2 <div id="list-topic{{ topic.id }}-links-edit">
3 3 {% for link in links%}
4 4  
5   - <li class="icon_edit_remove" id = "link_edit_icon_{{ link.slug }}"> <a href="javascript:get_modal_link('{% url 'course:links:update_link' link.slug %}', '#linksModalEdit', '#divModalLinkUpdate')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="javascript:get_modal_link('{% url 'course:links:delete_link' link.slug %}', '#linkDeleteModal', '#divModalLinkUpdate')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
6   - <li id="link_edit_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
  5 + <li class="icon_edit_remove" id = "link_edit_icon_{{ link.slug }}"> <a href="javascript:modal.get('{% url 'course:links:update_link' link.slug %}', '#linksModalEdit', '#divModalLinkUpdate')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a> <a href="javascript:modal.get('{% url 'course:links:delete_link' link.slug %}', '#linkDeleteModal', '#divModalLinkUpdate')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
  6 + <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i> <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
7 7  
8 8 {% endfor %}
9 9 </div>
... ...