Commit ee2a548a63310e0607f97b5988d7199e0859ca64
1 parent
0f3d09e5
Exists in
master
and in
5 other branches
modifying card course #205
Showing
4 changed files
with
38 additions
and
20 deletions
Show diff stats
amadeus/staticfiles/css/base/amadeus.css
@@ -320,4 +320,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain | @@ -320,4 +320,4 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain | ||
320 | 320 | ||
321 | .notification-count { | 321 | .notification-count { |
322 | background-color: #FF0000; | 322 | background-color: #FF0000; |
323 | -} | 323 | -} |
324 | +} | ||
324 | \ No newline at end of file | 325 | \ No newline at end of file |
core/static/css/base/amadeus.css
@@ -394,4 +394,18 @@ ul, li { | @@ -394,4 +394,18 @@ ul, li { | ||
394 | -webkit-animation-duration: 900ms; | 394 | -webkit-animation-duration: 900ms; |
395 | -webkit-animation-iteration-count: 3; | 395 | -webkit-animation-iteration-count: 3; |
396 | -webkit-animation-timing-function: ease-in-out; | 396 | -webkit-animation-timing-function: ease-in-out; |
397 | -} | ||
398 | \ No newline at end of file | 397 | \ No newline at end of file |
398 | +} | ||
399 | +/* Icon Topic */ | ||
400 | +.divMoreActions {text-align: right; height: 39px; float: right;} | ||
401 | +.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;} | ||
402 | +.headingOne {padding-top: 0px; padding-bottom: 50px;} | ||
403 | +.headingTwo {padding-top: 0px; padding-bottom: 50px;} | ||
404 | +.panel-heading{cursor:move;} | ||
405 | +.titleTopic {padding-top: 18px; padding-left: 0px;} | ||
406 | +.titleTopic-detail {padding-top: 8px;} | ||
407 | +.titleTopic a h4 {margin-top: 0px; color: white; cursor:pointer;} | ||
408 | +.dropdown-menu .pull-right { | ||
409 | + right: 0; | ||
410 | + } | ||
411 | +.moreAccordion{ padding-left: 0px; padding-right: 0px;} | ||
412 | +.moreAccordion div button{ padding-left: 0px; padding-right: 0px;} | ||
399 | \ No newline at end of file | 413 | \ No newline at end of file |
courses/templates/course/course_card.html
@@ -4,25 +4,30 @@ | @@ -4,25 +4,30 @@ | ||
4 | <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion-{{course.slug}}" role="tablist" aria-multiselectable="false"> | 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"> | 5 | <div class="group"> |
6 | <div class="panel panel-info"> | 6 | <div class="panel panel-info"> |
7 | - <div class="panel-heading" role="tab"> | 7 | + <div class="panel-heading" role="tab" > |
8 | <div class="row"> | 8 | <div class="row"> |
9 | - <div class="col-xs-9 col-md-10 titleTopic"> | ||
10 | - <a role="button" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}" class="collapsed"> | ||
11 | - <h4 style="color:white">{{course.name}}</h4> | ||
12 | - </a> | 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 | + <div class="btn-group"> | ||
11 | + <button class="btn btn-default btn-sm"><i class="fa fa-chevron-circle-down fa-2x" aria-hidden="true"></i></button> | ||
12 | + </div> | ||
13 | + </div> | ||
14 | + <div class="col-xs-9 col-md-4 titleTopic"> | ||
15 | + <a role="button" href="{% url 'course:view' course.slug %}"> | ||
16 | + <h4>{{course.name}}</h4> | ||
17 | + </a> | ||
13 | </div> | 18 | </div> |
14 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} | 19 | {% if user|has_role:'professor' or user|has_role:'system_admin' %} |
15 | - <div class="col-xs-4 col-md-2" id="divMoreActions"> | ||
16 | - <div class="btn-group"> | ||
17 | - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
18 | - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | ||
19 | - </button> | ||
20 | - <ul class="dropdown-menu" aria-labelledby="moreActions"> | ||
21 | - <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> | ||
22 | - <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>{% trans 'Remove' %}</a></li> | ||
23 | - </ul> | ||
24 | - </div> | ||
25 | - </div> | 20 | + <div class="col-xs-4 col-md-6 divMoreActions" > |
21 | + <div class="btn-group"> | ||
22 | + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
23 | + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | ||
24 | + </button> | ||
25 | + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> | ||
26 | + <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> | ||
27 | + <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> {% trans 'Remove' %}</a></li> | ||
28 | + </ul> | ||
29 | + </div> | ||
30 | + </div> | ||
26 | {% endif %} | 31 | {% endif %} |
27 | </div> | 32 | </div> |
28 | </div> | 33 | </div> |
@@ -36,7 +41,6 @@ | @@ -36,7 +41,6 @@ | ||
36 | {{course.content}} | 41 | {{course.content}} |
37 | </i> | 42 | </i> |
38 | </p> | 43 | </p> |
39 | - <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a> | ||
40 | </div> | 44 | </div> |
41 | </div> | 45 | </div> |
42 | </div> | 46 | </div> |