Commit da00b76805350a126eb95a268c5e6e18134a587b
1 parent
86754175
Exists in
master
and in
3 other branches
Adjusts subjects/webpages
Showing
3 changed files
with
6 additions
and
38 deletions
Show diff stats
amadeus/static/css/themes/green.css
| @@ -52,11 +52,11 @@ a, a:focus, a:hover { | @@ -52,11 +52,11 @@ a, a:focus, a:hover { | ||
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | .category-panel > .panel-heading { | 54 | .category-panel > .panel-heading { |
| 55 | - background-color: #0277BD !important; | 55 | + background-color: #015E96 !important; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | .subject-panel > .panel-heading { | 58 | .subject-panel > .panel-heading { |
| 59 | - background-color: #039BE5 !important; | 59 | + background-color: #0277BD !important; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | .group-panel > .panel-heading { | 62 | .group-panel > .panel-heading { |
| @@ -73,7 +73,7 @@ a, a:focus, a:hover { | @@ -73,7 +73,7 @@ a, a:focus, a:hover { | ||
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | .topic-panel > .panel-heading { | 75 | .topic-panel > .panel-heading { |
| 76 | - background-color: #7BA5B9 !important; | 76 | + background-color: #1d8fe0 !important; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | .topic-panel > .category-panel-content, .topic-panel-invisible > .category-panel-content { | 79 | .topic-panel > .category-panel-content, .topic-panel-invisible > .category-panel-content { |
subjects/templates/subjects/view.html
| @@ -64,24 +64,6 @@ | @@ -64,24 +64,6 @@ | ||
| 64 | </div> | 64 | </div> |
| 65 | </div> | 65 | </div> |
| 66 | <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content"> | 66 | <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content"> |
| 67 | - <div class="row"> | ||
| 68 | - <div class="col-md-6"> | ||
| 69 | - {% if subject.professor.all|length > 0 %} | ||
| 70 | - <h4><b>{% trans "Professor(s) " %}: </b> | ||
| 71 | - {{ subject.professor.all|join:', ' }} | ||
| 72 | - </h4> | ||
| 73 | - {% else %} | ||
| 74 | - <h4> {% trans "It doesn't possess professors" %} </h4> | ||
| 75 | - {% endif %} | ||
| 76 | - </div> | ||
| 77 | - <div class="col-xs-6 col-md-3"> | ||
| 78 | - <p><b>{% trans "Beginning" %}:</b> {{subject.init_date}}</p> | ||
| 79 | - </div> | ||
| 80 | - <div class="col-xs-6 col-md-3"> | ||
| 81 | - <p><b>{% trans "End" %}:</b> {{subject.end_date}}</p> | ||
| 82 | - </div> | ||
| 83 | - </div> | ||
| 84 | - | ||
| 85 | <p>{{subject.description|safe}}</p> | 67 | <p>{{subject.description|safe}}</p> |
| 86 | 68 | ||
| 87 | {% if has_subject_permissions %} | 69 | {% if has_subject_permissions %} |
webpage/templates/webpages/view.html
| @@ -28,34 +28,20 @@ | @@ -28,34 +28,20 @@ | ||
| 28 | {% subject_permissions request.user subject as has_subject_permissions %} | 28 | {% subject_permissions request.user subject as has_subject_permissions %} |
| 29 | 29 | ||
| 30 | {% if subject.visible %} | 30 | {% if subject.visible %} |
| 31 | - <div class="panel panel-info subject-panel"> | 31 | + <div class="panel panel-info topic-panel"> |
| 32 | <div class="panel-heading"> | 32 | <div class="panel-heading"> |
| 33 | {% elif has_subject_permissions %} | 33 | {% elif has_subject_permissions %} |
| 34 | - <div class="panel panel-info subject-panel-invisible"> | 34 | + <div class="panel panel-info topic-panel-invisible"> |
| 35 | <div class="panel-heading panel-invisible"> | 35 | <div class="panel-heading panel-invisible"> |
| 36 | {% endif %} | 36 | {% endif %} |
| 37 | <div class="row"> | 37 | <div class="row"> |
| 38 | <div class="col-md-12 category-header"> | 38 | <div class="col-md-12 category-header"> |
| 39 | <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px"> | 39 | <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px"> |
| 40 | - <span>{{subject.name}}</span> | 40 | + <span>{{ webpage }}</span> |
| 41 | </h4> | 41 | </h4> |
| 42 | 42 | ||
| 43 | <div class="col-md-5 pull-right category-card-items"> | 43 | <div class="col-md-5 pull-right category-card-items"> |
| 44 | - {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %} | ||
| 45 | - <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
| 46 | - <i class="fa fa-ellipsis-v" aria-hidden="true"></i> | ||
| 47 | - </a> | ||
| 48 | - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> | ||
| 49 | - <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li> | ||
| 50 | - <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li> | ||
| 51 | - <li><a href="{% url 'groups:index' subject.slug %}"><i class="fa fa-group fa-fw" aria-hidden="true"></i>{% trans 'Groups' %}</a></li> | ||
| 52 | - <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> | ||
| 53 | - </ul> | ||
| 54 | - {% endif %} | ||
| 55 | <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> | 44 | <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> |
| 56 | - <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
| 57 | - <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> | ||
| 58 | - <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a> | ||
| 59 | </div> | 45 | </div> |
| 60 | </div> | 46 | </div> |
| 61 | </div> | 47 | </div> |