entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

misc: bump djhtml version (#75442)

This commit is contained in:
Valentin Deniaud 2023-03-15 14:13:55 +01:00
parent 0d784c2091
commit 6d9a196879
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -22,7 +22,7 @@ repos:
- id: django-upgrade
args: ['--target-version', '3.2']
- repo: https://github.com/rtts/djhtml
rev: 'v1.5.2'
rev: '3.0.5'
hooks:
- id: djhtml
args: ['--tabwidth', '2']

16
chrono/manager/templates/chrono/manager_agenda_event_fragment.html
View File

@ -1,13 +1,13 @@
{% load i18n %}
<li class="{% if event.booked_places > event.places %}overbooking{% endif %}
{% if event.main_list_full %}full{% endif %}
{% if event.cancellation_status %}cancelled{% endif %}
{% if not event.in_bookable_period %}not-{% endif %}bookable"
{% if event.places %}
data-total="{{ event.places }}" data-booked="{{ event.booked_places }}"
{% elif event.waiting_list_places %}
data-total="{{ event.waiting_list_places }}" data-booked="{{ event.booked_waiting_list_places }}"
{% endif %}
{% if event.main_list_full %}full{% endif %}
{% if event.cancellation_status %}cancelled{% endif %}
{% if not event.in_bookable_period %}not-{% endif %}bookable"
{% if event.places %}
data-total="{{ event.places }}" data-booked="{{ event.booked_places }}"
{% elif event.waiting_list_places %}
data-total="{{ event.waiting_list_places }}" data-booked="{{ event.booked_waiting_list_places }}"
{% endif %}
><a href="{% if view_mode == 'settings_view' %}{% url 'chrono-manager-event-edit' pk=agenda.pk event_pk=event.pk %}?next=settings{% elif event.pk %}{% url 'chrono-manager-event-view' pk=agenda.pk event_pk=event.pk %}{% else %}{% url 'chrono-manager-event-create-recurrence' pk=agenda.pk event_identifier=event.slug %}{% endif %}">
<span class="event-info">
{% if view_mode == 'settings_view' %}

4
chrono/manager/templates/chrono/manager_agenda_notifications_form.html
View File

@ -25,9 +25,9 @@
role_field_id = $(this).attr('id')
email_field_id = '#' + role_field_id + '_emails'
if ($(this).val() == 'use-email-field')
$(email_field_id).parent('p').show();
$(email_field_id).parent('p').show();
else
$(email_field_id).parent('p').hide();
$(email_field_id).parent('p').hide();
});
$('select').trigger('change');
</script>

4
chrono/manager/templates/chrono/manager_event_check_booking_fragment.html
View File

@ -12,7 +12,7 @@
<form method="post" action="{% url 'chrono-manager-booking-presence' pk=agenda.pk booking_pk=booking.pk %}" class="with-ajax presence">
{% csrf_token %}
<button class="submit-button"
{% if booking.user_was_present is True %}disabled{% endif %}
{% if booking.user_was_present is True %}disabled{% endif %}
>{% trans "Presence" %}</button>
{% if booking.presence_form.check_type.field.choices.1 %}{{ booking.presence_form.check_type }}{% endif %}
<script>
@ -27,7 +27,7 @@
<form method="post" action="{% url 'chrono-manager-booking-absence' pk=agenda.pk booking_pk=booking.pk %}" class="with-ajax absence">
{% csrf_token %}
<button class="submit-button"
{% if booking.user_was_present is False %}disabled{% endif %}
{% if booking.user_was_present is False %}disabled{% endif %}
>{% trans "Absence" %}</button>
{% if booking.absence_form.check_type.field.choices.1 %}{{ booking.absence_form.check_type }}{% endif %}
<script>

2
chrono/manager/templates/chrono/manager_event_form.html
View File

