diff options
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/chimere/views.py b/chimere/views.py index 2dfb84e..932240c 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -165,7 +165,7 @@ def index(request, area_name=None, default_area=None, simple=False, today = datetime.date.today().strftime('%y-%m-%d') news_visible = False if 'last_visit' not in request.session or \ - request.session['last_visit'] != today: + request.session['last_visit'] != today and request.GET: request.session['last_visit'] = today news_visible = True response_dct, redir = get_base_response(request, area_name) @@ -210,6 +210,9 @@ def index(request, area_name=None, default_area=None, simple=False, 'has_default_area': models.Area.objects.filter(default=True).count(), 'has_search': response_dct['area'].use_search if response_dct['area'] else None, + 'VERSION': get_version(), + 'extra_css': widgets.MultiSelectWidget.Media.EXTRA_CSS, + 'extra_js': widgets.MultiSelectWidget.Media.EXTRA_JS }) if hasattr(settings, 'PROJECT_IMAGE') and settings.PROJECT_IMAGE: response_dct['PROJECT_IMAGE'] = settings.PROJECT_IMAGE @@ -512,11 +515,17 @@ def edit_page(get_edit, types, geom_name, widget, init_widget=True): editMarker = edit_page(get_edit_marker, ['M', 'B'], 'marker', - widgets.PointChooserWidget) + widgets.PointChooserWidget, init_widget=False) +editMarkerTab = edit_page(get_edit_marker, ['M', 'B'], 'marker', + widgets.PointChooserWidget) editRoute = edit_page(get_edit_route, ['R', 'B'], 'route', - widgets.RouteChooserWidget) + widgets.RouteChooserWidget, init_widget=False) +editRouteTab = edit_page(get_edit_route, ['R', 'B'], 'route', + widgets.RouteChooserWidget) editPolygon = edit_page(get_edit_polygon, ['P'], 'polygon', - widgets.PolygonChooserWidget) + widgets.PolygonChooserWidget, init_widget=False) +editPolygonTab = edit_page(get_edit_polygon, ['P'], 'polygon', + widgets.PolygonChooserWidget) def submited(request, area_name="", action=""): @@ -1252,6 +1261,23 @@ def rss(request, area_name=''): else: return render(request, 'chimere/feeds/rss.html', response_dct) + +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 = models.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 + # from django.core.paginator import Paginator, InvalidPage |