.gitlab-ci.yml

@@ -347,6 +347,8 @@ build_test:
         SELECTED_CONFERENCE_ID: "017c0749-a2ea-4f86-92cd-e60b4508dd98"
   before_script:
     - pip3 install requests
+    # TODO: remove this sleep once we have debugged the case for the 0 ms failure
+    - sleep 30
     - echo "testing on $BASE_URL"
     - curl --max-time 8 --retry 3 --fail ${BASE_URL}/.well-known/version
     - curl --max-time 3 --retry 3 --fail ${BASE_URL}/.well-known/health

src/backoffice/forms/assemblies.py

@@ -141,6 +141,10 @@ class AssemblyApplicationAddForm(forms.Form):
 class AssemblyMemberAddForm(forms.Form):
     name = forms.CharField()
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].widget.attrs['placeholder'] = _('username')
+
 
 class AssemblyMemberEditForm(forms.ModelForm):
     class Meta:

src/backoffice/locale/de/LC_MESSAGES/django.po

@@ -26,6 +26,9 @@ msgstr "Dieser Kurzname wird bereits von einer anderen Assembly benutzt."
 msgid "Assembly__tags__splitwithcomma"
 msgstr "Mehrere Tags bitte mit einem Komma trennen."
 
+msgid "username"
+msgstr "Benutzername"
+
 msgid "AssemblyMember__needamanager"
 msgstr "Mindestens ein Mitglied muss die Assembly verwalten können!"
 
@@ -165,6 +168,9 @@ msgstr "Hier kannst du ein Token anfordern mit dem deine Assembly z.B. Badges an
 msgid "Assembly__technical_user"
 msgstr "technischer Benutzer"
 
+msgid "Assembly__technical_user__info"
+msgstr "Ein technischer Benutzer wird angelegt sobald ein Token erstellt wird. Der Token wird dann dem technischen Benutzer zugewiesen."
+
 msgid "Assembly__technical_user__none_yet"
 msgstr "noch nicht angelegt (geschieht bei Bedarf automatisch)"
 
@@ -177,6 +183,9 @@ msgstr "neues Token anfordern"
 msgid "authentication__applications"
 msgstr "Applikationen"
 
+msgid "Assembly__applications__info"
+msgstr "Verwalte deine OAuth2 Anwendungen hier. Sobald die Assembly veröffentlicht ist kannst du OAuth2-basierte Authentifizierung in deiner Anwendung verwenden und damit allen Hub-Nutzenden ermöglichen sich mit ihrem Hub-Account anzumelden."
+
 msgid "Assembly__authentication-name"
 msgstr "Name"
 
@@ -589,15 +598,27 @@ msgstr "Hier sind alle Mitglieder deiner Assembly aufgeführt, es können jeweil
 msgid "AssemblyMember__is_representative"
 msgstr "Repräsentant"
 
+msgid "AssemblyMember__is_representative__help"
+msgstr "Diese Person ist offizieller Ansprechpartner der Assembly. Sie werden hervorgehoben wenn öffentlich angezeigt und können von der Orga kontaktiert werden."
+
 msgid "AssemblyMember__can_manage_assembly"
 msgstr "kann Assembly verwalten"
 
+msgid "AssemblyMember__can_manage_assembly__help"
+msgstr "Diese Person kann die Assembly verwalten, d.h. Räume, Veranstaltungen und Mitglieder anlegen, bearbeiten oder löschen."
+
 msgid "AssemblyMember__is_technical_contact"
 msgstr "technische Ansprechperson"
 
+msgid "AssemblyMember__is_technical_contact__help"
+msgstr "Ansprechperson für technische Fragen der Vor-Ort-Assembly, z.B. Strom und Netzwerk"
+
 msgid "AssemblyMember__show_public"
 msgstr "öffentlich zeigen"
 
+msgid "AssemblyMember__show_public__help"
+msgstr "Zugehörigkeit öffentlich anzeigen?"
+
 msgid "AssemblyMember__actions"
 msgstr "Aktionen"
 
@@ -605,10 +626,10 @@ msgid "Assembly__members__edit"
 msgstr "bearbeiten"
 
 msgid "Assembly__members__hide"
-msgstr "ausblenden"
+msgstr "öffentlich ausblenden"
 
 msgid "Assembly__members__show"
-msgstr "anzeigen"
+msgstr "öffentlich anzeigen"
 
 msgid "Assembly__members__delete"
 msgstr "löschen"
@@ -1163,9 +1184,6 @@ msgstr "Projekt Banner"
 msgid "PlatformUser__type"
 msgstr "Typ"
 
-msgid "username"
-msgstr "Benutzername"
-
 # use translation from core
 msgid "PlatformUser__display_name"
 msgstr ""

src/backoffice/locale/en/LC_MESSAGES/django.po

