diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index d89efd3..f796075 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -786,6 +786,10 @@ a.add-row { margin: 0px; } +.resource_list > .disabled a { + cursor: not-allowed; +} + .resource_list a:hover, .resource_list a:focus { text-decoration: none; } \ No newline at end of file diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index 0f56827..d639294 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -361,6 +361,18 @@ a.add-row { border: 1px solid #ddd; } +.resource_list > .disabled { + background-color: #eee; +} + +.resource_list > .disabled:hover { + background-color: #eee !important; +} + +.resource_list > .disabled a { + color: #777; +} + .resource_list > .list-group-item:hover { background: #F5F5F5; } @@ -373,6 +385,10 @@ a.add-row { color: #CCCCCC; } +.resource_list .category-card-items .dropdown-menu i { + color: #333; +} + .resource_list a { color: inherit; } diff --git a/webpage/templates/webpages/list.html b/webpage/templates/webpages/list.html index c190406..f61eb49 100644 --- a/webpage/templates/webpages/list.html +++ b/webpage/templates/webpages/list.html @@ -1,35 +1,42 @@ {% load static i18n pagination permissions_tags %} {% load django_bootstrap_breadcrumbs %} +{% subject_permissions request.user topic.subject as has_subject_permissions %} +
{% for resource in topic.resource_topic.all %} -
- - - + {% if resource.visible or has_subject_permissions %} +
+ + + + +

+ + {{ resource }} + +

-

- - {{ resource }} - -

- -
- {% autoescape off %} - {{ resource.brief_description }} - {% endautoescape %} -
+ {% if has_subject_permissions %} + + {% endif %} +
+ {% autoescape off %} + {{ resource.brief_description }} + {% endautoescape %} +
+ {% endif %} {% endfor %}