Download as
Browse Code »

Commit e3afc52bf9b56d590d9b22166944bf7f51bd3eb6

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

modifying home course detail #205

Showing 6 changed files with 103 additions and 124 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @e3afc52
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 margin: 10% 10% 5% 5%; 30 margin: 10% 10% 5% 5%;
31 } 31 }
32 .breadcrumb{ 32 .breadcrumb{
33 - margin-bottom: 5px; 33 + margin-bottom: 25px;
34 } 34 }
35 .courseHome{ 35 .courseHome{
36 text-align: center; 36 text-align: center;
@@ -398,14 +398,18 @@ ul, li { @@ -398,14 +398,18 @@ ul, li {
398 /* Icon Topic */ 398 /* Icon Topic */
399 .divMoreActions {text-align: right; height: 39px; float: right;} 399 .divMoreActions {text-align: right; height: 39px; float: right;}
400 .divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;} 400 .divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}
401 -.headingOne {padding-top: 0px; padding-bottom: 50px;}  
402 -.headingTwo {padding-top: 0px; padding-bottom: 50px;}  
403 -.course{padding-top: 0px; padding-bottom: 0px; cursor:move; }  
404 .titleTopic {padding-top: 18px; padding-left: 0px;} 401 .titleTopic {padding-top: 18px; padding-left: 0px;}
405 -.titleTopic-detail {padding-top: 8px;} 402 +.titleTopic-detail {padding-top: 8px; color: white;}
406 .titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;} 403 .titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;}
407 .dropdown-menu .pull-right { 404 .dropdown-menu .pull-right {
408 right: 0; 405 right: 0;
409 } 406 }
410 .moreAccordion{ padding-left: 0px; padding-right: 0px;} 407 .moreAccordion{ padding-left: 0px; padding-right: 0px;}
411 -.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}  
412 \ No newline at end of file 408 \ No newline at end of file
  409 +.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
  410 +.cards-content{ padding-left: 0px; padding-right: 0px; }
  411 +.cards-detail{margin-left: 4%;}
  412 +.cards-detail .panel .panel-heading{background-color:#81D4FA;}
  413 +.cards-detail .panel .panel-heading h4{color:black;}
  414 +.subject{ padding-top: 0px; padding-bottom: 0px; }
  415 +.course{padding-top: 0px; padding-bottom: 0px;}
  416 +.course-detail{padding-top: 10px; padding-bottom: 10px;}
413 \ No newline at end of file 417 \ No newline at end of file
courses/static/js/course.js
  Diff comments   View file @e3afc52
@@ -77,13 +77,4 @@ function replicate_course(url, course) { @@ -77,13 +77,4 @@ function replicate_course(url, course) {
77 $(".course_replicate_form").html(data); 77 $(".course_replicate_form").html(data);
78 } 78 }
79 }); 79 });
80 -}  
81 -$(".caret-square").on('click', function(){  
82 - if( $(this).attr('title') == 'less'){  
83 - $(this).attr('title','more');  
84 - jQuery(this).html("<i class='fa fa-caret-square-o-up fa-2x' aria-hidden='true'></i>");  
85 - }else{  
86 - $(this).attr('title','less');  
87 - jQuery(this).html("<i class='fa fa-caret-square-o-down fa-2x' aria-hidden='true'></i>");  
88 - }  
89 - });  
90 \ No newline at end of file 80 \ No newline at end of file
  81 +}
91 \ No newline at end of file 82 \ No newline at end of file
courses/templates/course/course_card.html
  Diff comments   View file @e3afc52
