diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-19 17:36:36 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-19 17:36:36 +0100 |
| commit | 6928368d4e7be3dff8fca7c1482f863481afa3df (patch) | |
| tree | 250d1eee62cf99209ddf7363f8bd2d916de539d4 | |
| parent | c59fab0a514630d67182ddf7cb3a11dc00c6eba3 (diff) | |
| download | Chimère-6928368d4e7be3dff8fca7c1482f863481afa3df.tar.bz2 Chimère-6928368d4e7be3dff8fca7c1482f863481afa3df.zip | |
Detail: manage default category when no category is selected
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 6 | ||||
| -rw-r--r-- | chimere/views.py | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 4cdc31e..1494c2f 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -558,7 +558,7 @@ div#sidebar-container{ width: 400px; top: 35px; height: 80px; - padding: 0.6em 0; + padding: 2px 0; overflow: hidden; box-shadow: 0 -10px 5px rgba(0, 0, 0, 0.6); } @@ -662,8 +662,8 @@ div#sidebar-container{ } .category-header{ - font-size: 0.8em; - padding-top: 4px; + font-size: 1em; + padding-top: 0; margin-bottom: 3px; line-height: 1em; color: #333; diff --git a/chimere/views.py b/chimere/views.py index d7e552e..3ff8059 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -651,6 +651,7 @@ def getDetail(request, area_name, key, popup=False): response_dct['marker'] = marker response_dct['popup'] = popup response_dct['category'] = None + response_dct['extra_categories'] = [] marker_cats = list(marker.categories.all()) @@ -658,7 +659,6 @@ def getDetail(request, area_name, key, popup=False): if 'simple' in request.GET and request.GET['simple']: response_dct['simple'] = True if 'categories' in request.GET and request.GET['categories']: - response_dct['extra_categories'] = [] for cat_id in request.GET['categories'].split('-'): try: category = models.SubCategory.objects.get( @@ -671,9 +671,14 @@ def getDetail(request, area_name, key, popup=False): response_dct['extra_categories'].append(category) except (models.SubCategory.DoesNotExists, ValueError): pass - if response_dct['category']: - response_dct['color'] = \ - response_dct['category'].category.color + 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) + if response_dct['category']: + response_dct['color'] = response_dct['category'].category.color response_dct['share_networks'], net_dct = \ getShareNetwork(request, response_dct['area_name'], marker, geo_type) |