diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 5e1f1e4..4b7fefe 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -749,4 +749,32 @@ a.add-row { -moz-user-select: none; -ms-user-select: none; user-select: none; +} + +.resource_list { + margin-left: 30px; + border-top: none !important; +} + +.resource_list > .list-group-item:first-child { + border-top-left-radius: 4px !important; + border-top-right-radius: 4px !important; +} + +.resource_list > .list-group-item { + position: relative; + display: block; + padding: 10px 15px; + margin-bottom: -1px; + border-width: 1px !important; +} + +.resource_list > .list-group-item:last-child { + margin-bottom: 0; + border-bottom-right-radius: 4px !important; + border-bottom-left-radius: 4px !important; +} + +.resource_list .list-group-item .list-group-item-heading { + font-weight: 500; } \ No newline at end of file diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index e06b88d..8ace8bf 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -356,6 +356,15 @@ a.add-row { color: rgba(255,255,255,.84); } +.resource_list > .list-group-item { + background-color: #fff; + border: 1px solid #ddd; +} + +.resource_list > .list-group-item:last-child { + border-bottom: 1px solid #ddd !important; +} + @media(max-width: 768px) { .navbar .navbar-nav .dropdown .dropdown-menu li > a { color: #333333 !important; diff --git a/topics/templates/topics/list.html b/topics/templates/topics/list.html index 6548fac..08a67bb 100644 --- a/topics/templates/topics/list.html +++ b/topics/templates/topics/list.html @@ -58,6 +58,8 @@ {% endif %} + + {% include 'webpages/list.html' with topic=topic %} {% endif %} diff --git a/webpage/templates/webpages/list.html b/webpage/templates/webpages/list.html index e69de29..259b84c 100644 --- a/webpage/templates/webpages/list.html +++ b/webpage/templates/webpages/list.html @@ -0,0 +1,26 @@ +{% load static i18n pagination permissions_tags %} +{% load django_bootstrap_breadcrumbs %} + +
+ {% for resource in topic.resource_topic.all %} +
+

+ {{ resource }} +

+ +
+ {% autoescape off %} + {{ resource.brief_description }} + {% endautoescape %} +
+ {% endfor %} +
\ No newline at end of file -- libgit2 0.21.2