Skip to content

Commit

Permalink
Merge pull request #98 from Danyc0/improve-time-widths
Browse files Browse the repository at this point in the history
Improve the width of the time columns
  • Loading branch information
Danyc0 authored Jan 30, 2025
2 parents b29cb1c + 0e2c9ba commit 7509ee1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions volunteers/templates/volunteers/talk_detailed.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<legend class="talk_list">{% trans 'Talk' %}</legend>
<table class="talk_list">
<tr>
<th width="20%">{% trans 'When' %}</th>
<th width="40%">{% trans 'Title' %}</th>
<th width="20%">{% trans 'Attending' %}</th>
<th nowrap>{% trans 'When' %}</th>
<th>{% trans 'Title' %}</th>
<th>{% trans 'Attending' %}</th>
{% if talk.location %}
<th width="20%">{% trans 'Location' %}</th>
<th>{% trans 'Location' %}</th>
{% endif %}
</tr>
<tr>
<td>{{ talk.date|date:"D" }}, {{ talk.start_time|time:"H:i" }} - {{ talk.end_time|time:"H:i" }}</td>
<td nowrap>{{ talk.date|date:"D" }}, {{ talk.start_time|time:"H:i" }} - {{ talk.end_time|time:"H:i" }}</td>
<td>
{% if talk.fosdem_url %}
<a href="{{talk.fosdem_url}}">{{ talk.title }}</a>
Expand Down
4 changes: 2 additions & 2 deletions volunteers/templates/volunteers/talks.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<tr>
<th>{% trans "I'm Going" %}!</th>
<th>{% trans 'Title' %}</th>
<th>{% trans 'When' %}</th>
<th nowrap>{% trans 'When' %}</th>
<th>{% trans 'Speaker' %}</th>
</tr>
</thead>
Expand All @@ -25,7 +25,7 @@
<tr>
<td data-title="{% trans 'Going' %}!"><input type="checkbox" name="talk" value="{{ talk.id }}" {{ checked|get_item:talk.id }} /></td>
<td data-title="{% trans 'Title' %}"><a href="{% url 'talk_detailed' talk.id %}">{{ talk.title }}</a></td>
<td data-title="{% trans 'When' %}">{{ talk.date|date:"D" }}, {{ talk.start_time|time:"H:i" }} - {{ talk.end_time|time:"H:i" }}</td>
<td nowrap data-title="{% trans 'When' %}">{{ talk.date|date:"D" }}, {{ talk.start_time|time:"H:i" }} - {{ talk.end_time|time:"H:i" }}</td>
<td data-title="{% trans 'Speaker' %}">{{ talk.speaker }}</td>
</tr>
{% if talk.track != next.track %}
Expand Down
4 changes: 2 additions & 2 deletions volunteers/templates/volunteers/task_detailed.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<legend class="task_list">{% trans 'Task' %}</legend>
<table class="task_list">
<tr>
<th>{% trans 'When' %}</th>
<th nowrap>{% trans 'When' %}</th>
<th>{% trans 'Title' %}</th>
<th>{% trans 'Attending' %}</th>
<th>{% trans 'Talk' %}</th>
Expand All @@ -19,7 +19,7 @@
{% endif %}
</tr>
<tr>
<td>{{ task.date|date:"D" }}, {{ task.start_time|time:"H:i" }} - {{ task.end_time|time:"H:i" }}</td>
<td nowrap>{{ task.date|date:"D" }}, {{ task.start_time|time:"H:i" }} - {{ task.end_time|time:"H:i" }}</td>
<td>{{ task.name }}</td>
<td>
{% if user.is_authenticated %}
Expand Down
8 changes: 4 additions & 4 deletions volunteers/templates/volunteers/tasks.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<tr class="table_top_alert">
<th>{% trans "I'm in" %}!</th>
<th>{% trans 'Task' %}</th>
<th>{% trans 'When' %}</th>
<th nowrap>{% trans 'When' %}</th>
<th>{% trans 'Volunteers' %}</th>
<th>{% trans 'Location' %}</th>
</tr>
Expand All @@ -51,7 +51,7 @@
{% else %}
<td data-title="{% trans 'Task' %}" class="task-name"><a href="{% url 'task_detailed' task.id %}">{{ task.name }}</a></td>
{% endif %}
<td data-title="{% trans 'When' %}" >{{ task.date|date:"D" }}, {{ task.start_time|time:"H:i" }} - {{ task.end_time|time:"H:i" }}</td>
<td nowrap data-title="{% trans 'When' %}" >{{ task.date|date:"D" }}, {{ task.start_time|time:"H:i" }} - {{ task.end_time|time:"H:i" }}</td>
<td data-title="{% trans 'Volunteers' %}" class="task-volunteers {{ task.status_color }}" title="{% trans task.status %}
{% if user.is_authenticated %}<br/><br/>Signed up:<br/>{% for volunteer in task.volunteers.all %}* {{ volunteer.user.first_name }} {{ volunteer.user.last_name}} ({{ volunteer.user }})<br/>{% endfor %}{% endif %}">
{{ task.assigned_volunteers }}/{{ task.nbr_volunteers }}</td>
Expand Down Expand Up @@ -84,7 +84,7 @@
<tr class="table_top">
<th>{% trans "I'm in" %}!</th>
<th>{% trans 'Task' %}</th>
<th>{% trans 'When' %}</th>
<th nowrap>{% trans 'When' %}</th>
<th>{% trans 'Volunteers' %}</th>
<th>{% trans 'Location' %}</th>
</tr>
Expand Down Expand Up @@ -135,7 +135,7 @@
{% else %}
<td data-title="{% trans 'Task' %}" class="task-name"><a href="{% url 'task_detailed' task.id %}">{{ task.name }}</a></td>
{% endif %}
<td data-title="{% trans 'When' %}">{{ task.date|date:"D" }}, {{ task.start_time|time:"H:i" }} - {{ task.end_time|time:"H:i" }}</td>
<td nowrap data-title="{% trans 'When' %}">{{ task.date|date:"D" }}, {{ task.start_time|time:"H:i" }} - {{ task.end_time|time:"H:i" }}</td>

<td data-title="{% trans 'Volunteers' %}" class="task-volunteers {{ task.status_color }}" title="{% trans task.status %}
{% if user.is_authenticated %}<br/><br/>Signed up:<br/>{% for volunteer in task.volunteers.all %}* {{ volunteer.user.first_name }} {{ volunteer.user.last_name}} ({{ volunteer.user }})<br/>{% endfor %}{% endif %}">
Expand Down

0 comments on commit 7509ee1

Please sign in to comment.