@@ -26,6 +26,9 @@ msgstr "This slug is already used by another assembly."
 msgid "Assembly__tags__splitwithcomma"
 msgstr "Split multiple tags by comma."
 
+msgid "username"
+msgstr ""
+
 msgid "AssemblyMember__needamanager"
 msgstr "At least one member must be able to manage the assembly!"
 
@@ -63,7 +66,7 @@ msgid "Event__schedule_start__placeholder"
 msgstr "YYYY-mm-dd HH:MM"
 
 msgid "Event__room"
-msgstr "room"
+msgstr "Room"
 
 msgid "Room-duplicatename"
 msgstr "A room with this name already exists."
@@ -157,7 +160,7 @@ msgid "assembly_additionalfield_required"
 msgstr "This field must not be empty."
 
 msgid "Assembly__authentication"
-msgstr "authentication"
+msgstr "Authentication"
 
 msgid "Assembly__authentication__introduction"
 msgstr "Here you can receive a token to use our API and e.g. award badges to named users. Additionally, you can configure OAuth2 applications which can later request OAuth2-based authentication of conference users."
@@ -165,6 +168,9 @@ msgstr "Here you can receive a token to use our API and e.g. award badges to nam
 msgid "Assembly__technical_user"
 msgstr "technical user"
 
+msgid "Assembly__technical_user__info"
+msgstr "A technical user will be added once a token is created. The token will be assigned to that technical user."
+
 msgid "Assembly__technical_user__none_yet"
 msgstr "not created yet (will be automatically on demand)"
 
@@ -175,7 +181,10 @@ msgid "Assembly__authentication__gettoken"
 msgstr "request a new token"
 
 msgid "authentication__applications"
-msgstr "applications"
+msgstr "Applications"
+
+msgid "Assembly__applications__info"
+msgstr "Manage your OAuth2 applications here. Once the assembly is published you can integrate OAuth2 based authentication into your application and allow any hub user to authenticate to your application with their hub account."
 
 msgid "Assembly__authentication-name"
 msgstr "name"
@@ -589,15 +598,27 @@ msgstr "Here you find all members of your assembly, each of them can have one or
 msgid "AssemblyMember__is_representative"
 msgstr "representative"
 
+msgid "AssemblyMember__is_representative__help"
+msgstr "This is an official spokesperson for the assembly. They will be highlighted if shown publicly and might get contacted by the orga team."
+
 msgid "AssemblyMember__can_manage_assembly"
 msgstr "can manage assembly"
 
+msgid "AssemblyMember__can_manage_assembly__help"
+msgstr "This person may manage the assembly, i.e. create/edit/delete rooms, events or members."
+
 msgid "AssemblyMember__is_technical_contact"
 msgstr "technical contact"
 
+msgid "AssemblyMember__is_technical_contact__help"
+msgstr "This person is able to clarify technical questions of the on-site assembly regarding e.g. power and network."
+
 msgid "AssemblyMember__show_public"
 msgstr "show public"
 
+msgid "AssemblyMember__show_public__help"
+msgstr "Shall the membership be shown publically?"
+
 msgid "AssemblyMember__actions"
 msgstr "Actions"
 
@@ -605,10 +626,10 @@ msgid "Assembly__members__edit"
 msgstr "edit"
 
 msgid "Assembly__members__hide"
-msgstr "hide"
+msgstr "hide publicly"
 
 msgid "Assembly__members__show"
-msgstr "show"
+msgstr "show publicly"
 
 msgid "Assembly__members__delete"
 msgstr "delete"
@@ -1165,9 +1186,6 @@ msgstr "project banner"
 msgid "PlatformUser__type"
 msgstr ""
 
-msgid "username"
-msgstr ""
-
 # use translation from core
 msgid "PlatformUser__display_name"
 msgstr ""
@@ -1240,7 +1258,7 @@ msgid "StaticPage__slug"
 msgstr ""
 
 msgid "Projects"
-msgstr "projects"
+msgstr "Projects"
 
 msgid "Project__Assembly_create"
 msgstr "Create assembly project"
@@ -1297,7 +1315,7 @@ msgid "Project__publish__introduction"
 msgstr "The event is currently not yet public! With the publication this event will be visible for everyone. Please check all data beforehand!"
 
 msgid "Project__edit-metadata"
-msgstr "project data"
+msgstr "Project Data"
 
 msgid "Project__submit"
 msgstr "Save event"

src/backoffice/templates/backoffice/assembly_auth.html

@@ -19,7 +19,8 @@
           <p>{% trans "Assembly__authentication__introduction" %}</p>
 
           <p>
