CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-10 10:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move comment up, change distances

Browse Source
This commit is contained in:
Phin Wolkwitz
2024-01-22 16:39:03 +01:00
parent 64838c53f1
commit 1c1652e76b
3 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/control/templates/pretixcontrol/event/new_index.html
+54 -52
View File
@@ -7,41 +7,63 @@
{% load eventsignal %}
{% block title %}{{ request.event.name }}{% endblock %}
{% block content %}
<h1>
{{ request.event.name }}
<small>
{% if request.event.has_subevents %}
{% trans "Event series" %}
{% else %}
{{ request.event.get_date_range_display }}
{% endif %}
</small>
</h1>
<div class="helper-space-below">
{% trans "Shop URL:" %}
<span id="shop_url" class="text-muted">{% abseventurl request.event "presale:event.index" %}</span>
<button type="button" class="btn btn-default btn-xs btn-clipboard js-only" data-clipboard-target="#shop_url">
<i class="fa fa-clipboard" aria-hidden="true"></i>
<span class="sr-only">{% trans "Copy to clipboard" %}</span>
</button>
<div class="btn-group helper-display-inline-block">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{% trans "Create QR code" %}" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-qrcode" aria-hidden="true"></i>
<div id="header-area" class="col-lg-8">
<h1>
{{ request.event.name }}
<small>
{% if request.event.has_subevents %}
{% trans "Event series" %}
{% else %}
{{ request.event.get_date_range_display }}
{% endif %}
</small>
</h1>
<div class="helper-space-below">
{% trans "Shop URL:" %}
<span id="shop_url" class="text-muted">{% abseventurl request.event "presale:event.index" %}</span>
<button type="button" class="btn btn-default btn-xs btn-clipboard js-only" data-clipboard-target="#shop_url">
<i class="fa fa-clipboard" aria-hidden="true"></i>
<span class="sr-only">{% trans "Copy to clipboard" %}</span>
</button>
{% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %}
</div>
<br>
<span id="shop_state" class="shop_state">
{{ shop_state.content|safe }}
<a href="{{ shop_state.url }}">
<button type="button" class="btn btn-default btn-xs btn-wrench js-only" href="{{ shop_state.url }}">
<i class="fa fa-wrench" aria-hidden="true"></i>
<span class="sr-only">{% trans "Change shop state" %}</span>
<div class="btn-group helper-display-inline-block">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{% trans "Create QR code" %}" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-qrcode" aria-hidden="true"></i>
</button>
</a>
</span>
<div class="clearfix"></div>
{% include "pretixcontrol/event/fragment_qr_dropdown.html" with url=0 %}
</div>
<br>
<span id="shop_state" class="shop_state">
{{ shop_state.content|safe }}
<a href="{{ shop_state.url }}">
<button type="button" class="btn btn-default btn-xs btn-wrench js-only" href="{{ shop_state.url }}">
<i class="fa fa-wrench" aria-hidden="true"></i>
<span class="sr-only">{% trans "Change shop state" %}</span>
</button>
</a>
</span>
<div class="clearfix"></div>
</div>
</div>
<!-- Comments ----------------------------------------------------------------------------------------------------->
<div class="event-comment col-lg-4">
{% trans "Internal comment" %}
<form class="form" method="post"
action="{% url "control:event.comment" event=request.event.slug organizer=request.event.organizer.slug %}">
{% csrf_token %}
<div class="row">
{% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
</div>
{% if not comment_form.readonly %}
<p class="text-right flip">
<button class="btn btn-default">
{% trans "Update comment" %}
</button>
</p>
{% endif %}
</form>
</div>
<!-- Comments ----------------------------------------------------------------------------------------------------->
<!-- Warnings ----------------------------------------------------------------------------------------------------->
{% if has_overpaid_orders %}
@@ -93,26 +115,6 @@
</div>
{% endif %}
<!-- Warnings ----------------------------------------------------------------------------------------------------->
<!-- Comments ----------------------------------------------------------------------------------------------------->
<div class="widget-container widget-small">
{% trans "Internal comment" %}
<form class="form" method="post"
action="{% url "control:event.comment" event=request.event.slug organizer=request.event.organizer.slug %}">
{% csrf_token %}
<div class="row">
{% bootstrap_field comment_form.comment layout="horizontal" show_help=True show_label=False horizontal_field_class="col-md-12" %}
</div>
{% if not comment_form.readonly %}
<p class="text-right flip">
<br>
<button class="btn btn-default">
{% trans "Update comment" %}
</button>
</p>
{% endif %}
</form>
</div>
<!-- Comments ----------------------------------------------------------------------------------------------------->
{% eventsignal request.event "pretix.control.signals.event_dashboard_top" request=request %}
<!-- Timeline ----------------------------------------------------------------------------------------------------->
src/pretix/control/views/new_dashboard.py
+4 -4
View File
@@ -42,14 +42,14 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView)
can_view_orders = self.request.user.has_event_permission(self.request.organizer, self.request.event,
'can_view_orders',
request=self.request)
can_change_event_settings = self.request.user.has_event_permission(self.request.organizer, self.request.event,
'can_change_event_settings',
request=self.request)
# can_change_event_settings = self.request.user.has_event_permission(self.request.organizer, self.request.event,
# 'can_change_event_settings',
# request=self.request)
ctx = {
'subevent': subevent,
'comment_form': CommentForm(initial={'comment': self.request.event.comment},
readonly=not can_change_event_settings),
readonly=True), # not can_change_event_settings),
}
if subevent:
src/pretix/static/pretixcontrol/scss/_dashboard.scss
+11 -2
View File
@@ -20,7 +20,7 @@
align-self: stretch;
padding: 15px 5px;
border: 5px solid white;
min-height: 160px;
min-height: 140px;
background: #F8F8F8;
}
@@ -34,6 +34,8 @@
.dashboard .widget-container.widget-small {
width: 25%;
margin: 0;
padding: 0;
}
.dashboard .widget-container.widget-lazy-loading {
@@ -73,12 +75,19 @@
.text-add {
display: block;
padding: 10px 0;
//padding: 10px 0;
text-align: center;
font-size: 20px;
}
}
.event-comment {
textarea.form-control {
height: 0;
min-height: 95px;
}
}
.shop_state {
span.live, span.off {
font-size: 16px;