Commit 39ef2414f30dfe75945834d5c67bc3ece422cab9
1 parent
d35c6dae
Exists in
master
and in
3 other branches
added support for invisible subjects
Showing
2 changed files
with
71 additions
and
2 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
| @@ -76,6 +76,10 @@ | @@ -76,6 +76,10 @@ | ||
| 76 | padding: 2px 0px; | 76 | padding: 2px 0px; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | +.subject-panel-invisible > .panel-heading{ | ||
| 80 | + padding: 2px 0px; | ||
| 81 | +} | ||
| 82 | + | ||
| 79 | .subject-panel > .panel-heading { | 83 | .subject-panel > .panel-heading { |
| 80 | background-color: #039BE5 !important; | 84 | background-color: #039BE5 !important; |
| 81 | } | 85 | } |
subjects/templates/subjects/subject_card.html
| 1 | {% load static i18n permission_tags %} | 1 | {% load static i18n permission_tags %} |
| 2 | - | 2 | +{% if subject.visible %} |
| 3 | <div class="panel panel-info subject-panel"> | 3 | <div class="panel panel-info subject-panel"> |
| 4 | <div class="panel-heading"> | 4 | <div class="panel-heading"> |
| 5 | + | ||
| 6 | + | ||
| 7 | + | ||
| 8 | + <div class="row"> | ||
| 9 | + <div class="col-md-12 category-header"> | ||
| 10 | + <h4 class="panel-title"> | ||
| 11 | + <a class="category-course-link pull-left" data-parent="#{% if accordion_id %}{{ accordion_id }}{% else %}{{ subject.category.slug }}-accordion{% endif %}" data-toggle="collapse" href="#{{subject.slug}}"> | ||
| 12 | + <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{subject.name}} | ||
| 13 | + </a> | ||
| 14 | + </h4> | ||
| 15 | + | ||
| 16 | + <div class="col-md-5 pull-right category-card-items"> | ||
| 17 | + {% if request.user in subject.professor.all or request.user in category.coordinators.all %} | ||
| 18 | + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
| 19 | + <i class="fa fa-ellipsis-v" aria-hidden="true"></i> | ||
| 20 | + </a> | ||
| 21 | + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> | ||
| 22 | + <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li> | ||
| 23 | + <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li> | ||
| 24 | + <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> | ||
| 25 | + </ul> | ||
| 26 | + {% endif %} | ||
| 27 | + <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> | ||
| 28 | + <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
| 29 | + <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> | ||
| 30 | + <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a> | ||
| 31 | + </div> | ||
| 32 | + </div> | ||
| 33 | + </div> | ||
| 34 | + </div> | ||
| 35 | + <div id="{{subject.slug}}" class="panel-collapse collapse category-panel-content"> | ||
| 36 | + <div class="row"> | ||
| 37 | + <div class="col-md-6"> | ||
| 38 | + {% if subject.professor.all|length > 0 %} | ||
| 39 | + <h4><b>{% trans "Professors(s) " %}: </b> | ||
| 40 | + {{ subject.professor.all|join:', ' }} | ||
| 41 | + </h4> | ||
| 42 | + {% else %} | ||
| 43 | + <h4> {% trans "It doesn't possess professors" %} </h4> | ||
| 44 | + {% endif %} | ||
| 45 | + </div> | ||
| 46 | + <div class="col-xs-6 col-md-3"> | ||
| 47 | + <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p> | ||
| 48 | + </div> | ||
| 49 | + <div class="col-xs-6 col-md-3"> | ||
| 50 | + <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p> | ||
| 51 | + </div> | ||
| 52 | + </div> | ||
| 53 | + | ||
| 54 | + <p>{{subject.description_brief|safe}}</p> | ||
| 55 | + | ||
| 56 | + {% if request.user in subject.students.all or request.user in subject.professor.all or quest.user.is_staff %} | ||
| 57 | + <a href="#"><button class="access-subject"> {% trans "Access Subject" %}</button></a> | ||
| 58 | + {% else %} | ||
| 59 | + <a href="#"><button class="subscribe-subject"> {% trans "Subscribe to Subject" %}</button></a> | ||
| 60 | + {% endif %} | ||
| 61 | + </div> | ||
| 62 | +</div> | ||
| 63 | + {% elif request.user in subject.professor.all or request.user in category.coordinators.all %} | ||
| 64 | +<div class="panel panel-info subject-panel-invisible"> | ||
| 65 | + <div class="panel-heading panel-invisible"> | ||
| 66 | + | ||
| 67 | + | ||
| 68 | + | ||
| 5 | <div class="row"> | 69 | <div class="row"> |
| 6 | <div class="col-md-12 category-header"> | 70 | <div class="col-md-12 category-header"> |
| 7 | <h4 class="panel-title"> | 71 | <h4 class="panel-title"> |
| @@ -56,4 +120,5 @@ | @@ -56,4 +120,5 @@ | ||
| 56 | <a href="#"><button class="subscribe-subject"> {% trans "Subscribe to Subject" %}</button></a> | 120 | <a href="#"><button class="subscribe-subject"> {% trans "Subscribe to Subject" %}</button></a> |
| 57 | {% endif %} | 121 | {% endif %} |
| 58 | </div> | 122 | </div> |
| 59 | -</div> | ||
| 60 | \ No newline at end of file | 123 | \ No newline at end of file |
| 124 | +</div> | ||
| 125 | +{% endif %} | ||
| 61 | \ No newline at end of file | 126 | \ No newline at end of file |