-            {% trans "Assembly__technical_user" %}:
+            {% trans "Assembly__technical_user" %} <i title="{% trans "Assembly__technical_user__info" %}"
+    class="bi bi-info-circle-fill text-primary"></i>:
             {% if assembly.technical_user_id is None %}
               <span class="text-info">{% trans "Assembly__technical_user__none_yet" %}</span>
             {% else %}
@@ -43,7 +44,10 @@
   <div class="row mt-3 pb-10rem">
     <div class="col-md-12">
       <div class="card border-primary">
-        <div class="card-header bg-primary text-white">{% trans "authentication__applications" %}</div>
+        <div class="card-header bg-primary text-white">
+          {% trans "authentication__applications" %} <i title="{% trans "Assembly__applications__info" %}"
+    class="bi bi-info-circle-fill text-light"></i>
+        </div>
         <div class="card-body">
           <table class="table table-striped table-hover">
             <thead>

src/backoffice/templates/backoffice/assembly_members.html

@@ -24,10 +24,22 @@
                 <tr>
                   <th>Name</th>
                   {% if staff_mode %}<th>Mail</th>{% endif %}
-                  <th title="{% trans "AssemblyMember__is_representative" %}">R</th>
-                  <th title="{% trans "AssemblyMember__can_manage_assembly" %}">M</th>
-                  <th title="{% trans "AssemblyMember__is_technical_contact" %}">T</th>
-                  <th title="{% trans "AssemblyMember__show_public" %}">S</th>
+                  <th title="{% trans "AssemblyMember__is_representative" %}">
+                    R <i title="{% trans "AssemblyMember__is_representative__help" %}"
+    class="bi bi-info-circle-fill text-primary"></i>
+                  </th>
+                  <th title="{% trans "AssemblyMember__can_manage_assembly" %}">
+                    M <i title="{% trans "AssemblyMember__can_manage_assembly__help" %}"
+    class="bi bi-info-circle-fill text-primary"></i>
+                  </th>
+                  <th title="{% trans "AssemblyMember__is_technical_contact" %}">
+                    T <i title="{% trans "AssemblyMember__is_technical_contact__help" %}"
+    class="bi bi-info-circle-fill text-primary"></i>
+                  </th>
+                  <th title="{% trans "AssemblyMember__show_public" %}">
+                    S <i title="{% trans "AssemblyMember__show_public__help" %}"
+    class="bi bi-info-circle-fill text-primary"></i>
+                  </th>
                   {% if can_manage %}
                     <th>{% trans "AssemblyMember__actions" %}</th>
                   {% endif %}
@@ -103,7 +115,7 @@
               <label class="visually-hidden" for="id_role">Role</label>
               {% render_field form.role class+="form-control form-control-sm me-1" %}
               <label class="visually-hidden" for="id_name">Name</label>
-              {% render_field form.name class+="form-control form-control-sm me-1" %}
+              {% render_field form.name class+="form-control form-control-sm me-1 mb-1" %}
               <button type="submit" class="btn btn-sm btn-primary">{% trans "Assembly__members__add" %}</button>
             </form>
           </div>

src/core/locale/de/LC_MESSAGES/django.po

@@ -503,13 +503,13 @@ msgid "Badge__image__help %(min_width)d, %(min_height)d, %(max_width)d, %(max_he
 msgstr "Einzubindende Grafik für die Badge (muss quadratisch sein, min %(min_width)dpx/%(min_height)dpx und max %(max_width)dpx/%(max_height)dpx)"
 
 msgid "Badge__state__planned"
-msgstr "planned"
+msgstr "geplant"
 
 msgid "Badge__state__hidden"
-msgstr "hidden badge"
+msgstr "versteckt"
 
 msgid "Badge__state__public"
-msgstr "publicly visible"
+msgstr "öffentlich"
 
 msgid "Badge__name__help"
 msgstr "sprechender Name des Badges"
@@ -521,7 +521,7 @@ msgid "Badge__state"
 msgstr "Status"
 
 msgid "Badge__state__help"
-msgstr "aktueller Status der Badge"
+msgstr "Aktueller Status der Badge. Geplante Badges sind nicht zugänglich. Versteckte Badges können eingelöst werden, werden aber nicht in der öffentlichen Übersicht angezeigt. Öffentliche Badges werden in der Übersicht angezeigt."
 
 msgid "Badge__category__help"
 msgstr "Kategorie die diese Badge zugeordnet ist"

src/core/locale/en/LC_MESSAGES/django.po

@@ -521,7 +521,7 @@ msgid "Badge__state"
 msgstr "Status"
 
 msgid "Badge__state__help"
-msgstr "Current status of the badge"
+msgstr "Current status of the badge. Planned badges are not available to the public. Hidden badges can be redeemed but are not listed in the public badge overview. Public badges are shown in the public overview."
 
 msgid "Badge__category__help"
 msgstr "Category to which this badge is assigned"