diff options
| -rw-r--r-- | static/saclay/css/styles.css | 102 | ||||
| -rw-r--r-- | templates/chimere/blocks/categories.html | 1 | ||||
| -rw-r--r-- | templates/chimere/dyn.css | 23 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 1 | ||||
| -rw-r--r-- | urls.py | 3 | ||||
| -rw-r--r-- | views.py | 23 |
6 files changed, 60 insertions, 93 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index e3af021..c121e07 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -1214,6 +1214,17 @@ ul#ul_categories{ overflow:hidden; } +.triangle{ + display: block; + float: left; + margin-top: 8px; + width: 0; + height: 0; + border-style: solid; + border-width: 11px 0 10px 10px; + border-style: solid inset solid solid; +} + .toggle_category{ margin-top:13px; margin-right:2px; @@ -2117,97 +2128,6 @@ select#id_categories{ color:#777; } -#ul_categories .subcategories#maincategory_1 li .selected label, -#ul_categories .subcategories#maincategory_2 li .selected label, -#ul_categories .subcategories#maincategory_3 li .selected label, -#ul_categories .subcategories#maincategory_4 li .selected label, -#ul_categories .subcategories#maincategory_5 li .selected label, -#ul_categories .subcategories#maincategory_6 li .selected label, -#ul_categories .subcategories#maincategory_7 li .selected label, -#ul_categories .subcategories#maincategory_8 li .selected label { - color:#fff; -} - -#ul_categories .subcategories#maincategory_1 li .selected label, -.main_category.toggle_plus > span#main_category_1 > label, -.main_category.toggle_minus > span#main_category_1 > label{ - background-color:#cd5a5a; -} - -#ul_categories .subcategories#maincategory_1 li label{ - color:#cd5a5a; -} - -#ul_categories .subcategories#maincategory_2 li .selected label, -.main_category.toggle_plus > span#main_category_2 > label, -.main_category.toggle_minus > span#main_category_2 > label{ - background-color:#996998; -} - -#ul_categories .subcategories#maincategory_2 label{ - color:#996998; -} - -#ul_categories .subcategories#maincategory_3 li .selected label, -.main_category.toggle_plus > span#main_category_3 > label, -.main_category.toggle_minus > span#main_category_3 > label{ - background-color:#c49c86; -} - -#ul_categories .subcategories#maincategory_3 label{ - color:#c49c86; -} - -#ul_categories .subcategories#maincategory_4 li .selected label, -.main_category.toggle_plus > span#main_category_4 > label, -.main_category.toggle_minus > span#main_category_4 > label{ - background-color:#85ae7a; -} - -#ul_categories .subcategories#maincategory_4 label{ - color:#85ae7a; -} - -#ul_categories .subcategories#maincategory_5 li .selected label, -.main_category.toggle_plus > span#main_category_5 > label, -.main_category.toggle_minus > span#main_category_5 > label{ - background-color:#a8adad; -} - -#ul_categories .subcategories#maincategory_5 label{ - color:#a8adad; -} - -#ul_categories .subcategories#maincategory_6 li .selected label, -.main_category.toggle_plus > span#main_category_6 > label, -.main_category.toggle_minus > span#main_category_6 > label{ - background-color:#697c92; -} - -#ul_categories .subcategories#maincategory_6 label{ - color:#697c92; -} - -#ul_categories .subcategories#maincategory_7 li .selected label, -.main_category.toggle_plus > span#main_category_7 > label, -.main_category.toggle_minus > span#main_category_7 > label{ - background-color:#eba44a; -} - -#ul_categories .subcategories#maincategory_7 label{ - color:#eba44a; -} - -#ul_categories .subcategories#maincategory_8 li .selected label, -.main_category.toggle_plus > span#main_category_8 > label, -.main_category.toggle_minus > span#main_category_8 > label{ - background-color:#d38fac; -} - -#ul_categories .subcategories#maincategory_8 label{ - color:#d38fac; -} - #detail_footer{ border-radius-bottom: 6px; } diff --git a/templates/chimere/blocks/categories.html b/templates/chimere/blocks/categories.html index bb72a78..f43030f 100644 --- a/templates/chimere/blocks/categories.html +++ b/templates/chimere/blocks/categories.html @@ -3,6 +3,7 @@ {% for category, lst_sub_categories in sub_categories %} <li class='main_category {% if category.selected %}toggle_minus{%else%}toggle_plus{%endif%}'> <span id='main_category_{{category.pk}}'> + <i class="triangle"></i> <label> {% trans category.name %} <i class="fa fa-check main-category-tick" diff --git a/templates/chimere/dyn.css b/templates/chimere/dyn.css new file mode 100644 index 0000000..4d47b31 --- /dev/null +++ b/templates/chimere/dyn.css @@ -0,0 +1,23 @@ +{% for pk, color in categories %} +.main_category.toggle_plus > span#main_category_{{pk}} > label, +.main_category.toggle_minus > span#main_category_{{pk}} > label{% if not forloop.last %}, {% endif%}{% endfor %} { + background-color:transparent; + color: #777; +} +{% for pk, color in categories %} +#main_category_{{pk}}.category-selected .triangle{% if not forloop.last %}, {% endif%}{% endfor %} { + border-color: transparent transparent transparent #fff; +} + +{% for pk, color in categories %} +#main_category_{{pk}} .triangle{ + border-color: transparent transparent transparent {{color}}; +} + +#ul_categories #maincategory_{{pk}}.subcategories li .selected label, +.main_category.toggle_plus > span#main_category_{{pk}}.category-selected > label, +.main_category.toggle_minus > span#main_category_{{pk}}.category-selected > label{ + background-color: {{color}}; + color: #fff; +} +{% endfor %} diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index c95f064..8bf77d7 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -21,6 +21,7 @@ </script> <script src="{{ STATIC_URL }}saclay/js/interface.js?ver={{SACLAY_VERSION}}" type="text/javascript"></script> {{ block.super }} +<link rel="stylesheet" type="text/css" href="{% url 'dyn-css' %}" /> {% endblock %} {% block message_edit %}{% endblock %} {% block sidebar %} @@ -23,6 +23,7 @@ from django.conf.urls.static import static from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns +from chimere_saclay import views admin.autodiscover() urlpatterns = patterns( @@ -42,6 +43,8 @@ urlpatterns += patterns( '', (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn.css$', + views.DynCSS.as_view(), name="dyn-css"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'chimere_saclay.views.edit', name="edit"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/(?P<item_id>\w+)/' @@ -20,14 +20,15 @@ from django.conf import settings from django.shortcuts import render_to_response from django.template import RequestContext +from django.views.generic import TemplateView from chimere_saclay.forms import MarkerForm, RouteForm from chimere.actions import actions -from chimere.models import Marker, Route, PropertyModel +from chimere.models import Marker, Route, PropertyModel, SubCategory from chimere.version import get_version from chimere_saclay.version import get_saclay_version -from chimere.views import get_edit_page, index +from chimere.views import get_edit_page, index, get_area def index_saclay(request, area_name=None, default_area=None, simple=False): @@ -40,6 +41,24 @@ def index_saclay(request, area_name=None, default_area=None, simple=False): return render_to_response(tpl, response_dct, context_instance=RequestContext(request)) + +class DynCSS(TemplateView): + template_name = "chimere/dyn.css" + content_type = 'text/css' + + def get_context_data(self, **kwargs): + context = super(DynCSS, self).get_context_data(**kwargs) + area, area_name = get_area(context['area_name']) + subcategories = SubCategory.getAvailable(None, area_name) + context['categories'] = [] + for cat, subcat in subcategories: + color = "#888" + if cat.color: + color = cat.color + context['categories'].append((cat.pk, color)) + return context + + get_edit_marker = get_edit_page('edit', Marker, MarkerForm) |