Download as
Browse Code »

Commit 33bdc1d6ef667da8c047f257e878d3024e58e36a

Authored by Julio Toscano
Committed by GitHub
2 parents 8ded714e 09fffd35
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge pull request #240 from amadeusproject/js_topic 

modifiyng js editation #234
Showing 4 changed files with 61 additions and 109 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @33bdc1d
... ... @@ -408,7 +408,6 @@ ul, li {
408 408 .dropdown-menu .pull-right {
409 409 right: 0;
410 410 }
411   - .editation{display: none}
412 411 .moreAccordion{ padding-left: 0px; padding-right: 0px;}
413 412 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
414 413 .cards-content{ padding-left: 0px; padding-right: 0px; }
... ...
courses/static/js/topic_editation_presentation.js
  Diff comments   View file @33bdc1d
  1 +$(document).ready(function(){
  2 + $(".editation").css('display','none');
  3 +});
1 4 function show_editation(id_topic){
2   - $("#presentation_"+ id_topic).css('display','none');
3   - $("#editation_"+ id_topic).css('display','block');
4   -}
  5 + $(".presentation_"+ id_topic).css('display','none');
  6 + $(".editation_"+ id_topic).css('display','block');
  7 +};
  8 + function show_presentation(id_topic){
  9 + $(".editation_"+ id_topic).css('display','none');
  10 + $(".presentation_"+ id_topic).css('display','block');
  11 +};
  12 +
5 13  
6   -function show_presentation(id_topic){
7   - $("#editation_"+ id_topic).css('display','none');
8   - $("#presentation_"+ id_topic).css('display','block');
9   -}
10 14 \ No newline at end of file
... ...
courses/templates/subject/form_view_student.html
  Diff comments   View file @33bdc1d
... ... @@ -32,32 +32,14 @@
32 32 </p>
33 33  
34 34 </div>
35   - <div class="row">
36   - <div class="col-xs-6 col-md-6">
37   - <div class="resource_inline">
38   - <h4>{% trans 'Material' %}</h4>
39   - </div>
40   - <ul>
41   - {% list_topic_file request topic %}
42   - {% list_topic_link request topic%}
43   - </ul>
44   - </div>
45   - <div class="col-xs-4 col-md-4">
46   - <div class="resource_inline">
47   - <h4>{% trans 'Activities' %}</h4>
48   - </div>
49   - <ul>
50   - {% list_topic_poll request topic %}
51   - {% list_topic_foruns request topic %}
52   - </ul>
53   - </div>
54   - </div>
55 35 </div>
56 36 </div>
57 37 </div>
  38 +
58 39 </div>
  40 +
59 41 {% professor_subject topic.subject user as professor_links %}
60   - {% if professor_links %}
  42 + {% if professor_links%}
61 43 {% include "links/create_link.html" %}
62 44 {% include "links/delete_link.html" %}
63 45 {% endif %}
... ...
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @33bdc1d
... ... @@ -41,106 +41,73 @@
41 41 </div>
42 42 <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">
43 43 <div class="panel-body">
44   - <div class="presentation" id="presentation_{{topic.slug}}">
  44 + <div class="presentation_{{topic.slug}}">
45 45 <p>
46 46 <i>
47 47 {{topic.description|linebreaks}}
48 48 </i>
49 49 </p>
50   - <div class="row">
51   - <div class="col-xs-6 col-md-6">
52   - <div class="resource_inline">
53   - <h4>{% trans 'Material' %}</h4>
54   - </div>
55   - <div class="resource_inline">
56   - <div class="dropdown">
57   - <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>
58   - <ul class="dropdown-menu" aria-labelledby="dLabel">
59   - <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans 'Create a Link' %}</a></li>
60   - <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
61   - </ul>
62   - </div>
  50 + </div>
  51 + <div class="form-group editation editation_{{topic.slug}}">
  52 + <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
  53 + <input type="text" class="form-control" value="{{topic}}">
  54 + </div>
  55 + <div class="form-group editation editation_{{topic.slug}}">
  56 + <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
  57 + <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
  58 + </div>
  59 + <div class="row">
  60 + <div class="col-xs-6 col-md-6">
  61 + <div class="resource_inline">
  62 + <h4>{% trans 'Material' %}</h4>
  63 + </div>
  64 + <div class="resource_inline">
  65 + <div class="dropdown">
  66 + <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>
  67 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  68 + <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans 'Create a Link' %}</a></li>
  69 + <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
  70 + </ul>
