CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix #379 -- Add logo to event organizers (#431)

Browse Source 
* [WIP] Add logo to event organizers.

* Fix indentation issues.

* Refactor code

Refactor code

Refactor code

* Add new migration

* Take files into account for organizer sform (settings form)

* Fix grammer

* Make bootstrap form errors specific to each fieldset

* Display logo on organizer's page

* Fix PR issues

Fix PR issues

Fix PR issues

* Reorder imports

* Remove conflicting migration

* Fix rebase conflict
This commit is contained in:
Bolutife Lawrence
2017-05-08 16:46:35 +01:00
committed by Raphael Michel
parent b301d20488
commit 962cdef69a
8 changed files with 89 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/presale/context.py
View File

@@ -54,6 +54,10 @@ def contextprocessor(request):
ctx['event_logo'] = request.event.settings.get('logo_image', as_type=str, default='')[7:]
ctx['event'] = request.event
if hasattr(request, 'organizer'):
ctx['organizer_logo'] = request.organizer.settings.get('organizer_logo_image', as_type=str, default='')[7:]
ctx['organizer'] = request.organizer
ctx['html_head'] = "".join(_html_head)
ctx['html_foot'] = "".join(_html_foot)
ctx['footer'] = _footer

10
src/pretix/presale/templates/pretixpresale/event/base.html
View File

@@ -22,16 +22,18 @@
{% endblock %}
{% block page %}
<div class="page-header">
<h1 class="pull-left">
<div class="pull-left">
{% if event_logo %}
<a href="{% eventurl event "presale:event.index" %}" title="{{ event.name }}">
<img src="{{ event_logo|thumbnail_url:'logo' }}" alt="{{ event.name }}" class="event-logo" />
</a>
{% else %}
<a href="{% eventurl event "presale:event.index" %}">{{ event.name }}</a>
<small>{{ event.get_date_range_display }}</small>
<h1>
<a href="{% eventurl event "presale:event.index" %}">{{ event.name }}</a>
<small>{{ event.get_date_range_display }}</small>
</h1>
{% endif %}
</h1>
</div>
<div class="pull-right loginbox">
{% if request.event.settings.locales|length > 1 %}
<div class="locales">

13
src/pretix/presale/templates/pretixpresale/organizers/base.html
View File

@@ -1,15 +1,22 @@
{% extends "pretixpresale/base.html" %}
{% load i18n %}
{% load staticfiles %}
{% load thumbnail %}
{% load eventurl %}
{% block thetitle %}
{% block title %}{% endblock %}{% if url_name != "organizer.index" %} :: {% endif %}{{ organizer.name }}
{% endblock %}
{% block page %}
<div class="page-header">
<h1 class="pull-left">
<a href="{% eventurl organizer "presale:organizer.index" %}">{{ organizer.name }}</a>
</h1>
<div class="pull-left">
{% if organizer_logo %}
<a href="{% eventurl organizer "presale:organizer.index" %}" title="{{ organizer.name }}">
<img src="{{ organizer_logo|thumbnail_url:'logo' }}" alt="{{ organizer.name }}" class="organizer-logo" />
</a>
{% else %}
<h1><a href="{% eventurl organizer "presale:organizer.index" %}">{{ organizer.name }}</a></h1>
{% endif %}
</div>
<div class="clearfix"></div>
</div>
{% if messages %}