diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 62f9ef5..efbd19a 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -91,6 +91,11 @@ a:focus { margin-bottom: 2px; } +.category-header > h4.panel-title span { + margin-left: 10px; + font-weight: normal; +} + .category-header > h4 > a:focus { text-decoration: none; } diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index 0c8e993..e4ed7c8 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -189,10 +189,14 @@ a, a:focus, a:hover { color: #BDBDBD; } -.panel-title{ /*Because we use an outer a tag*/ +.panel-title { /*Because we use an outer a tag*/ color: rgba(255,255,255,.84); } +.category-header > h4.panel-title span { + color: #FFFFFF; +} + .accordion { background: white; } diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html index 7b9120d..17359bc 100644 --- a/subjects/templates/subjects/view.html +++ b/subjects/templates/subjects/view.html @@ -5,20 +5,72 @@ {% block javascript%} {{ block.super }} - {% endblock%} {% block breadcrumbs %} {{ block.super }} - {% breadcrumb 'Home' 'subjects:home' %} - + {% breadcrumb subject.category 'subjects:index' %} + {% breadcrumb subject 'subjects:view' subject.slug %} {% endblock %} - {% block content %} + {% if subject.visible %} +
{% trans "Beginning" %}: {{subject.init_date}}
+{% trans "End" %}: {{subject.end_date}}
+{{subject.description|safe}}
- + {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %} + + {% endif %} + +