@ -42,7 +42,7 @@
recurrence_fields = $('.widget[id^=id_recurrence]');
$('input[type=radio][name=frequency]').change(function() {
if(!this.checked)
return;
return;
if(this.value == 'unique') {
recurrence_fields.hide();
} else {

6
chrono/manager/templates/chrono/manager_meetings_agenda_day_view.html
View File

@ -32,19 +32,19 @@
{# opening hours on the first row #}
{% for slot in desk_info.opening_hours %}
<div class="opening-hours"
style="height: {{ slot.css_height }}%; top: {{ slot.css_top }}%;"
style="height: {{ slot.css_height }}%; top: {{ slot.css_top }}%;"
>{{slot.begin}} {{slot.end}}</div>
{% endfor %}
{% for slot in desk_info.exceptions %}
<div class="exception-hours"
style="height: {{ slot.css_height }}%; top: {{ slot.css_top }}%;"
style="height: {{ slot.css_height }}%; top: {{ slot.css_top }}%;"
>{% if slot.label %}<span class="exception-label">{{slot.label}}</span>{% endif %}</div>
{% endfor %}
{% endif %}
{% for booking in desk_info.bookings %}
<div class="booking{% if booking.color %} booking-color-{{ booking.color.index }}{% endif %}"
style="height: {{ booking.css_height }}%; min-height: {{ booking.css_height }}%; top: {{ booking.css_top }}%;"
style="height: {{ booking.css_height }}%; min-height: {{ booking.css_height }}%; top: {{ booking.css_top }}%;"
><span class="start-time">{{booking.event.start_datetime|date:"TIME_FORMAT"}}</span>
<a {% if booking.get_backoffice_url %}href="{{booking.get_backoffice_url}}"{% endif %}>{{ booking.get_user_block }}</a>
<a rel="popup" class="cancel" href="{% url 'chrono-manager-booking-cancel' pk=booking.event.agenda_id booking_pk=booking.pk %}?next={{ request.path }}">{% trans "Cancel" %}</a>

14
chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
View File

@ -22,17 +22,17 @@
{% block agenda-settings-extra-tab-buttons %}
<button aria-controls="panel-meeting-types"
aria-selected="{{meeting_types|yesno:"false,true"}}"
id="tab-meeting-types" role="tab"
tabindex="{{meeting_types|yesno:"-1,0"}}"
aria-selected="{{meeting_types|yesno:"false,true"}}"
id="tab-meeting-types" role="tab"
tabindex="{{meeting_types|yesno:"-1,0"}}"
>{% trans "Meeting Types" %}</button>
{% if object.desk_simple_management %}
<button aria-controls="panel-desks" aria-selected="false" id="tab-desks" role="tab" tabindex="-1">{% trans "Desks" %}</button>
{% endif %}
<button aria-controls="panel-time-periods"
aria-selected="{{meeting_types|yesno:"true,false"}}"
id="tab-time-periods" role="tab"
tabindex="{{meeting_types|yesno:"0"}}"
aria-selected="{{meeting_types|yesno:"true,false"}}"
id="tab-time-periods" role="tab"
tabindex="{{meeting_types|yesno:"0"}}"
>{% trans "Opening hours" %}</button>
{% if has_resources %}
<button aria-controls="panel-resources" aria-selected="false" id="tab-resources" role="tab" tabindex="-1">{% trans "Resources" %}</button>
@ -43,7 +43,7 @@
{% block agenda-settings-extra-tab-list %}
<div aria-labelledby="tab-meeting-types" id="panel-meeting-types" role="tabpanel" tabindex="0"
{% if meeting_types %}hidden{% endif %}>
{% if meeting_types %}hidden{% endif %}>
{% if meeting_types %}
<ul class="objects-list single-links">
{% for meeting_type in meeting_types %}

2
chrono/manager/templates/chrono/manager_resource_day_view.html
View File

@ -41,7 +41,7 @@
<td>
{% for booking in resource_info.bookings %}
<div class="booking"
style="height: {{ booking.css_height }}%; min-height: {{ booking.css_height }}%; top: {{ booking.css_top }}%;"
style="height: {{ booking.css_height }}%; min-height: {{ booking.css_height }}%; top: {{ booking.css_top }}%;"
><span class="start-time">{{ booking.event.start_datetime|date:"TIME_FORMAT" }}</span>
<a {% if booking.get_backoffice_url %}href="{{ booking.get_backoffice_url }}"{% endif %}>{{ booking.get_user_block }}</a>
</div>

2
chrono/manager/templates/chrono/manager_time_period_form.html
View File

@ -37,7 +37,7 @@
<script>
$('input[type=radio][name=repeat]').change(function() {
if(!this.checked)
return;
return;
if(this.value == 'every-week') {
$('#id_weekday_indexes').parent().parent().hide();
} else {