misc: bump djhtml version (#75442)
gitea/combo/pipeline/head There was a failure building this commit
Details
gitea/combo/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
695a254063
commit
449ceb6f42
|
@ -22,7 +22,7 @@ repos:
|
|||
- id: isort
|
||||
args: ['--profile', 'black', '--line-length', '110']
|
||||
- repo: https://github.com/rtts/djhtml
|
||||
rev: 'v1.5.2'
|
||||
rev: '3.0.5'
|
||||
hooks:
|
||||
- id: djhtml
|
||||
args: ['--tabwidth', '2']
|
||||
|
|
|
@ -27,16 +27,16 @@
|
|||
<td class="actions">
|
||||
{% if asset.key %}{# theme asset #}
|
||||
<a href="{% url 'combo-manager-slot-asset-upload' key=asset.key %}{% if cell_reference %}?cell_reference={{ cell_reference }}{% endif %}"
|
||||
class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
|
||||
class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
|
||||
{% if asset.asset %}
|
||||
<a href="{% url 'combo-manager-slot-asset-delete' key=asset.key %}{% if cell_reference %}?cell_reference={{ cell_reference }}{% endif %}"
|
||||
class="delete" rel="popup">{% trans 'Delete' %}</a>
|
||||
class="delete" rel="popup">{% trans 'Delete' %}</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<a href="{% url 'combo-manager-asset-overwrite' %}?img={{asset.filepath|iriencode}}"
|
||||
class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
|
||||
class="overwrite" rel="popup">{% trans 'Overwrite' %}</a>
|
||||
<a href="{% url 'combo-manager-asset-delete' %}?img={{asset.filepath|iriencode}}"
|
||||
class="delete" rel="popup">{% trans 'Delete' %}</a>
|
||||
class="delete" rel="popup">{% trans 'Delete' %}</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endif %}
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
{% for tile in tiles %}
|
||||
{% with cell=tile.cell %}
|
||||
<div class="cell {{ cell.css_class_names }} {% if cell.slug %}{{cell.slug}}{% endif %}"
|
||||
data-ajax-cell-url="{{ site_base }}{{ cell.get_ajax_url }}"
|
||||
data-ajax-cell-loading-message="{{ cell.loading_message }}"
|
||||
data-ajax-cell-error-message="{% trans "Loading error" %}"
|
||||
{% if cell.ajax_refresh %}
|
||||
data-ajax-cell-refresh="{{ cell.ajax_refresh }}"
|
||||
{% endif %}><div>{% render_cell cell %}</div></div>
|
||||
data-ajax-cell-url="{{ site_base }}{{ cell.get_ajax_url }}"
|
||||
data-ajax-cell-loading-message="{{ cell.loading_message }}"
|
||||
data-ajax-cell-error-message="{% trans "Loading error" %}"
|
||||
{% if cell.ajax_refresh %}
|
||||
data-ajax-cell-refresh="{{ cell.ajax_refresh }}"
|
||||
{% endif %}><div>{% render_cell cell %}</div></div>
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
{% if day.weekday == 0 %}
|
||||
{% with sunday=day|add_days:6 %}
|
||||
<div class="weekly-agenda-cell--week-title {% if current_week == day|date:'W' %}current{% endif %}"
|
||||
{% if booking_form_url %}data-edit-url="{{ booking_form_url }}{% if '?' in booking_form_url %}&{% else %}?{% endif %}current={{ day|adjust_to_week_monday|date:'Y-m-d' }}"{% endif %}>
|
||||
{% if booking_form_url %}data-edit-url="{{ booking_form_url }}{% if '?' in booking_form_url %}&{% else %}?{% endif %}current={{ day|adjust_to_week_monday|date:'Y-m-d' }}"{% endif %}>
|
||||
{% blocktrans with day_date=day|date:'d/m' sunday_date=sunday|date:'d/m' %}Week<br class="weekbreak"> of {{ day_date }} to {{ sunday_date }}{% endblocktrans %}
|
||||
</div>
|
||||
{% endwith %}
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
{% thumbnail image.image "60x60" crop="50% 25%" as im %}
|
||||
{% thumbnail image.image "640x480" crop="50% 25%" as im_large %}
|
||||
<a data-image-large="{{ im_large.url }}" class="image-switch" href=""><img src="{{ im.url }}"
|
||||
{% if image.title %} title="{{image.title}}" {% endif %}/></a>
|
||||
{% if image.title %} title="{{image.title}}" {% endif %}/></a>
|
||||
{% endthumbnail %}
|
||||
{% endthumbnail %}
|
||||
{% endfor %}
|
||||
|
|
|
@ -10,15 +10,15 @@
|
|||
{% for item in regie_info.items %}
|
||||
<li class="lingo-basket-cell--item">
|
||||
<a class="lingo-basket-cell--item-label" {% if item.source_url %}href="{{ item.source_url }}{% endif %}">{{ item.subject }}</a>
|
||||
<span class="lingo-basket-cell--item-price">{{ item.amount }} €</span>
|
||||
<span class="lingo-basket-cell--item-actions">
|
||||
{% if regie_info.regie.can_pay_only_one_basket_item %}
|
||||
<a id="{{ item.pk }}" class="lingo-basket-cell--item-pay" href="{{ item.payment_url }}?next_url={{ cell.page.get_online_url }}">{% trans "Pay" %}</a>
|
||||
{% endif %}
|
||||
{% if item.user_cancellable %}
|
||||
<a class="lingo-basket-cell--item-remove" role="button" rel="popup" href="{% url 'lingo-cancel-item' pk=item.id %}">{% trans 'remove' %}</a>
|
||||
{% endif %}
|
||||
</span>
|
||||
<span class="lingo-basket-cell--item-price">{{ item.amount }} €</span>
|
||||
<span class="lingo-basket-cell--item-actions">
|
||||
{% if regie_info.regie.can_pay_only_one_basket_item %}
|
||||
<a id="{{ item.pk }}" class="lingo-basket-cell--item-pay" href="{{ item.payment_url }}?next_url={{ cell.page.get_online_url }}">{% trans "Pay" %}</a>
|
||||
{% endif %}
|
||||
{% if item.user_cancellable %}
|
||||
<a class="lingo-basket-cell--item-remove" role="button" rel="popup" href="{% url 'lingo-cancel-item' pk=item.id %}">{% trans 'remove' %}</a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
|
|
@ -3,24 +3,24 @@
|
|||
{% if title %}<h2>{{ title }}</h2>{% endif %}
|
||||
{% localize off %}
|
||||
<div class="combo-cell-map"
|
||||
{% block map-attributes %}
|
||||
data-init-state="{{ initial_state }}"
|
||||
data-init-zoom="{{ initial_zoom }}" data-min-zoom="{{ min_zoom }}"
|
||||
data-max-zoom="{{ max_zoom }}" data-init-lat="{{ init_lat }}"
|
||||
data-init-lng="{{ init_lng }}"
|
||||
{% block map-include-geoloc-button %}
|
||||
data-include-geoloc-button="true"
|
||||
{% endblock %}
|
||||
{% if group_markers %}data-group-markers="1"{% endif %}
|
||||
data-marker-behaviour-onclick="{{ cell.marker_behaviour_onclick }}"
|
||||
{% if max_bounds.corner1.lat %}
|
||||
data-max-bounds-lat1="{{ max_bounds.corner1.lat }}"
|
||||
data-max-bounds-lng1="{{ max_bounds.corner1.lng }}"
|
||||
data-max-bounds-lat2="{{ max_bounds.corner2.lat }}"
|
||||
data-max-bounds-lng2="{{ max_bounds.corner2.lng }}"
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
data-cell-id="{{ cell.pk }}"
|
||||
{% block map-attributes %}
|
||||
data-init-state="{{ initial_state }}"
|
||||
data-init-zoom="{{ initial_zoom }}" data-min-zoom="{{ min_zoom }}"
|
||||
data-max-zoom="{{ max_zoom }}" data-init-lat="{{ init_lat }}"
|
||||
data-init-lng="{{ init_lng }}"
|
||||
{% block map-include-geoloc-button %}
|
||||
data-include-geoloc-button="true"
|
||||
{% endblock %}
|
||||
{% if group_markers %}data-group-markers="1"{% endif %}
|
||||
data-marker-behaviour-onclick="{{ cell.marker_behaviour_onclick }}"
|
||||
{% if max_bounds.corner1.lat %}
|
||||
data-max-bounds-lat1="{{ max_bounds.corner1.lat }}"
|
||||
data-max-bounds-lng1="{{ max_bounds.corner1.lng }}"
|
||||
data-max-bounds-lat2="{{ max_bounds.corner2.lat }}"
|
||||
data-max-bounds-lng2="{{ max_bounds.corner2.lng }}"
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
data-cell-id="{{ cell.pk }}"
|
||||
>
|
||||
{% endlocalize %}
|
||||
<script>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<ul>
|
||||
{% for notification in notifications %}
|
||||
<li class="combo-notification {% if notification.acked %}combo-notification-acked{% endif %}"
|
||||
data-combo-notification-id="{{ notification.public_id }}">
|
||||
data-combo-notification-id="{{ notification.public_id }}">
|
||||
<a href="{{ notification.url|default:"#" }}">{{ notification.summary }}</a>
|
||||
{% if notification.body %}
|
||||
<div class="description">
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
{% endif %}
|
||||
|
||||
<ul class="objects-list single-links navigation-entries"
|
||||
data-order-url="{% url 'pwa-manager-navigation-order' %}">
|
||||
data-order-url="{% url 'pwa-manager-navigation-order' %}">
|
||||
{% for entry in navigation_entries %}
|
||||
<li data-pk="{{entry.pk}}"><span class="handle">⣿</span>
|
||||
<a rel="popup" href="{% url 'pwa-manager-navigation-edit' pk=entry.pk %}">{{ entry.get_label }}</a>
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
{% if entries|length %}
|
||||
<div class="pwa-navigation" id="pwa-navigation"
|
||||
{% if include_user_name %}data-pwa-user-name="{% skeleton_extra_placeholder user-name %}{{user.get_full_name}}{% end_skeleton_extra_placeholder %}"{% endif %}>
|
||||
<div>
|
||||
<ul>
|
||||
{% for entry in entries %}
|
||||
<li class="{{ entry.css_class_names }}{% if entry.link_page in page.get_parents_and_self %} selected{% endif %}" data-entry-pk="{{ entry.pk }}"
|
||||
{% if entry.notification_count %}data-notification-count-url="{{site_base}}/api/notification/count/"{% endif %}
|
||||
{% if entry.use_user_name_as_label %}data-include-user-name{% endif %}>
|
||||
<a href="{{ entry.get_url }}"
|
||||
{% if entry.icon %}style="background-image: url({{site_base}}{{entry.icon.url}});"{% endif %}
|
||||
><span>{{ entry.get_label }}</span></a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% if include_user_name %}data-pwa-user-name="{% skeleton_extra_placeholder user-name %}{{user.get_full_name}}{% end_skeleton_extra_placeholder %}"{% endif %}>
|
||||
<div>
|
||||
<ul>
|
||||
{% for entry in entries %}
|
||||
<li class="{{ entry.css_class_names }}{% if entry.link_page in page.get_parents_and_self %} selected{% endif %}" data-entry-pk="{{ entry.pk }}"
|
||||
{% if entry.notification_count %}data-notification-count-url="{{site_base}}/api/notification/count/"{% endif %}
|
||||
{% if entry.use_user_name_as_label %}data-include-user-name{% endif %}>
|
||||
<a href="{{ entry.get_url }}"
|
||||
{% if entry.icon %}style="background-image: url({{site_base}}{{entry.icon.url}});"{% endif %}
|
||||
><span>{{ entry.get_label }}</span></a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$('li[data-include-user-name]').each(function(idx, elem) {
|
||||
var user_name = $(this).parents('#pwa-navigation').data('pwa-user-name');
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
<p><label>{% trans "Engines:" %}</label></p>
|
||||
<div>
|
||||
<ul class="objects-list list-of-links" id="list-of-links-{{ cell.pk }}"
|
||||
data-link-list-order-url="{% url 'combo-manager-search-engines-order' page_pk=page.pk cell_reference=cell.get_reference %}">
|
||||
data-link-list-order-url="{% url 'combo-manager-search-engines-order' page_pk=page.pk cell_reference=cell.get_reference %}">
|
||||
{% for engine in engines %}
|
||||
<li data-link-item-id="{{ engine.0 }}"><span class="handle">⣿</span>
|
||||
<span>{{ engine.1 }}{% if engine.2.title %} ({% trans "Custom title:"%} {{ engine.2.title }}){% endif %}</span>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<p><label>{% trans "Links:" %}</label></p>
|
||||
<div>
|
||||
<ul class="objects-list list-of-links" id="list-of-links-{{ cell.pk }}"
|
||||
data-link-list-order-url="{% url 'combo-manager-link-list-order' page_pk=page.pk cell_reference=cell.get_reference %}">
|
||||
data-link-list-order-url="{% url 'combo-manager-link-list-order' page_pk=page.pk cell_reference=cell.get_reference %}">
|
||||
{% for link in links %}
|
||||
<li data-link-item-id="{{ link.pk }}"><span class="handle">⣿</span>
|
||||
<span title="{{ link }}">
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
{{ appearance_form.as_p }}
|
||||
{% if cell.can_have_assets %}
|
||||
<p><a rel="popup" data-selector="div#assets-listing" href="{% url 'combo-manager-slot-assets' cell_reference=cell.get_reference %}"
|
||||
>{% trans 'Assets' %}</a></p>
|
||||
>{% trans 'Assets' %}</a></p>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
<div class="pk-tabs--tab-list" role="tablist" aria-label="{% trans "Cell Properties" %}">
|
||||
{% for tab in manager_tabs %}
|
||||
<button role="tab"
|
||||
aria-selected="{{ forloop.first|yesno:"true,false" }}"
|
||||
aria-controls="panel-{{ cell.get_reference }}-{{ tab.slug }}"
|
||||
id="tab-{{ cell.get_reference }}-{{ tab.slug }}"
|
||||
tabindex="{{ forloop.first|yesno:"0,-1" }}"
|
||||
{% if tab.is_not_default %}class="pk-tabs--button-marker"{% endif %}>{{ tab.name }}</button>
|
||||
aria-selected="{{ forloop.first|yesno:"true,false" }}"
|
||||
aria-controls="panel-{{ cell.get_reference }}-{{ tab.slug }}"
|
||||
id="tab-{{ cell.get_reference }}-{{ tab.slug }}"
|
||||
tabindex="{{ forloop.first|yesno:"0,-1" }}"
|
||||
{% if tab.is_not_default %}class="pk-tabs--button-marker"{% endif %}>{{ tab.name }}</button>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
|
@ -16,9 +16,9 @@
|
|||
{% csrf_token %}
|
||||
{% for tab in manager_tabs %}
|
||||
<div id="panel-{{ cell.get_reference }}-{{ tab.slug }}"
|
||||
role="tabpanel" tabindex="0" {% if not forloop.first %}hidden{% endif %}
|
||||
data-tab-slug="{{ tab.slug }}"
|
||||
aria-labelledby="tab-{{ cell.get_reference }}-{{ tab.slug }}">
|
||||
role="tabpanel" tabindex="0" {% if not forloop.first %}hidden{% endif %}
|
||||
data-tab-slug="{{ tab.slug }}"
|
||||
aria-labelledby="tab-{{ cell.get_reference }}-{{ tab.slug }}">
|
||||
{% if tab.template %}{% include tab.template %}{% else %}{{ tab.form_instance.as_p }}{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
@ -27,10 +27,10 @@
|
|||
<button class="submit-button save">{% trans 'Save' %}</button>
|
||||
<span>
|
||||
<a class="pk-button duplicate-button" rel="popup" title="{% trans 'Duplicate' %}"
|
||||
href="{% url 'combo-manager-page-duplicate-cell' page_pk=page.id cell_reference=cell.get_reference %}"
|
||||
href="{% url 'combo-manager-page-duplicate-cell' page_pk=page.id cell_reference=cell.get_reference %}"
|
||||
><span>{% trans 'Duplicate' %}</span></a>
|
||||
<a class="pk-button delete-button" rel="popup" title="{% trans 'Delete' %}"
|
||||
href="{% url 'combo-manager-page-delete-cell' page_pk=page.id cell_reference=cell.get_reference %}"
|
||||
href="{% url 'combo-manager-page-delete-cell' page_pk=page.id cell_reference=cell.get_reference %}"
|
||||
><span>{% trans 'Delete' %}</span></a>
|
||||
</span>
|
||||
{% endblock %}
|
||||
|
|
|
@ -159,7 +159,7 @@
|
|||
{% endif %}
|
||||
|
||||
<div id="placeholders"
|
||||
data-cell-order-url="{% url 'combo-manager-cell-order' page_pk=object.id %}"
|
||||
data-cell-order-url="{% url 'combo-manager-cell-order' page_pk=object.id %}"
|
||||
>
|
||||
{% for placeholder in placeholders %}
|
||||
<div class="placeholder" data-placeholder-key="{{ placeholder.key }}">
|
||||
|
@ -187,7 +187,7 @@
|
|||
{% endif %}
|
||||
</span>
|
||||
<span class="visibility-summary {{ cell.get_manager_visibility_css_class }}"
|
||||
title="{% trans 'Restricted visibility' %}"
|
||||
title="{% trans 'Restricted visibility' %}"
|
||||
>{{ cell.get_manager_visibility_content }}</span>
|
||||
</h3>
|
||||
<div>{% cell_form cell %}</div>
|
||||
|
|
|
@ -20,16 +20,16 @@
|
|||
field_id = $(this).attr('id')
|
||||
custom_url_field_id = '#' + field_id + '_path'
|
||||
if($(custom_url_field_id).val())
|
||||
$(this).children('option[data-other=true]').prop('selected', true);
|
||||
$(this).children('option[data-other=true]').prop('selected', true);
|
||||
});
|
||||
|
||||
$('select').change(function(){
|
||||
field_id = $(this).attr('id')
|
||||
custom_url_field_id = '#' + field_id + '_path'
|
||||
if ($('option:selected', this).data('other'))
|
||||
$(custom_url_field_id).parent('p').show();
|
||||
$(custom_url_field_id).parent('p').show();
|
||||
else
|
||||
$(custom_url_field_id).parent('p').hide();
|
||||
$(custom_url_field_id).parent('p').hide();
|
||||
}).trigger('change');
|
||||
|
||||
$('form#site-settings-form').submit(function() {
|
||||
|
@ -37,7 +37,7 @@
|
|||
field_id = $(this).attr('id')
|
||||
custom_url_field_id = '#' + field_id + '_path'
|
||||
if(!$('option:selected', this).data('other'))
|
||||
$(custom_url_field_id).val('');
|
||||
$(custom_url_field_id).val('');
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
<ul{% if id %} id="{{ id }}"{% endif %} class="flex-size-select {{ widget.attrs.class|default:"" }}">{% for group, options, index in widget.optgroups %}
|
||||
{% for option in options %}
|
||||
<li class="{{ option.value|default:"size-auto" }}"><label class="{{ option.value }}"
|
||||
><input type="radio" name="{{ widget.name }}" value="{{ option.value }}"
|
||||
{% if option.selected %}checked{% endif %}>{{ option.label|default:_("Auto") }}</label></li>
|
||||
><input type="radio" name="{{ widget.name }}" value="{{ option.value }}"
|
||||
{% if option.selected %}checked{% endif %}>{{ option.label|default:_("Auto") }}</label></li>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</ul>{% endwith %}
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
{{ media }}
|
||||
</head>
|
||||
<body class="page-{{ page.slug }}"
|
||||
{% if check_badges %}data-check-badges="true"{% endif %}
|
||||
data-api-root="{{ site_base }}/api/">
|
||||
{% if check_badges %}data-check-badges="true"{% endif %}
|
||||
data-api-root="{{ site_base }}/api/">
|
||||
<div id="title"><h1>{{ page.title }}</h1></div>
|
||||
<div id="menu">{% block menu %}{% show_menu ignore_visibility=True %}{% endblock %}</div>
|
||||
<div id="content">
|
||||
|
@ -42,7 +42,7 @@
|
|||
{% skeleton_extra_placeholder inner_footer %}
|
||||
<span style="display: none">{% now "Y-m-d H:i:s" %}</span> {# generation time #}
|
||||
{% end_skeleton_extra_placeholder %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
</body>
|
||||
{% endblock %}
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
{% endif %}
|
||||
{% for cell in cells %}
|
||||
<div class="cell {{ cell.css_class_names }} {{ cell.asset_css_classes }}{% if cell.slug %} {{cell.slug}}{% endif %}{% if cell|shown_because_admin:request %} shown-because-admin{% endif %}"
|
||||
{% if cell.slug and cell.use_slug_as_id %}id="{{ cell.slug }}"{% endif %}
|
||||
data-ajax-cell-url="{{ site_base }}{{ cell.get_ajax_url }}"
|
||||
data-ajax-cell-loading-message="{{ cell.loading_message }}"
|
||||
data-ajax-cell-error-message="{% trans "Loading error" %}"
|
||||
{% if cell.ajax_refresh %}data-ajax-cell-refresh="{{ cell.ajax_refresh }}"{% endif %}
|
||||
{% with cell|extra_context:request as extra_context %}
|
||||
{% if extra_context %}data-extra-context="{{ extra_context|signed|urlencode }}"{% endif %}
|
||||
{% endwith %}
|
||||
{% if cell.slug and cell.use_slug_as_id %}id="{{ cell.slug }}"{% endif %}
|
||||
data-ajax-cell-url="{{ site_base }}{{ cell.get_ajax_url }}"
|
||||
data-ajax-cell-loading-message="{{ cell.loading_message }}"
|
||||
data-ajax-cell-error-message="{% trans "Loading error" %}"
|
||||
{% if cell.ajax_refresh %}data-ajax-cell-refresh="{{ cell.ajax_refresh }}"{% endif %}
|
||||
{% with cell|extra_context:request as extra_context %}
|
||||
{% if extra_context %}data-extra-context="{{ extra_context|signed|urlencode }}"{% endif %}
|
||||
{% endwith %}
|
||||
><div>{% render_cell cell %}</div></div>
|
||||
{% if cell.include_pagination %}
|
||||
{% include "combo/pagination.html" with paginate_by=cell.limit data_cell_reference=cell.get_reference %}
|
||||
|
|
Loading…
Reference in New Issue