mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

m

Browse Source
remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 7f58bc6bd5
commit 40a1f8a8a2
2 changed files with 58 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      emencia/django/newsletter/mailer.py
  2. 112
      templates/c_admin/conference/conference.html

3
emencia/django/newsletter/mailer.py
Unescape View File

@ -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_str
from django.utils.encoding import smart_unicode from django.utils.encoding import smart_unicode
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.core.files.storage import default_storage
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.exceptions import SuspiciousOperation from django.core.exceptions import SuspiciousOperation
from django.db.models import Q from django.db.models import Q
@ -332,7 +333,7 @@ class NewsLetterSender(object):
if obj is not None: if obj is not None:
logo = getattr(obj, 'logo') logo = getattr(obj, 'logo')
if not 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: else:
logo_path = logo.path logo_path = logo.path

112
templates/c_admin/conference/conference.html
Unescape View File

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

Write Preview
Loading…
Cancel
Save