diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-09-28 10:37:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-09-28 10:37:32 +0200 |
| commit | b96d65fcdda5e1993bf9744ae747633f684a0c60 (patch) | |
| tree | d01cd7344ca667e37649c6f2fc3efc4201fdde2f | |
| parent | 1d1a786eedd6af35b70265bc39af395767e993f0 (diff) | |
| download | Chimère-b96d65fcdda5e1993bf9744ae747633f684a0c60.tar.bz2 Chimère-b96d65fcdda5e1993bf9744ae747633f684a0c60.zip | |
Display extra categories in description detail
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 6 | ||||
| -rw-r--r-- | chimere/templates/chimere/detail.html | 14 | ||||
| -rw-r--r-- | chimere/views.py | 12 |
3 files changed, 26 insertions, 6 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index daed6c0..e1ce87a 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -776,6 +776,12 @@ div#sidebar-container{ margin:0; } +.full-description ul.extra-categories{ + list-style-type: none; + margin: 0; + padding: 0; +} + .detail-content p.detail_amendment{ padding:0.2em 0.5em; margin: 0.2em 0; diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html index eaca0e8..5bac2b5 100644 --- a/chimere/templates/chimere/detail.html +++ b/chimere/templates/chimere/detail.html @@ -61,6 +61,20 @@ {%endif%} <div class="full-description"> {% include "chimere/detail_description.html" %} + {% if extra_categories %} + <h4>{% trans "Also appears in:" %}</h4> + <ul class="extra-categories"> + {% for category in extra_categories %} + <li>{% if category.menu_icon.image %} + <img src="{{category.menu_icon.image.url}}"> + {% elif category.icon.image %} + <img src="{{category.icon.image.url}}"> + {% endif %} + {{category.name}} + </li> + {% endfor %} + </ul> + {% endif %} </div> <div id='detail_footer'> <div id='detail-action-bar'> diff --git a/chimere/views.py b/chimere/views.py index 5b54607..421c03e 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -689,12 +689,12 @@ def getDetail(request, area_name, key, popup=False): response_dct['extra_categories'].append(category) except (models.SubCategory.DoesNotExists, ValueError): pass - if not response_dct['category']: - for idx, cat in enumerate(marker_cats): - if not idx: - response_dct['category'] = cat - else: - response_dct['extra_categories'].append(cat) + for idx, cat in enumerate(marker_cats): + if not idx and not response_dct['category']: + response_dct['category'] = cat + elif cat not in response_dct['extra_categories'] \ + and cat != response_dct['category']: + response_dct['extra_categories'].append(cat) if response_dct['category']: response_dct['color'] = response_dct['category'].category.color |