From 993d6cda12433b7e75d1acb8e63e1e178dd47063 Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Fri, 4 Nov 2016 10:55:53 -0300
Subject: [PATCH] modifying bug topic #234

---
 courses/static/js/topic_editation_presentation.js | 10 +++++-----
 courses/templates/subject/form_view_teacher.html  |  9 +++------
 courses/templates/topic/link_topic_list.html      |  2 +-
 courses/templates/topic/link_topic_list_edit.html |  4 ++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/courses/static/js/topic_editation_presentation.js b/courses/static/js/topic_editation_presentation.js
index 73bf889..f13eed0 100644
--- a/courses/static/js/topic_editation_presentation.js
+++ b/courses/static/js/topic_editation_presentation.js
@@ -1,14 +1,14 @@
 $(document).ready(function(){
-    $(".editation").css('display','none');
+    $(".editation").hide();
 });
 function show_editation(id_topic){
-    $(".presentation_"+ id_topic).css('display','none');
-    $(".editation_"+ id_topic).css('display','block');
+    $(".presentation_"+ id_topic).hide();
+    $(".editation_"+ id_topic).show();
 };
 
 function show_presentation(id_topic){
-    $(".editation_"+ id_topic).css('display','none');
-    $(".presentation_"+ id_topic).css('display','block');
+    $(".editation_"+ id_topic).hide();
+    $(".presentation_"+ id_topic).show();
 };
 
 
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 73021df..d563fef 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -4,6 +4,7 @@
    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
    <script src="{% static 'js/file.js' %}"></script>
    <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
+   <script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
    <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
 {% endblock %}
 <div class="panel panel-default cards-detail">
@@ -60,8 +61,8 @@
             <div class="dropdown">
               <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>
               <ul class="dropdown-menu" aria-labelledby="dLabel">
-                <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
-                <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
+                <li><a href="javascript:modal.get('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
+                <li><a href="javascript:modal.get('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
               </ul>
             </div>
           </div>
@@ -244,10 +245,6 @@
 </div>
 <!--EndModal-->
 
-<!-- MODAL LINK EDIT-->
-
-
-<!-- EndModal -->
 
 
 <div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
diff --git a/courses/templates/topic/link_topic_list.html b/courses/templates/topic/link_topic_list.html
index e25dfe7..04f2fc9 100644
--- a/courses/templates/topic/link_topic_list.html
+++ b/courses/templates/topic/link_topic_list.html
@@ -1,7 +1,7 @@
 {% load static i18n list_topic_foruns permission_tags %}
 <div id="list-topic{{ topic.id }}-links">
 {% for link in links%}
-        <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>
+        <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>
 {% endfor %}
 </div>
 <div class = 'row' id ="divModalLink">
diff --git a/courses/templates/topic/link_topic_list_edit.html b/courses/templates/topic/link_topic_list_edit.html
index b7c7b99..dc05444 100644
--- a/courses/templates/topic/link_topic_list_edit.html
+++ b/courses/templates/topic/link_topic_list_edit.html
@@ -2,8 +2,8 @@
 <div id="list-topic{{ topic.id }}-links-edit">
 {% for link in links%}
 
-        <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>
-        <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>
+        <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>
+        <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>
 
 {% endfor %}
 </div>
--
libgit2 0.21.2