diff options
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 18 | ||||
| -rw-r--r-- | chimere/views.py | 13 |
2 files changed, 18 insertions, 13 deletions
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index d3ff4df..65a5b0e 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -1,10 +1,4 @@ @font-face { - font-family: TexGyreHeros; - font-weight: bold; - src: url("../../saclay/fonts/texgyreheros-bold.otf") format("opentype"); -} - -@font-face { font-family: 'Open Sans Condensed'; font-style: normal; font-weight: 300; @@ -560,6 +554,11 @@ div#sidebar-container{ width: 400px; } +#detail-header h4{ + font-family: 'Open Sans Condensed', sans-serif; + text-shadow: 1px 1px 2px black; +} + #detail-content{ overflow:auto; max-height: 300px; @@ -691,6 +690,7 @@ div#sidebar-container{ min-width: 150px; text-align: center; padding: 0.5em 0.25em; + font-family: 'Open Sans Condensed', sans-serif; font-weight: bold; } @@ -705,6 +705,7 @@ div#sidebar-container{ padding: 0; font-weight: normal; text-align: left; + font-family: sans-serif; } #detail_footer a.propose-modif{ @@ -2766,9 +2767,8 @@ ul#action{ } .action li{ - font-family: "TexGyreHeros", "Helvetica Neue",Helvetica,Arial,sans-serif; background-color: #c1c1b0; - text-transform:uppercase; + text-transform: uppercase; width:141px; display:block; padding:0; @@ -3793,7 +3793,7 @@ select#id_categories{ color: #CCC; left: 248px; font-size: 2em; - font-family: arial; + font-family: Arial, sans-serif; } .main_category.toggle_plus > span > label, diff --git a/chimere/views.py b/chimere/views.py index 02f79fe..ab07a07 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -641,23 +641,28 @@ def getDetail(request, area_name, key, popup=False): response_dct['popup'] = popup response_dct['category'] = None + marker_cats = list(marker.categories.all()) + if request.method == 'GET': if 'simple' in request.GET and request.GET['simple']: response_dct['simple'] = True if 'categories' in request.GET and request.GET['categories']: - response_dct['categories'] = [] + response_dct['extra_categories'] = [] for cat_id in request.GET['categories'].split('-'): try: category = models.SubCategory.objects.get( available=True, pk=int(cat_id)) + if category not in marker_cats: + continue if not response_dct['category']: response_dct['category'] = category - response_dct['categories'].append(category) + else: + response_dct['extra_categories'].append(category) except (models.SubCategory.DoesNotExists, ValueError): pass - if len(response_dct['categories']): + if response_dct['category']: response_dct['color'] = \ - response_dct['categories'][0].category.color + response_dct['category'].category.color response_dct['share_networks'], net_dct = \ getShareNetwork(request, response_dct['area_name'], marker, geo_type) |