1 {% load static i18n permission_tags %} 1 {% load static i18n permission_tags %}
2 {% load django_bootstrap_breadcrumbs %} 2 {% load django_bootstrap_breadcrumbs %}
3 -  
4 -<div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion-{{course.slug}}" role="tablist" aria-multiselectable="false">  
5 - <div class="group">  
6 - <div class="panel panel-info">  
7 - <div class="panel-heading course" role="tab" >  
8 - <div class="row">  
9 - <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}">  
10 - <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>  
11 - </div>  
12 - <div class="col-xs-9 col-md-4 titleTopic">  
13 - <a role="button" href="{% url 'course:view' course.slug %}">  
14 - <h4>{{course.name}}</h4>  
15 - </a>  
16 - </div>  
17 - {% if user|has_role:'professor' or user|has_role:'system_admin' %}  
18 - <div class="col-xs-4 col-md-6 divMoreActions" >  
19 - <div class="btn-group">  
20 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
21 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
22 - </button>  
23 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
24 - <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>  
25 - <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>  
26 - </ul>  
27 - </div>  
28 - </div>  
29 - {% endif %}  
30 - </div>  
31 - </div>  
32 - <div class="panel-collapse collapseOne-{{course.slug}} collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">  
33 - <div class="panel-body">  
34 - <p><b>Course Name: </b>{{course.name}}</p>  
35 - <p><b>Coordinator: </b>{{course.professors.all.0}}</p>  
36 - <p>  
37 - <b>Description:</b>  
38 - <i>  
39 - {{course.content}}  
40 - </i>  
41 - </p>  
42 - </div>  
43 - </div>  
44 - </div>  
45 - </div> 3 +<div class="group">
  4 + <div class="panel panel-info">
  5 + <div class="panel-heading course">
  6 + <div class="row">
  7 + <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}">
  8 + <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
  9 + </div>
  10 + <div class="col-xs-9 col-md-4 titleTopic">
  11 + <a role="button" href="{% url 'course:view' course.slug %}">
  12 + <h4>{{course.name}}</h4>
  13 + </a>
  14 + </div>
  15 + {% if user|has_role:'professor' or user|has_role:'system_admin' %}
  16 + <div class="col-xs-4 col-md-6 divMoreActions" >
  17 + <div class="btn-group">
  18 + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  19 + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
  20 + </button>
  21 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  22 + <li><a href="{% url 'course:replicate_course' course.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  23 + <li><a href="javascript:delete_course('{% url 'course:delete' course.slug %}', '{{ course.slug }}', '{% trans "Are you sure you want to delete this course?" %}', '{% url 'course:manage' %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
  24 + </ul>
  25 + </div>
  26 + </div>
  27 + {% endif %}
  28 + </div>
  29 + </div>
  30 + <div class="panel-collapse collapseOne-{{course.slug}} collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
  31 + <div class="panel-body">
  32 + <p><b>Course Name: </b>{{course.name}}</p>
  33 + <p><b>Coordinator: </b>{{course.professors.all.0}}</p>
  34 + <p>
  35 + <b>Description:</b>
  36 + <i>
  37 + {{course.content}}
  38 + </i>
  39 + </p>
  40 + </div>
  41 + </div>
  42 + </div>
46 </div> 43 </div>
47 44
48 <div class="modal fade" id="replicateCourse" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> 45 <div class="modal fade" id="replicateCourse" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
courses/templates/course/index.html
  Diff comments   View file @e3afc52
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 {% endfor %} 70 {% endfor %}
71 {% endif %} 71 {% endif %}
72 72
73 -<div class="col-md-12"> 73 +<div class="col-md-12 cards-content">
74 <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8"> 74 <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
75 <div class="input-group"> 75 <div class="input-group">
76 <div class="form-group is-empty"> 76 <div class="form-group is-empty">
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 86
87 87
88 </fieldset> 88 </fieldset>
89 - <div class="col-md-12"> 89 + <div class="col-md-12 cards-content">
90 {% if courses|length > 0 %} 90 {% if courses|length > 0 %}
91 {% if request.GET.category == 'all' or none or request.GET.category == '' %} 91 {% if request.GET.category == 'all' or none or request.GET.category == '' %}
92 {% for course in list_courses %} 92 {% for course in list_courses %}
@@ -104,27 +104,6 @@ @@ -104,27 +104,6 @@
104 {% trans 'No courses found' %} 104 {% trans 'No courses found' %}
105 {% endif %} 105 {% endif %}
106 </div> 106 </div>
107 - <div class="col-md-12">  
108 - <nav aria-label="Page navigation">  
109 - <ul class="pagination">  
110 - {% if page_obj.has_previous %}  
111 - <li>  
112 - <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>  
113 - </li>  
114 - {% endif %}  
115 - {% for page_number in paginator.page_range %}  
116 - <li{% if page_obj.number == page_number %} class="active"{% endif %}>  
117 - <a href="?page={{ page_number }}">{{ page_number }}</a>  
118 - </li>  
119 - {% endfor %}  
120 - {% if page_obj.has_next %}  
121 - <li>  
122 - <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>  
123 - </li>  
124 - {% endif %}  
125 - </ul>  
126 - </nav>  
127 - </div>  
128 107
129 <script type="text/javascript" src="{% static 'js/course.js' %}"></script> 108 <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
130 {% endblock %} 109 {% endblock %}
courses/templates/course/view.html
  Diff comments   View file @e3afc52
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 {% endblock %} 19 {% endblock %}
20 20
21 {% block sidebar %} 21 {% block sidebar %}
22 - <div class="panel panel-primary navigation"> 22 + <div class="panel panel-primary">
23 <div class="panel-heading"> 23 <div class="panel-heading">
24 <h5>{% trans 'Menu' %}</h5> 24 <h5>{% trans 'Menu' %}</h5>
25 </div> 25 </div>
@@ -38,15 +38,15 @@ @@ -38,15 +38,15 @@
38 38
39 {% block content %} 39 {% block content %}
40 40
41 - <div class="col-md-12"> 41 + <div class="col-md-12 cards-content">
42 <div class="panel panel-info"> 42 <div class="panel panel-info">
43 - <div class="panel-heading headingOne"> 43 + <div class="panel-heading course-detail">
44 <div class="row"> 44 <div class="row">
45 - <div class="col-xs-8 col-md-10 titleTopic">  
46 - <h4>{{course}}</h4> 45 + <div class="col-xs-8 col-md-4 .titleTopic-detail">
  46 + <h4>{{course.name}}</h4>
47 </div> 47 </div>
48 {% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %} 48 {% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %}
49 - <div class="col-xs-4 col-md-2" id="divMoreActions"> 49 + <div class="col-xs-4 col-md-8" id="divMoreActions">
50 <div class="btn-group"> 50 <div class="btn-group">
51 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 51 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
52 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 52 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 74
75 </div> 75 </div>
76 </div> 76 </div>
77 - 77 +
78 <!-- MODAL CREATE SUBJECT --> 78 <!-- MODAL CREATE SUBJECT -->
79 <div class="modal" tabindex="-1" role="dialog " id="createSubject"> 79 <div class="modal" tabindex="-1" role="dialog " id="createSubject">
80 <div class="modal-dialog"> 80 <div class="modal-dialog">
@@ -121,19 +121,22 @@ @@ -121,19 +121,22 @@
121 </div> 121 </div>
122 </div> 122 </div>
123 </div> 123 </div>
124 -<div> 124 +<div class="cards-detail">
125 {% if request.GET.category == 'all' or none or request.GET.category == '' %} 125 {% if request.GET.category == 'all' or none or request.GET.category == '' %}
126 {% for subject in subjects %} 126 {% for subject in subjects %}
127 <div class="panel panel-info panel_{{ subject.id }}"> 127 <div class="panel panel-info panel_{{ subject.id }}">
128 - <div class="panel-heading headingTwo ui-sortable-handle" role="tab"> 128 + <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle">
129 <div class="row"> 129 <div class="row">
130 - <div class="col-xs-9 col-md-10 titleTopic">  
131 - <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">  
132 - <h4 style="color:white">{{subject.name}}</h4> 130 + <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
  131 + <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
  132 + </div>
  133 + <div class="col-xs-9 col-md-4 titleTopic">
  134 + <a role="button" href="{% url 'course:view_subject' subject.slug %}">
  135 + <h4>{{subject.name}}</h4>
133 </a> 136 </a>
134 </div> 137 </div>
135 {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %} 138 {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
136 - <div class="col-xs-3 col-md-2" id="divMoreActions"> 139 + <div class="col-xs-3 col-md-6" id="divMoreActions">
137 <div class="btn-group"> 140 <div class="btn-group">
138 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 141 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
139 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 142 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -153,40 +156,44 @@ @@ -153,40 +156,44 @@
153 {% endif %} 156 {% endif %}
154 </div> 157 </div>
155 </div> 158 </div>
156 - <div class="panel-body">  
157 - <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}  
158 - {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>  
159 - <p>  
160 - <b>{% trans "Description" %}: </b>  
161 - <i>  
162 - {{subject.description}}  
163 - </i>  
164 - </p>  
165 - <div class="row">  
166 - <div class="col-xs-6 col-md-6">  
167 - <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>  
168 - </div>  
169 - <div class="col-xs-6 col-md-6">  
170 - <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>  
171 - </div> 159 + <div class="panel-collapse collapseSubject-{{subject.slug}} collapse in" aria-labelledby="heading_{{subject.id}}" aria-expanded="true" aria-hidden="false">
  160 + <div class="panel-body">
  161 + <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
  162 + {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
  163 + <p>
  164 + <b>{% trans "Description" %}: </b>
  165 + <i>
  166 + {{subject.description}}
  167 + </i>
  168 + </p>
  169 + <div class="row">
  170 + <div class="col-xs-6 col-md-6">
  171 + <p><b>{% trans "Begining" %}: </b>{{subject.init_date}}</p>
172 </div> 172 </div>
173 - <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block view_btn" {% if user|show_subject_subscribe:subject %}style="display:none"{% endif %}>{% trans 'View Subject' %}<div class="ripple-container"></div></a>  
174 - </div> 173 + <div class="col-xs-6 col-md-6">
  174 + <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
  175 + </div>
  176 + </div>
  177 + </div>
  178 + </div>
175 </div> 179 </div>
176 {% endfor %} 180 {% endfor %}
177 {% else %} 181 {% else %}
178 {% for subject in subjects_category %} 182 {% for subject in subjects_category %}
179 {% if subject.category.name == request.GET.category %} 183 {% if subject.category.name == request.GET.category %}
180 <div class="panel panel-info panel_{{ subject.id }}"> 184 <div class="panel panel-info panel_{{ subject.id }}">
181 - <div class="panel-heading headingTwo ui-sortable-handle" role="tab">  
182 - <div class="row">  
183 - <div class="col-xs-9 col-md-10 titleTopic">  
184 - <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseTwo" aria-expanded="true" aria-controls="collapseTwo">  
185 - <h4 style="color:white">{{subject.name}}</h4>  
186 - </a>  
187 - </div> 185 + <div class="panel-heading heading_{{subject.id}} subject ui-sortable-handle" role="tab">
  186 + <div class="row">
  187 + <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{subject.slug}}" href=".collapseSubject-{{subject.slug}}" aria-expanded="false" aria-controls="collapseSubject-{{subject.slug}}">
  188 + <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
  189 + </div>
  190 + <div class="col-xs-9 col-md-4 titleTopic">
  191 + <a role="button" href="{% url 'course:view_subject' subject.slug %}">
  192 + <h4>{{subject.name}}</h4>
  193 + </a>
  194 + </div>
188 {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %} 195 {% if user|has_role:'professor' and user in subject.professors or user|has_role:'system_admin' %}
189 - <div class="col-xs-3 col-md-2" id="divMoreActions"> 196 + <div class="col-xs-3 col-md-6" id="divMoreActions">
190 <div class="btn-group"> 197 <div class="btn-group">
191 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 198 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
192 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 199 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -205,7 +212,8 @@ @@ -205,7 +212,8 @@
205 {% endif %} 212 {% endif %}
206 </div> 213 </div>
207 </div> 214 </div>
208 - <div class="panel-body"> 215 + <div class="panel-collapse collapseSubject-{{subject.slug}} collapse in" aria-labelledby="heading_{{subject.id}}" aria-expanded="true" aria-hidden="false">
  216 + <div class="panel-body">
209 <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %} 217 <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
210 {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p> 218 {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
211 <p> 219 <p>
@@ -222,8 +230,8 @@ @@ -222,8 +230,8 @@
222 <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> 230 <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p>
223 </div> 231 </div>
224 </div> 232 </div>
225 - <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block view_btn" {% if user|show_subject_subscribe:subject %}style="display:none"{% endif %}>{% trans 'View Subject' %}<div class="ripple-container"></div></a>  
226 </div> 233 </div>
  234 + </div>
227 </div> 235 </div>
228 {% endif %} 236 {% endif %}
229 {% endfor %} 237 {% endfor %}
courses/templates/subject/index.html
  Diff comments   View file @e3afc52
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 {% endblock %} 17 {% endblock %}
18 18
19 {% block sidebar %} 19 {% block sidebar %}
20 - <div class="panel panel-primary navigation"> 20 + <div class="panel panel-primary">
21 <div class="panel-heading"> 21 <div class="panel-heading">
22 <h5>{% trans 'Menu' %}</h5> 22 <h5>{% trans 'Menu' %}</h5>
23 </div> 23 </div>