Skip to content

Commit

Permalink
Added tabs to the organizer page
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphaelm
raphaelm committed Jan 27, 2017
1 parent d6503e3 commit 123f47a
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 24 deletions.
2 changes: 1 addition & 1 deletion doc/development/api/general.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Backend
-------

.. automodule:: pretix.control.signals
:members: nav_event, html_head, quota_detail_html, nav_topbar
:members: nav_event, html_head, quota_detail_html, nav_topbar, organizer_edit_tabs


.. automodule:: pretix.base.signals
Expand Down
11 changes: 11 additions & 0 deletions src/pretix/control/signals.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,14 @@
As with all plugin signals, the ``sender`` keyword argument will contain the event.
"""

organizer_edit_tabs = Signal(
providing_args=['organizer']
)
"""
This signal is sent out to include tabs on the detail page of an organizer. Receivers
should return a tuple with the first item being the tab title and the second item
being the content as HTML. The receivers get the ``organizer`` as a keyword argument.
This is a regular django signal (no pretix event signal).
"""
72 changes: 49 additions & 23 deletions src/pretix/control/templates/pretixcontrol/organizers/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,32 @@
<h1>
{% blocktrans with name=organizer.name %}Organizer: {{ name }}{% endblocktrans %}
<a href="{% url "control:organizer.edit" organizer=organizer.slug %}"
class="btn btn-default">
class="btn btn-default">
<span class="fa fa-edit"></span>
{% trans "Edit" %}
</a>
</h1>
<div class="row">
<div class="{% if request.orgaperm.can_change_permissions %}col-lg-6{% endif %} col-xs-12">
<fieldset>
<legend>{% trans "Events" %}</legend>
<ul class="nav nav-tabs">
<li class="active">
<a href="#tab-events" data-toggle="tab">{% trans "Events" %}</a>
</li>
{% if request.orgaperm.can_change_permissions %}
<li>
<a href="#tab-permissions" data-toggle="tab">{% trans "Team" %}</a>
</li>
{% endif %}
{% for title, content in tabs %}
<li>
<a href="#tab-{{ forloop.index }}" data-toggle="tab">
{{ title }}
</a>
</li>
{% endfor %}
</ul>

<div class="tab-content organizer-tabs">
<div class="tab-pane active" id="tab-events">
<div class="tab-inner">
{% if events|length == 0 %}
<p>
<em>{% trans "You currently do not have access to any events." %}</em>
Expand All @@ -31,7 +48,8 @@ <h1>
{% for e in events %}
<tr>
<td>
<strong><a href="{% url "control:event.index" organizer=e.organizer.slug event=e.slug %}">{{ e.name }}</a></strong>
<strong><a
href="{% url "control:event.index" organizer=e.organizer.slug event=e.slug %}">{{ e.name }}</a></strong>
</td>
<td>{{ e.get_date_from_display }}</td>
</tr>
Expand All @@ -43,24 +61,25 @@ <h1>
<span class="fa fa-plus"></span>
{% trans "Create a new event" %}
</a>
</fieldset>
</div>
</div>

{% if request.orgaperm.can_change_permissions %}
<div class="col-lg-6 col-xs-12">
<form action="" method="post" class="form-horizontal form-permissions">
{% csrf_token %}
<fieldset>
<legend>{% trans "Team" %}</legend>
<div class="tab-pane" id="tab-permissions">
<div class="tab-inner">
<form action="" method="post" class="form-horizontal form-permissions">
{% csrf_token %}
<p>
{% blocktrans trimmed %}
You can use the following list to control who can create new events in the name of this
organizer and who can add more people to this list. This does <strong>not</strong>
You can use the following list to control who can create new events in the name of
this organizer and who can add more people to this list. This does <strong>not</strong>
control who has access to a particular event. You can control the access to an
event in the "Permissions" section of the event's settings. A user does not need to be
on the list here to get access to an event.
event in the "Permissions" section of the event's settings. A user does not need to
be on the list here to get access to an event.
{% endblocktrans %}
</p>
<p>
{% trans "Everyone on this list can control the organizer settings on this page." %}
</p>

{% bootstrap_formset_errors formset %}
{{ formset.management_form }}
Expand All @@ -84,7 +103,7 @@ <h1>
{% else %}
{{ form.instance.invite_email }}
<span class="fa fa-envelope-o" data-toggle="tooltip"
title="{% trans "invited, pending response" %}"></span>
title="{% trans "invited, pending response" %}"></span>
{% endif %}
</td>
<td>{{ form.can_create_events }}</td>
Expand All @@ -98,9 +117,9 @@ <h1>
<td colspan="9">
<strong>{% trans "Adding a new user" %}</strong><br>
{% blocktrans trimmed %}
To add a new user, you can enter their email address here. If they already have a
pretix account, they will immediately be added to the team. Otherwise, they will
be sent an email with an invitation.
To add a new user, you can enter their email address here. If they
already have a pretix account, they will immediately be added to the team.
Otherwise, they will be sent an email with an invitation.
{% endblocktrans %}
</td>

Expand All @@ -125,9 +144,16 @@ <h1>
</button>
</div>

</fieldset>
</form>
</form>
</div>
</div>
{% endif %}
{% for title, content in tabs %}
<div class="tab-pane" id="tab-{{ forloop.index }}">
<div class="tab-inner">
{{ field }}
</div>
</div>
{% endfor %}
</div>
{% endblock %}
3 changes: 3 additions & 0 deletions src/pretix/static/pretixcontrol/scss/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ h1 .btn-sm {
}
}

.organizer-tabs .tab-inner {
padding-top: 20px;
}

.helper-display-inline {
display: inline !important;
Expand Down

0 comments on commit 123f47a

Please sign in to comment.