diff --git a/aleksis/apps/paweljong/forms.py b/aleksis/apps/paweljong/forms.py index 2777d222ee4fa485b0327c834ce5ee5bdeeb4a1b..c864f82da15981bb728a2a7ee16344ba70a950c5 100644 --- a/aleksis/apps/paweljong/forms.py +++ b/aleksis/apps/paweljong/forms.py @@ -499,4 +499,5 @@ class PersonGroupFormPerson(forms.Form): required=True, label=_("Person"), widget=forms.TextInput(attrs={"autofocus": "", "autocomplete": "off"}), + help_text=_("Please enter a username."), ) diff --git a/aleksis/apps/paweljong/tables.py b/aleksis/apps/paweljong/tables.py index afd35341ca6b16ad89e8a3e33ab862e467b87832..bc2db25c37fa8d1c25ae992e5f6333539427b01d 100644 --- a/aleksis/apps/paweljong/tables.py +++ b/aleksis/apps/paweljong/tables.py @@ -143,3 +143,10 @@ class ChildGroupsTable(tables.Table): verbose_name=_("Add persons"), text=_("Add persons"), ) + + +class AdditionalFieldsTable(tables.Table): + class Meta: + attrs = {"class": "highlight"} + + title = tables.LinkColumn("edit_additional_field_by_id", args=[A("id")]) diff --git a/aleksis/apps/paweljong/templates/paweljong/event/detail.html b/aleksis/apps/paweljong/templates/paweljong/event/detail.html index 75616218f7f00168e9b295f92b08107e425ed98e..1adf1eb19146dbd5e621ee7b7aadb28936c8a262 100644 --- a/aleksis/apps/paweljong/templates/paweljong/event/detail.html +++ b/aleksis/apps/paweljong/templates/paweljong/event/detail.html @@ -77,11 +77,16 @@ </div> </div> - <h5>{% blocktrans %}Additional fields{% endblocktrans %}</h5> - {% render_table additional_fields_table %} - - <h5>{% blocktrans %}Child groups{% endblocktrans%}</h5> - {% render_table child_groups_table %} + <div class="row"> + <div class="col s3"> + <h5>{% blocktrans %}Additional fields{% endblocktrans %}</h5> + {% render_table additional_fields_table %} + </div> + <div class="col s9"> + <h5>{% blocktrans %}Child groups{% endblocktrans%}</h5> + {% render_table child_groups_table %} + </div> + </div> <h5>{% blocktrans %}Registrations{% endblocktrans %}</h5> {% render_table registrations_table %} diff --git a/aleksis/apps/paweljong/views.py b/aleksis/apps/paweljong/views.py index b032c06c67748284361aa0aa89567027df7f6dd3..5dae95721111d0cdbfc73b18f07f449b487547fc 100644 --- a/aleksis/apps/paweljong/views.py +++ b/aleksis/apps/paweljong/views.py @@ -25,7 +25,6 @@ from templated_email import send_templated_mail from aleksis.apps.postbuero.models import MailAddress from aleksis.core.mixins import AdvancedCreateView, AdvancedDeleteView, AdvancedEditView from aleksis.core.models import Activity, Group, Person -from aleksis.core.tables import AdditionalFieldsTable from aleksis.core.util import messages from aleksis.core.util.core_helpers import get_site_preferences, objectgetter_optional @@ -43,6 +42,7 @@ from .forms import ( ) from .models import Event, EventRegistration, InfoMailing, RegistrationState, Terms, Voucher from .tables import ( + AdditionalFieldsTable, ChildGroupsTable, EventRegistrationsTable, InfoMailingsTable,