63 71 </div>
  72 + </div>
  73 + <div class="presentation_{{topic.slug}}">
64 74 <ul>
65 75 {% list_topic_file request topic %}
66 76 {% list_topic_link request topic%}
67 77 </ul>
68 78 </div>
69   - <div class="col-xs-4 col-md-4">
70   - <div class="resource_inline">
71   - <h4>{% trans 'Activities' %}</h4>
72   - </div>
73   - <div class="resource_inline">
74   - <div class="dropdown">
75   - <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>
76   - <ul class="dropdown-menu" aria-labelledby="dLabel">
77   - <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
78   - <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
79   - </ul>
80   - </div>
81   - </div>
82   - <ul>
83   - {% list_topic_poll request topic %}
84   - {% list_topic_foruns request topic %}
85   - </ul>
86   - </div>
87   - </div>
88   - </div><!--EndPresentation-->
89   - <div class="editation topic_{{ topic.id }}" id="editation_{{topic.slug}}">
90   - <div class="form-group">
91   - <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
92   - <input type="text" class="form-control" value="{{topic}}">
93   - </div>
94   - <div class="form-group">
95   - <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
96   - <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
97   - </div>
98   - <div class="row">
99   - <div class=" col-xs-6 col-md-4">
100   - <div class="resource_inline">
101   - <h4>{% trans 'Material' %}</h4>
102   - </div>
103   - <div class="resource_inline">
104   - <div class="dropdown">
105   - <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>
106   - <ul class="dropdown-menu" aria-labelledby="dLabel">
107   - <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink') ">{% trans 'Create a Link' %}</a></li>
108   - <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
109   - </ul>
110   - </div>
111   - </div>
  79 + <div class="editation editation_{{topic.slug}}">
112 80 <ul>
113 81 {% list_topic_file_edit request topic %}
114 82 {% list_topic_link_edit request topic%}
115 83 </ul>
116 84 </div>
117   - <div class="col-xs-4 col-md-offset-1 col-md-4">
118   - <div class="resource_inline">
119   - <h4>{% trans 'Activities' %}</h4>
120   - </div>
121   - <div class="resource_inline">
122   - <div class="dropdown">
123   - <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>
124   - <ul class="dropdown-menu" aria-labelledby="dLabel">
125   - <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
126   - <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
127   - </ul>
128   - </div>
  85 + </div>
  86 + <div class="col-xs-4 col-md-4">
  87 + <div class="resource_inline">
  88 + <h4>{% trans 'Activities' %}</h4>
  89 + </div>
  90 + <div class="resource_inline">
  91 + <div class="dropdown">
  92 + <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>
  93 + <ul class="dropdown-menu" aria-labelledby="dLabel">
  94 + <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
  95 + <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
  96 + </ul>
129 97 </div>
130   - <ul>
131   - {% list_topic_poll request topic %}
132   - {% list_topic_foruns request topic %}
133   - </ul>
134 98 </div>
  99 + <ul>
  100 + {% list_topic_poll request topic %}
  101 + {% list_topic_foruns request topic %}
  102 + </ul>
135 103 </div>
136   - <div class="form-group">
137   - <div class="col-md-10">
138   - <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
139   - <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
140   - </div>
  104 + </div>
  105 + <div class="form-group editation editation_{{topic.slug}}">
  106 + <div class="col-md-10">
  107 + <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
  108 + <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
141 109 </div>
142   - </div><!--EndEditation-->
143   -
  110 + </div>
144 111 </div>
145 112 </div>
146 113 </div>
... ...