From 09fffd35ab43658bafbad9253ff535416dad22be Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Mon, 31 Oct 2016 23:45:52 -0300
Subject: [PATCH] modifiyng js editation #234

---
 core/static/css/base/amadeus.css                  |   1 -
 courses/static/js/topic_editation_presentation.js |  18 +++++++++++-------
 courses/templates/subject/form_view_student.html  |  24 +++---------------------
 courses/templates/subject/form_view_teacher.html  | 127 +++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------
 4 files changed, 61 insertions(+), 109 deletions(-)

diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index a0107d1..7d0ab7c 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -408,7 +408,6 @@ ul, li {
 .dropdown-menu .pull-right {
     right: 0;
   }
-  .editation{display: none}
 .moreAccordion{ padding-left: 0px; padding-right: 0px;}
 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
 .cards-content{ padding-left: 0px; padding-right: 0px; }
diff --git a/courses/static/js/topic_editation_presentation.js b/courses/static/js/topic_editation_presentation.js
index 7a6cdd4..171aa34 100644
--- a/courses/static/js/topic_editation_presentation.js
+++ b/courses/static/js/topic_editation_presentation.js
@@ -1,9 +1,13 @@
+$(document).ready(function(){
+    $(".editation").css('display','none');
+});
 function show_editation(id_topic){
-    $("#presentation_"+ id_topic).css('display','none');
-    $("#editation_"+ id_topic).css('display','block');
-}
+    $(".presentation_"+ id_topic).css('display','none');
+    $(".editation_"+ id_topic).css('display','block');
+};
+    function show_presentation(id_topic){
+    $(".editation_"+ id_topic).css('display','none');
+    $(".presentation_"+ id_topic).css('display','block');
+};
+
 
-function show_presentation(id_topic){
-    $("#editation_"+ id_topic).css('display','none');
-    $("#presentation_"+ id_topic).css('display','block');
-}
\ No newline at end of file
diff --git a/courses/templates/subject/form_view_student.html b/courses/templates/subject/form_view_student.html
index ea945c1..0451308 100644
--- a/courses/templates/subject/form_view_student.html
+++ b/courses/templates/subject/form_view_student.html
@@ -32,32 +32,14 @@
           </p>
 
         </div>
-        <div class="row">
-          <div class="col-xs-6 col-md-6">
-            <div class="resource_inline">
-              <h4>{% trans 'Material' %}</h4>
-            </div>
-            <ul>
-              {% list_topic_file request topic %}
-              {% list_topic_link request topic%}
-            </ul>
-          </div>
-          <div class="col-xs-4 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Activities' %}</h4>
-            </div>
-            <ul>
-              {% list_topic_poll request topic %}
-              {% list_topic_foruns request topic %}
-            </ul>
-          </div>
-        </div>
       </div>
     </div>
     </div>
+
     </div>
+
     {% professor_subject topic.subject user as professor_links %}
-    {% if professor_links %}
+    {% if professor_links%}
         {% include "links/create_link.html" %}
         {% include "links/delete_link.html" %}
     {% endif %}
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 89b9d86..f6c831e 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -41,106 +41,73 @@
   </div>
   <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
     <div class="panel-body">
-      <div class="presentation" id="presentation_{{topic.slug}}">
+      <div class="presentation_{{topic.slug}}">
         <p>
           <i>
             {{topic.description|linebreaks}}
           </i>
         </p>
-        <div class="row">
-          <div class="col-xs-6 col-md-6">
-            <div class="resource_inline">
-              <h4>{% trans 'Material' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <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>
-                </ul>
-              </div>
+      </div>
+      <div class="form-group editation editation_{{topic.slug}}">
+        <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
+        <input type="text" class="form-control" value="{{topic}}">
+      </div>
+      <div class="form-group editation editation_{{topic.slug}}">
+        <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
+        <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
+      </div>
+      <div class="row">
+        <div class="col-xs-6 col-md-6">
+          <div class="resource_inline">
+            <h4>{% trans 'Material' %}</h4>
+          </div>
+          <div class="resource_inline">
+            <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>
+              </ul>
             </div>
+          </div>
+          <div class="presentation_{{topic.slug}}">
             <ul>
               {% list_topic_file request topic %}
               {% list_topic_link request topic%}
             </ul>
           </div>
-          <div class="col-xs-4 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Activities' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <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:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
-                  <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
-                </ul>
-              </div>
-            </div>
-            <ul>
-              {% list_topic_poll request topic %}
-              {% list_topic_foruns request topic %}
-            </ul>
-          </div>
-        </div>
-      </div><!--EndPresentation-->
-      <div class="editation topic_{{ topic.id }}" id="editation_{{topic.slug}}">
-        <div class="form-group">
-          <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
-          <input type="text" class="form-control" value="{{topic}}">
-        </div>
-        <div class="form-group">
-          <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
-          <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
-        </div>
-        <div class="row">
-          <div class=" col-xs-6 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Material' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <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>
-                </ul>
-              </div>
-            </div>
+          <div class="editation editation_{{topic.slug}}">
             <ul>
               {% list_topic_file_edit request topic %}
               {% list_topic_link_edit request topic%}
             </ul>
           </div>
-          <div class="col-xs-4 col-md-offset-1 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Activities' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <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:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
-                  <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
-                </ul>
-              </div>
+        </div>
+        <div class="col-xs-4 col-md-4">
+          <div class="resource_inline">
+            <h4>{% trans 'Activities' %}</h4>
+          </div>
+          <div class="resource_inline">
+            <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:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
+                <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
+              </ul>
             </div>
-            <ul>
-              {% list_topic_poll request topic %}
-              {% list_topic_foruns request topic %}
-            </ul>
           </div>
+          <ul>
+            {% list_topic_poll request topic %}
+            {% list_topic_foruns request topic %}
+          </ul>
         </div>
-        <div class="form-group">
-          <div class="col-md-10">
-            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
-            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
-          </div>
+      </div>
+      <div class="form-group editation editation_{{topic.slug}}">
+        <div class="col-md-10">
+          <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
+          <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
         </div>
-      </div><!--EndEditation-->
-
+      </div>
     </div>
   </div>
 </div>
--
libgit2 0.21.2