Merge pull request #92 from Danyc0/fix-col-widths

Fix column widths on task list and task details
FOSDEM · Jan 27, 2025 · a37dbbd · a37dbbd
2 parents 336b36b + fe557bf
commit a37dbbd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/volunteers/templates/static/promo.html b/volunteers/templates/static/promo.html
@@ -34,9 +34,7 @@ <h2 class="intro"><span>FOSDEM</span><br/>Volunteering</h2>
 
     <li><h3>Chat</h3>
 	    <p>Join the Volunteering chat channel on Matrix:
-	       <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>
-	       </ul>
+            <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>)
 	    </p>
     </li>
 

diff --git a/volunteers/templates/volunteers/task_detailed.html b/volunteers/templates/volunteers/task_detailed.html
@@ -10,12 +10,12 @@
         <legend class="task_list">{% trans 'Task' %}</legend>
         <table class="task_list">
             <tr>
-                <th width="20%">{% trans 'When' %}</th>
-                <th width="40%">{% trans 'Title' %}</th>
-                <th width="20%">{% trans 'Attending' %}</th>
-                <th width="20%">{% trans 'Talk' %}</th>
+                <th>{% trans 'When' %}</th>
+                <th>{% trans 'Title' %}</th>
+                <th>{% trans 'Attending' %}</th>
+                <th>{% trans 'Talk' %}</th>
                 {% if task.location %}
-                <th width="20%">{% trans 'Location' %}</th>
+                <th>{% trans 'Location' %}</th>
                 {% endif %}
             </tr>
             <tr>
@@ -40,10 +40,10 @@
                 {% endif %}
             </tr>
             <tr>
-                <th colspan="4" style="border-bottom: none;">&nbsp;</th>
+                <th colspan="{{ task.location|yesno:'5,4' }}" style="border-bottom: none;">&nbsp;</th>
             </tr>
             <tr>
-                <td colspan="4">{{ task.description|linebreaksbr|urlize }}</td>
+                <td colspan="{{ task.location|yesno:'5,4' }}">{{ task.description|linebreaksbr|urlize }}</td>
             </tr>
         </table>
         <br>

diff --git a/volunteers/templates/volunteers/tasks.html b/volunteers/templates/volunteers/tasks.html
@@ -27,11 +27,11 @@
         <table class="task_list">
             <thead>
                 <tr class="table_top_alert">
-                    <th width="10%">{% trans "I'm in" %}!</th>
-                    <th width="55%">{% trans 'Task' %}</th>
-                    <th width="20%">{% trans 'When' %}</th>
-                    <th width="15%">{% trans 'Volunteers' %}</th>
-                    <th width="15%">{% trans 'Location' %}</th>
+                    <th>{% trans "I'm in" %}!</th>
+                    <th>{% trans 'Task' %}</th>
+                    <th>{% trans 'When' %}</th>
+                    <th>{% trans 'Volunteers' %}</th>
+                    <th>{% trans 'Location' %}</th>
                 </tr>
             </thead>
             <tbody>
@@ -82,11 +82,11 @@
         <table class="task_list">
             <thead>
                 <tr class="table_top">
-                    <th width="10%">{% trans "I'm in" %}!</th>
-                    <th width="55%">{% trans 'Task' %}</th>
-                    <th width="20%">{% trans 'When' %}</th>
-                    <th width="15%">{% trans 'Volunteers' %}</th>
-                    <th width="15%">{% trans 'Location' %}</th>
+                    <th>{% trans "I'm in" %}!</th>
+                    <th>{% trans 'Task' %}</th>
+                    <th>{% trans 'When' %}</th>
+                    <th>{% trans 'Volunteers' %}</th>
+                    <th>{% trans 'Location' %}</th>
                 </tr>
             </thead>
             <tbody>
@@ -103,11 +103,7 @@
                 </tr>
                 {% endifchanged %}
                 <tr class="day">
-                    <th class="no_vert_border">{{ day|date:"l" }}</th>
-                    <th class="no_vert_border">&nbsp;</th>
-                    <th class="no_vert_border">&nbsp;</th>
-                    <th class="no_vert_border">&nbsp;</th>
-                    <th class="no_vert_border">&nbsp;</th>
+                    <th class="no_vert_border" colspan="5">{{ day|date:"l" }}</th>
                 </tr>
                     {% for category, category_tasks in categories.items %}
                     {% if category_tasks %}