From 40a1f8a8a2876c2f825c7433b1b32315adf02a82 Mon Sep 17 00:00:00 2001
From: Alexander Burdeinyi <bonus05@gmail.com>
Date: Tue, 13 Dec 2016 15:21:02 +0200
Subject: [PATCH] m

---
 emencia/django/newsletter/mailer.py          |   3 +-
 templates/c_admin/conference/conference.html | 112 +++++++++----------
 2 files changed, 58 insertions(+), 57 deletions(-)

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 @@
 
                 </div>
             </div>
-            <div class="box span8">
-                <div class="box-header well">
-                    <h2><i class="icon-pencil"></i>Деловая программа</h2>
-                </div>
-                <div class="box-content">
-                {% if object %}
-                    <div id="timetable_wrap">
-                    <table class="table">
-                        <colgroup>
-                           <col span="1" style="width: 35%;">
-                           <col span="1" style="width: 10%;">
-                           <col span="1" style="width: 10%;">
-                           <col span="1" style="width: 25%;">
-                            <col span="1" style="width: 10%;">
-                            <col span="1" style="width: 10%;">
-                        </colgroup>
-                        <thead>
-                            <tr>
-                                <th>Программа</th>
-                                <th>Начало</th>
-                                <th>Конец</th>
-                                <th>Спикеры</th>
-                                <th>Организатор</th>
-                                <th>&nbsp;</th>
-                            </tr>
-
-                        </thead>
-                        <tbody>
-                        {% for timetable in timetables %}
-                            <tr>
-                                <td>{{ timetable.programe|safe }}</td>
-                                <td>{{ timetable.begin|date:"o-m-d H:i" }}</td>
-                                <td>{{ timetable.end|date:"o-m-d H:i" }}</td>
-                                <td>{{ timetable.speaker }}</td>
-                                <td>
-                                    {{ timetable.timetable_organiser }}
-                                </td>
-                                <td>
-                                    <button class="btn btn-danger remove_timetable" value="{{ timetable.id }}">
-                                        Удалить
-                                    </button>
-                                </td>
-                            </tr>
-                        {% endfor %}
-                        </tbody>
-                    </table>
-                    </div>
-
-                <a href="#timetableModal" id="timetable_add" role="btn btn-success" class="btn btn-success" data-toggle="modal"><i class="icon-plus-sign icon-white"></i> Добавить program</a>
-                {% else %}
-                    <p>Деловую программу можно добавлять только после введения основных данных</p>
-                {% endif %}
-
-
-                </div>
-            </div>
+{#            <div class="box span8">#}
+{#                <div class="box-header well">#}
+{#                    <h2><i class="icon-pencil"></i>Деловая программа</h2>#}
+{#                </div>#}
+{#                <div class="box-content">#}
+{#                {% if object %}#}
+{#                    <div id="timetable_wrap">#}
+{#                    <table class="table">#}
+{#                        <colgroup>#}
+{#                           <col span="1" style="width: 35%;">#}
+{#                           <col span="1" style="width: 10%;">#}
+{#                           <col span="1" style="width: 10%;">#}
+{#                           <col span="1" style="width: 25%;">#}
+{#                            <col span="1" style="width: 10%;">#}
+{#                            <col span="1" style="width: 10%;">#}
+{#                        </colgroup>#}
+{#                        <thead>#}
+{#                            <tr>#}
+{#                                <th>Программа</th>#}
+{#                                <th>Начало</th>#}
+{#                                <th>Конец</th>#}
+{#                                <th>Спикеры</th>#}
+{#                                <th>Организатор</th>#}
+{#                                <th>&nbsp;</th>#}
+{#                            </tr>#}
+{##}
+{#                        </thead>#}
+{#                        <tbody>#}
+{#                        {% for timetable in timetables %}#}
+{#                            <tr>#}
+{#                                <td>{{ timetable.programe|safe }}</td>#}
+{#                                <td>{{ timetable.begin|date:"o-m-d H:i" }}</td>#}
+{#                                <td>{{ timetable.end|date:"o-m-d H:i" }}</td>#}
+{#                                <td>{{ timetable.speaker }}</td>#}
+{#                                <td>#}
+{#                                    {{ timetable.timetable_organiser }}#}
+{#                                </td>#}
+{#                                <td>#}
+{#                                    <button class="btn btn-danger remove_timetable" value="{{ timetable.id }}">#}
+{#                                        Удалить#}
+{#                                    </button>#}
+{#                                </td>#}
+{#                            </tr>#}
+{#                        {% endfor %}#}
+{#                        </tbody>#}
+{#                    </table>#}
+{#                    </div>#}
+{##}
+{#                <a href="#timetableModal" id="timetable_add" role="btn btn-success" class="btn btn-success" data-toggle="modal"><i class="icon-plus-sign icon-white"></i> Добавить program</a>#}
+{#                {% else %}#}
+{#                    <p>Деловую программу можно добавлять только после введения основных данных</p>#}
+{#                {% endif %}#}
+{##}
+{##}
+{#                </div>#}
+{#            </div>#}
 
             <div class="box span8">
                 <div class="box-header well">