Merge pull request 'aequatorpreis' (#732) from aequatorpreis into staging

Reviewed-on: #732

templates/achievement.html.tera

@@ -10,12 +10,20 @@
                 <thead>
                     <tr>
                         <th>Name</th>
-			<th>Erster Log</th>
+                        <th>Erster Log</th>
-			<th>Letzter Log</th>
+                        <th>Letzter Log</th>
-			<th>Gesamt-KM</th>
+                        <th>Gesamt-KM</th>
                         <th>Äquatorpreis (ÄP)</th>
-			<th>ÄP diese<br>Saison bekommen</th>
+                        <th>
-                        <th>Fahrtenabzeichen (FA)<br>geschafft</th>
+                            ÄP diese
+                            <br>
+                            Saison bekommen
+                        </th>
+                        <th>
+                            Fahrtenabzeichen (FA)
+                            <br>
+                            geschafft
+                        </th>
                         <th>FA - KM</th>
                         <th>FA - fehlende KM</th>
                         <th>Eintagesausfahrten</th>
@@ -28,15 +36,21 @@
                         {% set achievement = person.1 %}
                         <tr>
                             <td>{{ user.name }}</td>
-			    <td>{% if achievement.year_first_mentioned %}{{ achievement.year_first_mentioned }}{% endif %}</td>
-			    <td>{% if achievement.year_last_mentioned %}{{ achievement.year_last_mentioned }}{% endif %}</td>
-			    <td>{{ achievement.all_time_km }}</td>
                             <td>
-                                {{ achievement.curr_equatorprice_name }}
+                                {% if achievement.year_first_mentioned %}{{ achievement.year_first_mentioned }}{% endif %}
+                            </td>
+                            <td>
+                                {% if achievement.year_last_mentioned %}{{ achievement.year_last_mentioned }}{% endif %}
+                            </td>
+                            <td>{{ achievement.all_time_km }}</td>
+                            <td>{{ achievement.curr_equatorprice_name }}</td>
+                            <td>
+                                {% if achievement.new_equatorprice_this_season %}
+                                    🎉
+                                {% else %}
+                                    -
+                                {% endif %}
                             </td>
-			    <td>
-                                {% if achievement.new_equatorprice_this_season %}🎉{% else %}-{% endif %}
-			    </td>
                             {% if achievement.rowingbadge %}
                                 {% set badge = achievement.rowingbadge %}
                                 <td>

templates/index.html.tera

@@ -74,9 +74,30 @@
                 </div>
             {% endif %}
             {% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
+                <dialog id="call-for-action" class="max-w-screen-sm dark:bg-primary-600 dark:text-white rounded-md" onclick="document.getElementById('call-for-action').close()">
+		<div onclick="event.stopPropagation();" class="p-3">
+		    <button type="button" onclick="document.getElementById('call-for-action').close()" title="Schließen" class="sidebar-close border-0 bg-primary-100 focus:bg-primary-50 text-black flex items-center justify-center transform rotate-45 absolute right-0 mr-3"><svg class="inline h-5 w-5" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+    <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+</svg>
+</button>
+<div class="mt-8">
+<p>
+                    Du hast Ideen für sinnvolle neue Funktionen für diese Ruderapp? Melde dich bei Philipp, Marie oder <a href="mailto:it@rudernlinz.at" class="underline">it@rudernlinz.at</a>.
+		    </p>
+<p class="mt-3">
+		    
+Wenn du darüber hinaus Lust hast, deine Skills in ein Projekt zu stecken, das Wellen schlagen wird (😀), dann komm an Bord! Wir sind offen für frische Ideen, haben jedoch auch selber noch genügend; langweilig wird uns bestimmt nicht.
+</p>
+		    </div>
+		    </div>
+                </dialog>
                 <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                      role="alert">
-                    <h2 class="h2">Persönliches</h2>
+                    <h2 class="h2">
+                        Persönliches
+                        <span class="text-xl"
+                              onclick="document.getElementById('call-for-action').showModal()">💡</span>
+                    </h2>
                     <div class="mx-2 divide-y divide-gray-200 dark:divide-primary-600">
                         <div class="py-3">
                             <details>
@@ -93,7 +114,7 @@
                                         {% if achievements.rowingbadge %}{{ achievements.rowingbadge.year }}{% endif %}
                                         <span><a href="http://www.rudern.at/OFFICE/Downloads/Ausschreibungen/2022/Wanderfahrten//Fahrtenabzeichen%20%C3%84quatorpreis%20und%20Danubius%202022.pdf"
    target="_blank"
-   class="w-6 h-6 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2">?</a></span>
+   class="w-6 h-6 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2 text-white">?</a></span>
                                     </h3>
                                 </summary>
                                 {% if achievements.rowingbadge %}
@@ -105,7 +126,7 @@
                                               value="{{ badge.rowed_km }}"
                                               max="{{ badge.required_km }}"></progress>
                                     <h4 class="font-bold mt-4">Wanderfahrten</h4>
-                                    <div>Nur 1 muss erreicht werden</div>
+                                    <div>Nur eine der folgenden Optionen muss erreicht werden:</div>
                                     <ol class="list-decimal ml-4 my-3">
                                         <li>
                                             {% if badge.multi_day_trips_over_required_distance | length >= 1 %}
@@ -163,7 +184,7 @@
                                         Äquatorpreis
                                         <span><a href="http://www.rudern.at/OFFICE/Downloads/Ausschreibungen/2022/Wanderfahrten//Fahrtenabzeichen%20%C3%84quatorpreis%20und%20Danubius%202022.pdf"
    target="_blank"
-   class="w-6 h-6 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2">?</a></span>
+   class="w-6 h-6 inline-flex align-center justify-center rounded-full bg-primary-500 ml-2 text-white">?</a></span>
                                     </h3>
                                 </summary>
                                 <div class="mt-3">