assets: add clear indication an archive file is expected (#73606) #117

Merged
fpeters merged 1 commits from wip/73606-import-assets-rename into main 2023-06-23 08:07:29 +02:00
3 changed files with 7 additions and 5 deletions

View File

@ -23,5 +23,7 @@ class AssetUploadForm(forms.Form):
class AssetsImportForm(forms.Form):
assets_file = forms.FileField(label=_('Assets File'))
assets_file = forms.FileField(
label=_('Assets File'), help_text=_('Archive (.tar) with asset files as content.')
)
overwrite = forms.BooleanField(label=_('Overwrite Existing Files'), required=False)

View File

@ -7,8 +7,8 @@
<a class="extra-actions-menu-opener"></a>
<a href="{% url 'combo-manager-asset-upload' %}" rel="popup">{% trans 'Upload' %}</a>
<ul class="extra-actions-menu">
<li><a href="{% url 'combo-manager-assets-export' %}">{% trans 'Export Assets' %}</a></li>
<li><a rel="popup" href="{% url 'combo-manager-assets-import' %}">{% trans 'Import Assets' %}</a></li>
<li><a href="{% url 'combo-manager-assets-export' %}">{% trans 'Export assets as archive' %}</a></li>
<li><a rel="popup" href="{% url 'combo-manager-assets-import' %}">{% trans 'Import archive of assets' %}</a></li>
</ul>
</span>
{% endblock %}

View File

@ -2,7 +2,7 @@
{% load i18n %}
{% block appbar %}
<h2>{% trans "Assets Import" %}</h2>
<h2>{% trans "Assets Archive Import" %}</h2>
{% endblock %}
{% block content %}
@ -10,7 +10,7 @@
<form method="post" enctype="multipart/form-data">
{% csrf_token %}
<p>
{% trans "Assets import allows you to integrate assets exported from another site." %}
{% trans "Assets archive import allows you to integrate assets exported from another site." %}
</p>
{{ form.as_p }}
<div class="buttons">