Merge remote-tracking branch 'origin/master'

TODO

@@ -18,7 +18,7 @@
 - [ ] mark their attendance there as well
 - [ ] view mugshots of other attendees there as well
 - [x] see the people assigned to a task (friends like to do things together) - implemented as tooltip
-- [x] see the the tasks a user has assigned himself to, on his profile (friends like to do things together)
+- [x] see the tasks a user has assigned himself to, on his profile (friends like to do things together)
 - [ ] print schedules for entire task templates (handy for staff members, to get an overview of "their" volunteers)
 - [ ] get an overview of who's supposed to be where for any given date/time, default to "now"
 - [ ] do anything else I might have overlooked

volunteers/init_data/generic_tasks.xml

@@ -3,14 +3,16 @@
     <task template="Buildup">
         <name>Buildup</name>
         <counter>1</counter>
-        <description>Any bit of time you can spare on Friday will be helpful! Ideally you can be there from 12:00 until
-            ready. Experience learns us we'll be ready between 18:30 and 22:00 (hard deadline, have to leave the
-            building). Just come in as early you can! We'll have some pizza or other food in the evening. Deadline is
-            22:00. Some of us go to the beer event afterwards.
+        <description>
+Buildup is a great task for first-time volunteers, as you will get to know the conference, the volunteers and the staff very well. As a task, it is fairly simple: each year we have to convert five university buildings to a location fit for FOSDEM.
+
+There are many jobs to do: setting up stands, covering the wall with the famous brown paper, running cables, putting up signs, etc. While carrying heavy stuff around is sometimes required, other work requires a more delicate touch.
+
+We usually start at 12:00 and hope to finish before 19:00 (we have to leave the building at 22:00, so that's our deadline). Around that time, someone will bring food for everyone, usually Chinese.
 
-            This task includes many subtasks. Some require carrying heavy stuff around, some don't. We need to set up
-            stands (tables, chairs), cover the walls in brown paper, put signalization in place, run power cords, ...
-            There will be 3 work areas, each with their own coordinator.
+As you can imagine, this is a mammoth task, and more volunteers are always wanted. So if you can't make it at 12:00, come a little later. There will be enough work to do to keep you busy, don't worry!
+
+You can find more details on our wiki at https://github.com/FOSDEM/volunteers/wiki/Build%E2%80%90up .
         </description>
         <day>-1</day>
         <start_time>12:00</start_time>
@@ -68,15 +70,14 @@
     <task template="Cleanup">
         <name>Cleanup</name>
         <counter>1</counter>
-        <description>We need to leave the premises in a presentable state. Everything we bring and set up must be torn
-            down and removed. All signalization removed, network torn down (go wild; we don't reuse the cables!), tables
-            and chairs stacked so the rental company can load them up when they retrieve them, the floors wiped, ...
-
-            Don't damage the building, but make sure none of our stuff remains behind.
+        <description>
+            We need to leave the premises in a presentable state. Everything we bring and set up must be torn down and removed. All signalization removed, network torn down (go wild; we don't reuse the cables!), tables and chairs stacked so the rental company can load them up when they retrieve them, the floors wiped, ...
 
-            Normally we're finished around 9pm, but we stay until we're done.
+Normally we're finished around 9pm, but we stay until we're done.
 
-            As many volunteers as possible! That way, it won't take too long. :)
+As many volunteers as possible! That way, it won't take too long. :)
+
+You can read more on our wiki at https://github.com/FOSDEM/volunteers/wiki/Clean%E2%80%90up .
         </description>
         <day>1</day>
         <start_time>18:00</start_time>

volunteers/static/css/master.css

@@ -1056,19 +1056,32 @@ ul.faq {
         display: block;
         text-align: center;
     }
+
+    tbody td {
+        margin: 0.25rem 0.5rem;
+    }
+
     table.task_list tbody tr.category th:nth-child(2) {
         padding-top: 40px;
         padding-bottom: 40px;
         cursor: pointer;
         color: #0088cc;
         text-decoration: none;
     }
-
+    
     table.task_list tbody tr.day th:first-child {
         text-align: center;
         padding-top: 40px;
         padding-bottom: 40px;
     }
+
+    table.task_list tbody tr td:first-child {
+        margin-top: 1rem;
+    }
+
+    table.task_list tbody tr td:last-child {
+        margin-bottom: 1rem;
+    }
 
     form.task_list fieldset {
         margin: 0px;

volunteers/templates/static/promo.html

@@ -17,7 +17,7 @@ <h2 class="intro"><span>FOSDEM</span><br/>Volunteering</h2>
     </li>
 
     <li><h3>Location</h3>
-        <p>FOSDEM 2023 will be returning the the ULB in Brussels, Belgium, while continuing to offer an online presence.</p>
+        <p>FOSDEM 2024 will be returning to the ULB in Brussels, Belgium, while continuing to offer an online presence.</p>
     </li>
 
     <li><h3>Volunteering</h3>
@@ -36,16 +36,17 @@ <h2 class="intro"><span>FOSDEM</span><br/>Volunteering</h2>
 	    <p>Real time chat is bridged between matrix and irc:
 	       <ul>
    	         <li><a href='https://matrix.to/#/#volunteers:fosdem.org'>#fosdem-volunteers</a> on matrix (<a href='https://chat.fosdem.org/#/room/#volunteers:fosdem.org'>webchat</a>)</li>
-            <li><a href="irc://irc.libera.chat/fosdem-volunteers">#fosdem-volunteers</a> (<a href="https://web.libera.chat/#fosdem-volunteers">webchat</a>) on <a href="https://irc.libera.chat/">libera chat</a></li>
 	       </ul>
 	    </p>
     </li>
 
     <li><h3>Real People</h3>
         <p><strong>Pieter De Praetere</strong></p>
-            <p><a href="mailto:[email protected]">[email protected]</a></p>
+        <p><a href="mailto:[email protected]">Send Pieter an email</a></p>
         <p><strong>Kristian Schuhmacher</strong></p>
-		    <p><a href="mailto:[email protected]">[email protected]</a></p>
+		<p><a href="mailto:[email protected]">Send Kristian an email</a></p>
+        <p><strong>Dan Clark</strong></p>
+		<p><a href="mailto:[email protected]">Send Dan an email</a></p>
     </li>
 </ul>
 {% endblock %}

volunteers/templates/volunteers/tasks.html

@@ -61,7 +61,7 @@
     </fieldset>
     {% endif %}
     {% if not setup_for_current_year_complete %}
-        <legend class="task_list">We're still setting up the system for this year's edition of FOSDEM!</legend><br/>
+        <legend class="task_list">All tasks are now published - we look forward to seeing you at the ULB</legend><br/>
         <table>
             <tr>
                 <td><img style="height: 100px;" src="/static/img/octicon-alert.svg"/></td>