diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py index aefc3b8d..37f6b051 100644 --- a/emencia/django/newsletter/mailer.py +++ b/emencia/django/newsletter/mailer.py @@ -41,6 +41,7 @@ from django.template.loader import render_to_string, get_template from django.utils.encoding import smart_str from django.utils.encoding import smart_unicode from django.utils.translation import ugettext as _ +from django.core.files.storage import default_storage from django.core.urlresolvers import reverse from django.core.exceptions import SuspiciousOperation from django.db.models import Q @@ -332,7 +333,7 @@ class NewsLetterSender(object): if obj is not None: logo = getattr(obj, 'logo') if not logo: - logo_path = os.path.join(settings.STATIC_ROOT, 'client/img/no-logo.png') + logo_path = default_storage.open('newsletter/images/no-logo.png') else: logo_path = logo.path diff --git a/templates/c_admin/conference/conference.html b/templates/c_admin/conference/conference.html index 87b4db81..825e92af 100644 --- a/templates/c_admin/conference/conference.html +++ b/templates/c_admin/conference/conference.html @@ -375,62 +375,62 @@ -
| Программа | -Начало | -Конец | -Спикеры | -Организатор | -- |
|---|---|---|---|---|---|
| {{ timetable.programe|safe }} | -{{ timetable.begin|date:"o-m-d H:i" }} | -{{ timetable.end|date:"o-m-d H:i" }} | -{{ timetable.speaker }} | -- {{ timetable.timetable_organiser }} - | -- - | -
Деловую программу можно добавлять только после введения основных данных
- {% endif %} - - -| Программа | #} +{#Начало | #} +{#Конец | #} +{#Спикеры | #} +{#Организатор | #} +{##} +{# |
|---|---|---|---|---|---|
| {{ timetable.programe|safe }} | #} +{#{{ timetable.begin|date:"o-m-d H:i" }} | #} +{#{{ timetable.end|date:"o-m-d H:i" }} | #} +{#{{ timetable.speaker }} | #} +{##} +{# {{ timetable.timetable_organiser }}#} +{# | #} +{##} +{# #} +{# | #} +{#
Деловую программу можно добавлять только после введения основных данных
#} +{# {% endif %}#} +{##} +{##} +{#