diff options
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 3 | ||||
| -rw-r--r-- | chimere/utils.py | 13 | ||||
| -rw-r--r-- | chimere/views.py | 14 | ||||
| -rw-r--r-- | settings.py | 2 |
4 files changed, 23 insertions, 9 deletions
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 29748a2..9f83da1 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -16,6 +16,7 @@ from django.template.loader import render_to_string from chimere.models import Marker, Area, News, SubCategory, MultimediaType, \ AreaOverlays +from chimere.views import get_page_title from chimere.version import get_version from chimere.widgets import get_map_layers @@ -98,7 +99,7 @@ def display_welcome(context, display=False, title=''): context_data['news_lst'] = get_news(area)[:3] context_data['STATIC_URL'] = settings.STATIC_URL context_data['title'] = title if title \ - else _(u"Welcome to the %s") % settings.PROJECT_NAME + else _(u"Welcome to the %s") % get_page_title(area) return context_data diff --git a/chimere/utils.py b/chimere/utils.py index d95dd45..79cb68e 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -325,12 +325,12 @@ class KMLManager(ImportManager): @classmethod def export(cls, queryset): dct = { - 'name': settings.PROJECT_NAME, + 'name': settings.PROJECT_NAME or "Chimère", 'description': str(datetime.date.today()), 'locations': queryset.all() } - filename = unicode_normalize(settings.PROJECT_NAME + dct['description'] - + '.kml') + filename = unicode_normalize(settings.PROJECT_NAME or "Chimère" + + dct['description'] + '.kml') result = render_to_response('chimere/export.kml', dct) return filename, result @@ -544,7 +544,8 @@ class ShapefileManager(ImportManager): ds.Destroy() # writing to a zip file - filename = unicode_normalize(settings.PROJECT_NAME) + '-' + date + filename = unicode_normalize(settings.PROJECT_NAME or "chimere") + '-' \ + + date buff = io.BytesIO() zip_file = zipfile.ZipFile(buff, 'w', zipfile.ZIP_DEFLATED) suffixes = ['shp', 'shx', 'prj', 'dbf'] @@ -656,8 +657,8 @@ class CSVManager(ImportManager): else: data.append(getattr(item, attr)) dct['data'].append(data) - filename = unicode_normalize(settings.PROJECT_NAME + dct['description'] - + '.csv') + filename = unicode_normalize(settings.PROJECT_NAME or "chimere" + + dct['description'] + '.csv') result = render_to_response('chimere/export.csv', dct) return filename, result diff --git a/chimere/views.py b/chimere/views.py index 787a1d9..676ede0 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -50,6 +50,18 @@ from chimere.route import router from chimere.version import get_version +def get_page_title(area=None): + if not area: + if not settings.PROJECT_NAME: + return "Chimère" + else: + return settings.PROJECT_NAME + if not settings.PROJECT_NAME: + return area.name + else: + return settings.PROJECT_NAME + " - " + area.name + + def status(request): return HttpResponse('OK') @@ -120,7 +132,7 @@ def get_base_response(request, area_name=""): base_response_dct['css_area'] = area.external_css base_response_dct['dynamic_categories'] = \ True if area and area.dynamic_categories else False - base_response_dct['PROJECT_NAME'] = settings.PROJECT_NAME + base_response_dct['PROJECT_NAME'] = get_page_title(area) if hasattr(settings, 'EXTRA_CSS'): base_response_dct['EXTRA_CSS'] = settings.EXTRA_CSS return base_response_dct, None diff --git a/settings.py b/settings.py index 87d1553..6e7610f 100644 --- a/settings.py +++ b/settings.py @@ -17,7 +17,7 @@ MAIN_INDEX = "index" EXTRA_APPS = [] # Django settings for chimere project. -PROJECT_NAME = 'Chimere' +PROJECT_NAME = '' # url of the project image PROJECT_IMAGE = '' # mandatory if you put an image |