# HG changeset patch # User duong tam kien # Date 1487945062 -3600 # Node ID 3d48f9520c8d2570256ba917ef9082cd61eda38d # Parent e1762995780bf42564c9928cd8522e6effe36ed8 adds contact email as a setting variable from the app (instead of raw in the template diff -r e1762995780b -r 3d48f9520c8d src/iconolab/settings/dev.py.tmpl --- a/src/iconolab/settings/dev.py.tmpl Thu Feb 23 16:48:58 2017 +0100 +++ b/src/iconolab/settings/dev.py.tmpl Fri Feb 24 15:04:22 2017 +0100 @@ -14,6 +14,8 @@ from iconolab.settings import * +CONTACT_EMAIL = 'youremail@yourprovider.fr' + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff -r e1762995780b -r 3d48f9520c8d src/iconolab/templates/iconolab/home.html --- a/src/iconolab/templates/iconolab/home.html Thu Feb 23 16:48:58 2017 +0100 +++ b/src/iconolab/templates/iconolab/home.html Fri Feb 24 15:04:22 2017 +0100 @@ -14,7 +14,7 @@

Bienvenue sur iconolab. La plateforme est actuellement en cours de développement.

-

La première phase d'expérimentation démarrera mi-mars 2017. Pour plus d'informations, prière de contacter iconolab at gmail.com.

+

La première phase d'expérimentation démarrera mi-mars 2017. Pour plus d'informations, prière de contacter {{ contact }}.

diff -r e1762995780b -r 3d48f9520c8d src/iconolab/views/objects.py --- a/src/iconolab/views/objects.py Thu Feb 23 16:48:58 2017 +0100 +++ b/src/iconolab/views/objects.py Fri Feb 24 15:04:22 2017 +0100 @@ -36,6 +36,7 @@ context = {} context['collections_primary'] = Collection.objects.filter(show_image_on_home=True).all() context['collections_secondary'] = Collection.objects.filter(show_image_on_home=False).all() + context['contact'] = settings.CONTACT_EMAIL context['homepage'] = True return render(request, 'iconolab/home.html', context) @@ -801,4 +802,3 @@ context['current_tags_data'] = annotation.current_revision.get_tags_json() context['current_comment'] = annotation.current_revision.creation_comment.first() return render(request, 'iconolab/merge_revision.html', context) -