wagtail 6.2.2__py3-none-any.whl → 6.3rc2__py3-none-any.whl

wagtail/documents/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,7 @@ msgid "Wagtail documents"
 msgstr ""
 
 #: forms.py:25 views/bulk_actions/add_to_collection.py:13 views/chooser.py:92
-#: views/documents.py:116
+#: views/documents.py:113
 msgid "Collection"
 msgstr ""
 
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Add/edit documents you own"
 msgstr ""
 
-#: forms.py:145 views/documents.py:179 views/documents.py:229
+#: forms.py:145
 msgid "Edit"
 msgstr ""
 
@@ -79,51 +79,51 @@ msgstr ""
 msgid "documents"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:4
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:6
 #, python-format
 msgid "Add tags to 1 document"
 msgid_plural "Add tags to %(counter)s documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:7
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:11
 msgid "Add tags to documents"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:14
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:18
 msgid "Are you sure you want to tag the following document?"
 msgid_plural "Are you sure you want to tag the following documents?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:32
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:36
 msgid "You don't have permission to add tags to this document"
 msgid_plural "You don't have permission to add tags to these documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:39
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:39
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:43
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:43
 msgid "Yes, add"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:40
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:40
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html:44
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:44
 msgid "No, don't add"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:4
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:6
 #, python-format
 msgid "Add 1 document to new collection"
 msgid_plural "Add %(counter)s documents to new collection"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:7
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:11
 msgid "Add documents to collection"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:14
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:18
 msgid ""
 "Are you sure you want to add the following document to the selected "
 "collection?"
@@ -133,49 +133,49 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:32
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html:36
 msgid "You don't have permission to add this document to a collection"
 msgid_plural "You don't have permission to add these documents to a collection"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:3
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:5
 #, python-format
 msgid "Delete 1 document"
 msgid_plural "Delete %(counter)s documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:6
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:10
 msgid "Delete documents"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:13
-#: views/documents.py:294
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:17
+#: views/documents.py:282
 msgid "Are you sure you want to delete this document?"
 msgid_plural "Are you sure you want to delete these documents?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:23
-#: templates/wagtaildocs/documents/edit.html:56
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:28
+#: templates/wagtaildocs/documents/edit.html:28
 #, python-format
 msgid "Used %(usage_count)s time"
 msgid_plural "Used %(usage_count)s times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:32
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:38
 msgid "You don't have permission to delete this document"
 msgid_plural "You don't have permission to delete these documents"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:39
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:45
 msgid "Yes, delete"
 msgstr ""
 
-#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:40
+#: templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html:46
 msgid "No, don't delete"
 msgstr ""
 
@@ -206,52 +206,31 @@ msgstr ""
 msgid "Change document:"
 msgstr ""
 
-#: templates/wagtaildocs/documents/add.html:4 views/documents.py:79
+#: templates/wagtaildocs/documents/add.html:3 views/documents.py:77
 msgid "Add a document"
 msgstr ""
 
-#: templates/wagtaildocs/documents/add.html:48
-msgid "Add document"
-msgstr ""
-
-#: templates/wagtaildocs/documents/add.html:69 views/chooser.py:186
+#: templates/wagtaildocs/documents/add.html:45 views/chooser.py:186
 msgid "Uploading…"
 msgstr ""
 
-#: templates/wagtaildocs/documents/add.html:72 views/chooser.py:185
+#: templates/wagtaildocs/documents/add.html:48 views/chooser.py:185
 msgid "Upload"
 msgstr ""
 
-#: templates/wagtaildocs/documents/edit.html:4
-#, python-format
-msgid "Editing %(title)s"
-msgstr ""
-
-#: templates/wagtaildocs/documents/edit.html:18
-msgid "Editing"
-msgstr ""
-
-#: templates/wagtaildocs/documents/edit.html:39
-msgid "Save"
-msgstr ""
-
-#: templates/wagtaildocs/documents/edit.html:41 views/documents.py:282
-msgid "Delete document"
-msgstr ""
-
-#: templates/wagtaildocs/documents/edit.html:50
+#: templates/wagtaildocs/documents/edit.html:21
 msgid "Filesize"
 msgstr ""
 
-#: templates/wagtaildocs/documents/edit.html:51
+#: templates/wagtaildocs/documents/edit.html:22
 msgid "File not found"
 msgstr ""
 
-#: templates/wagtaildocs/documents/edit.html:54
+#: templates/wagtaildocs/documents/edit.html:25
 msgid "Usage"
 msgstr ""
 
-#: templates/wagtaildocs/documents/index.html:13
+#: templates/wagtaildocs/documents/index.html:10
 msgid "Select all documents in listing"
 msgstr ""
 
@@ -277,11 +256,9 @@ msgstr ""
 #: templates/wagtaildocs/homepage/site_summary_documents.html:6
 #, python-format
 msgid ""
-"<span>%(total)s</span> Document <span class=\"w-sr-only\">created in "
-"%(site_name)s</span>"
+"%(total)s Document <span class=\"w-sr-only\">created in %(site_name)s</span>"
 msgid_plural ""
-"<span>%(total)s</span> Documents <span class=\"w-sr-only\">created in "
-"%(site_name)s</span>"
+"%(total)s Documents <span class=\"w-sr-only\">created in %(site_name)s</span>"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -289,34 +266,30 @@ msgstr[1] ""
 msgid "Add multiple documents"
 msgstr ""
 
-#: templates/wagtaildocs/multiple/add.html:13
-msgid "Add documents"
-msgstr ""
-
-#: templates/wagtaildocs/multiple/add.html:18
+#: templates/wagtaildocs/multiple/add.html:14
 msgid "Drag and drop documents into this area to upload immediately."
 msgstr ""
 
-#: templates/wagtaildocs/multiple/add.html:23
+#: templates/wagtaildocs/multiple/add.html:19
 msgid "Or choose from your computer"
 msgstr ""
 
-#: templates/wagtaildocs/multiple/add.html:28
+#: templates/wagtaildocs/multiple/add.html:31
 msgid "Add to collection:"
 msgstr ""
 
-#: templates/wagtaildocs/multiple/add.html:59
+#: templates/wagtaildocs/multiple/add.html:61
 msgid ""
 "Upload successful. Please update this document with a more appropriate "
 "title, if necessary. You may also delete the document completely if the "
 "upload wasn't required."
 msgstr ""
 
-#: templates/wagtaildocs/multiple/add.html:60
+#: templates/wagtaildocs/multiple/add.html:62
 msgid "Sorry, upload failed."
 msgstr ""
 
-#: templates/wagtaildocs/multiple/add.html:61
+#: templates/wagtaildocs/multiple/add.html:63
 msgid "Document updated."
 msgstr ""
 
@@ -367,7 +340,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: views/bulk_actions/delete.py:8 views/documents.py:253
+#: views/bulk_actions/delete.py:8 views/documents.py:249
 msgid "Delete"
 msgstr ""
 
@@ -382,11 +355,11 @@ msgid_plural "%(num_parent_objects)d documents have been deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views/chooser.py:87 views/documents.py:105
+#: views/chooser.py:87 views/documents.py:102
 msgid "File"
 msgstr ""
 
-#: views/chooser.py:88 views/documents.py:108
+#: views/chooser.py:88 views/documents.py:105
 msgid "Created"
 msgstr ""
 
@@ -402,38 +375,50 @@ msgstr ""
 msgid "Edit this document"
 msgstr ""
 
-#: views/documents.py:65 wagtail_hooks.py:61 wagtail_hooks.py:134
+#: views/documents.py:63 wagtail_hooks.py:61 wagtail_hooks.py:134
 msgid "Documents"
 msgstr ""
 
-#: views/documents.py:100
+#: views/documents.py:97
 msgid "Title"
 msgstr ""
 
-#: views/documents.py:175
+#: views/documents.py:162
+msgid "The document could not be created due to errors."
+msgstr ""
+
+#: views/documents.py:185
 #, python-format
 msgid "Document '%(document_title)s' added."
 msgstr ""
 
-#: views/documents.py:185 views/documents.py:233
+#: views/documents.py:193
 msgid "The document could not be saved due to errors."
 msgstr ""
 
-#: views/documents.py:227
+#: views/documents.py:223
 #, python-format
 msgid "Document '%(document_title)s' updated"
 msgstr ""
 
-#: views/documents.py:249
+#: views/documents.py:247
 msgid ""
 "The file could not be found. Please change the source or delete the document"
 msgstr ""
 
-#: views/documents.py:300
+#: views/documents.py:270
+msgid "Delete document"
+msgstr ""
+
+#: views/documents.py:288
 #, python-format
 msgid "Document '%(document_title)s' deleted."
 msgstr ""
 
+#: views/multiple.py:27
+msgid "Add documents"
+msgstr ""
+
 #: wagtail_hooks.py:80
 msgid "Document"
 msgstr ""

wagtail/documents/migrations/0014_alter_document_file_size.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.9 on 2024-10-09 16:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("wagtaildocs", "0013_delete_uploadeddocument"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="document",
+            name="file_size",
+            field=models.PositiveBigIntegerField(editable=False, null=True),
+        ),
+    ]

wagtail/documents/models.py

@@ -38,7 +38,7 @@ class AbstractDocument(CollectionMember, index.Indexed, models.Model):
 
     tags = TaggableManager(help_text=None, blank=True, verbose_name=_("tags"))
 
-    file_size = models.PositiveIntegerField(null=True, editable=False)
+    file_size = models.PositiveBigIntegerField(null=True, editable=False)
     # A SHA-1 hash of the file contents
     file_hash = models.CharField(max_length=40, blank=True, editable=False)
 

wagtail/documents/rich_text/__init__.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from django.utils.html import escape
 
 from wagtail.documents import get_document_model
@@ -20,7 +18,7 @@ class DocumentLinkHandler(LinkHandler):
         return cls.expand_db_attributes_many([attrs])[0]
 
     @classmethod
-    def expand_db_attributes_many(cls, attrs_list: List[dict]) -> List[str]:
+    def expand_db_attributes_many(cls, attrs_list: list[dict]) -> list[str]:
         return [
             '<a href="%s">' % escape(doc.url) if doc else "<a>"
             for doc in cls.get_many(attrs_list)

wagtail/documents/static/wagtaildocs/js/add-multiple.js

@@ -1 +1 @@
-$((function(){$(document).on("drop dragover",(function(e){e.preventDefault()})),$("#fileupload").fileupload({dataType:"html",sequentialUploads:!0,dropZone:$(".drop-zone"),add:function(e,t){var a=$(this),s=a.data("blueimp-fileupload")||a.data("fileupload"),o=$($("#upload-list-item").html()).addClass("upload-uploading"),l=s.options;$("#upload-list").append(o),t.context=o,t.process((function(){return a.fileupload("process",t)})).always((function(){t.context.removeClass("processing"),t.context.find(".left").each((function(e,a){$(a).append(escapeHtml(t.files[e].name))}))})).done((function(){t.context.find(".start").prop("disabled",!1),!1!==s._trigger("added",e,t)&&(l.autoUpload||t.autoUpload)&&!1!==t.autoUpload&&t.submit()})).fail((function(){t.files.error&&t.context.each((function(e){var a=t.files[e].error;a&&$(this).find(".error_messages").text(a)}))}))},processfail:function(e,t){$(t.context).removeClass("upload-uploading").addClass("upload-failure")},progress:function(e,t){if(e.isDefaultPrevented())return!1;var a=Math.floor(t.loaded/t.total*100);t.context.each((function(){$(this).find(".progress").addClass("active").attr("aria-valuenow",a).find(".bar").css("width",a+"%").html(a+"%")}))},progressall:function(e,t){var a=parseInt(t.loaded/t.total*100,10);$("#overall-progress").addClass("active").attr("aria-valuenow",a).find(".bar").css("width",a+"%").html(a+"%"),a>=100&&$("#overall-progress").removeClass("active").find(".bar").css("width","0%")},formData:function(e){var t=this.files[0].name,a={title:t.replace(/\.[^.]+$/,"")},s=window.fileupload_opts.max_title_length;return e.get(0).dispatchEvent(new CustomEvent("wagtail:documents-upload",{bubbles:!0,cancelable:!0,detail:{data:a,filename:t,maxTitleLength:s}}))?e.serializeArray().concat({name:"title",value:a.title}):e.serializeArray()},done:function(e,t){var a=$(t.context),s=JSON.parse(t.result);s.success?(a.addClass("upload-success"),$(".right",a).append(s.form)):(a.addClass("upload-failure"),$(".right .error_messages",a).append(s.error_message))},fail:function(e,t){$(t.context).addClass("upload-failure")},always:function(e,t){$(t.context).removeClass("upload-uploading").addClass("upload-complete")}}),$("#upload-list").on("submit","form",(function(e){var t=$(this),a=new FormData(this),s=t.closest("#upload-list > li");e.preventDefault(),$.ajax({contentType:!1,data:a,processData:!1,type:"POST",url:this.action}).done((function(e){if(e.success){var a=$(".status-msg.update-success").first().text();document.dispatchEvent(new CustomEvent("w-messages:add",{detail:{clear:!0,text:a,type:"success"}})),s.slideUp((function(){$(this).remove()}))}else t.replaceWith(e.form)}))})),$("#upload-list").on("click",".delete",(function(e){var t=$(this).closest("form"),a=t.closest("#upload-list > li");e.preventDefault();var s=$('input[name="csrfmiddlewaretoken"]',t).val();$.post(this.href,{csrfmiddlewaretoken:s},(function(e){e.success&&a.slideUp((function(){$(this).remove()}))}))}))}));
+$((function(){$(document).on("drop dragover",(function(e){e.preventDefault()})),$("#fileupload").fileupload({dataType:"html",sequentialUploads:!0,dropZone:$(".drop-zone"),add:function(e,t){var a=$(this),s=a.data("blueimp-fileupload")||a.data("fileupload"),o=$($("#upload-list-item").html()).addClass("upload-uploading"),l=s.options;$("#upload-list").append(o),t.context=o,t.process((function(){return a.fileupload("process",t)})).always((function(){t.context.removeClass("processing"),t.context.find(".left").each((function(e,a){$(a).append(escapeHtml(t.files[e].name))}))})).done((function(){t.context.find(".start").prop("disabled",!1),!1!==s._trigger("added",e,t)&&(l.autoUpload||t.autoUpload)&&!1!==t.autoUpload&&t.submit()})).fail((function(){t.files.error&&t.context.each((function(e){var a=t.files[e].error;a&&$(this).find(".error_messages").text(a)}))}))},processfail:function(e,t){$(t.context).removeClass("upload-uploading").addClass("upload-failure")},progress:function(e,t){if(e.isDefaultPrevented())return!1;var a=Math.floor(t.loaded/t.total*100);t.context.each((function(){$(this).find(".progress").addClass("active").attr("aria-valuenow",a).find(".bar").css("width",a+"%").html(a+"%")}))},progressall:function(e,t){var a=parseInt(t.loaded/t.total*100,10);$("#overall-progress").addClass("active").attr("aria-valuenow",a).find(".bar").css("width",a+"%").html(a+"%"),a>=100&&$("#overall-progress").removeClass("active").find(".bar").css("width","0%")},formData:function(e){var t=this.files[0].name,a={title:t.replace(/\.[^.]+$/,"")};return e.get(0).dispatchEvent(new CustomEvent("wagtail:documents-upload",{bubbles:!0,cancelable:!0,detail:{data:a,filename:t,maxTitleLength:this.maxTitleLength}}))?e.serializeArray().concat({name:"title",value:a.title}):e.serializeArray()},done:function(e,t){var a=$(t.context),s=JSON.parse(t.result);s.success?(a.addClass("upload-success"),$(".right",a).append(s.form)):(a.addClass("upload-failure"),$(".right .error_messages",a).append(s.error_message))},fail:function(e,t){$(t.context).addClass("upload-failure")},always:function(e,t){$(t.context).removeClass("upload-uploading").addClass("upload-complete")}}),$("#upload-list").on("submit","form",(function(e){var t=$(this),a=new FormData(this),s=t.closest("#upload-list > li");e.preventDefault(),$.ajax({contentType:!1,data:a,processData:!1,type:"POST",url:this.action}).done((function(e){if(e.success){var a=$(".status-msg.update-success").first().text();document.dispatchEvent(new CustomEvent("w-messages:add",{detail:{clear:!0,text:a,type:"success"}})),s.slideUp((function(){$(this).remove()}))}else t.replaceWith(e.form)}))})),$("#upload-list").on("click",".delete",(function(e){var t=$(this).closest("form"),a=t.closest("#upload-list > li");e.preventDefault();var s=$('input[name="csrfmiddlewaretoken"]',t).val();$.post(this.href,{csrfmiddlewaretoken:s},(function(e){e.success&&a.slideUp((function(){$(this).remove()}))}))}))}));

wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_tags.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load i18n %}
 {% load wagtailimages_tags wagtailadmin_tags %}
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Add tags to 1 document {% plural %}Add tags to {{ counter }} documents{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Add tags to 1 document {% plural %}Add tags to {{ counter }} documents{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% trans "Add tags to documents" as add_str %}

wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_add_to_collection.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load i18n %}
 {% load wagtailimages_tags wagtailadmin_tags %}
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Add 1 document to new collection {% plural %}Add {{ counter }} documents to new collection{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Add 1 document to new collection {% plural %}Add {{ counter }} documents to new collection{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% trans "Add documents to collection" as add_str %}

wagtail/documents/templates/wagtaildocs/bulk_actions/confirm_bulk_delete.html

@@ -1,6 +1,10 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
 {% load wagtailadmin_tags i18n %}
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Delete 1 document {% plural %}Delete {{ counter }} documents{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Delete 1 document {% plural %}Delete {{ counter }} documents{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% trans "Delete documents" as del_str %}
@@ -18,10 +22,12 @@
         </p>
         <ul>
             {% for document in items %}
-                <li>
-                    <a href="{% url 'wagtaildocs:edit' document.item.id %}" target="_blank" rel="noreferrer">{{document.item.title}}</a>
-                    (<a href="{{ document.item.usage_url }}">{% blocktrans trimmed count usage_count=document.item.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
-                </li>
+                {% with usage_count_val=document.item.get_usage.count %}
+                    <li>
+                        <a href="{% url 'wagtaildocs:edit' document.item.id %}" target="_blank" rel="noreferrer">{{document.item.title}}</a>
+                        (<a href="{{ document.item.usage_url }}">{% blocktrans trimmed with usage_count=usage_count_val|intcomma count usage_count_val=usage_count_val %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>)
+                    </li>
+                {% endwith %}
             {% endfor %}
         </ul>
     {% endif %}

wagtail/documents/templates/wagtaildocs/documents/add.html

@@ -1,13 +1,10 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n %}
-{% load wagtailimages_tags wagtailadmin_tags %}
+{% extends "wagtailadmin/generic/form.html" %}
+{% load i18n wagtailadmin_tags %}
 {% block titletag %}{% trans "Add a document" %}{% endblock %}
 
 {% block extra_js %}
     {{ block.super }}
 
-    {{ form.media.js }}
-
     <script>
         $(function() {
             $('#id_file').on(
@@ -39,40 +36,15 @@
     </script>
 {% endblock %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ form.media.css }}
-{% endblock %}
-
-{% block content %}
-    {% trans "Add document" as add_str %}
-    {% include "wagtailadmin/shared/header.html" with title=add_str icon="doc-full-inverse" %}
-
-    <div class="nice-padding">
-        {% include "wagtailadmin/shared/non_field_errors.html" %}
-        <form action="{% url 'wagtaildocs:add' %}" method="POST" enctype="multipart/form-data" novalidate>
-            {% csrf_token %}
-            <ul class="fields">
-                {% for field in form %}
-                    {% if field.is_hidden %}
-                        {{ field }}
-                    {% else %}
-                        <li>{% formattedfield field %}</li>
-                    {% endif %}
-                {% endfor %}
-                <li>
-                    <button
-                        type="submit"
-                        class="button button-longrunning"
-                        data-controller="w-progress"
-                        data-action="w-progress#activate"
-                        data-w-progress-active-value="{% trans 'Uploading…' %}"
-                    >
-                        {% icon name="spinner" %}
-                        <em data-w-progress-target="label">{% trans 'Upload' %}</em>
-                    </button>
-                </li>
-            </ul>
-        </form>
-    </div>
+{% block actions %}
+    <button
+        type="submit"
+        class="button button-longrunning"
+        data-controller="w-progress"
+        data-action="w-progress#activate"
+        data-w-progress-active-value="{% trans 'Uploading…' %}"
+    >
+        {% icon name="spinner" %}
+        <em data-w-progress-target="label">{% trans 'Upload' %}</em>
+    </button>
 {% endblock %}

wagtail/documents/templates/wagtaildocs/documents/edit.html

@@ -1,61 +1,33 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n %}
-{% load wagtailimages_tags wagtailadmin_tags %}
-{% block titletag %}{% blocktrans trimmed with title=document.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
+{% extends "wagtailadmin/generic/edit.html" %}
+{% load i18n wagtailadmin_tags %}
 
-{% block extra_js %}
-    {{ block.super }}
-
-    {{ form.media.js }}
-{% endblock %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {{ form.media.css }}
-{% endblock %}
-
-{% block content %}
-    {% trans "Editing" as editing_str %}
-    {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=document.title icon="doc-full-inverse" %}
-    {% include "wagtailadmin/shared/non_field_errors.html" %}
-
-    <div class="row row-flush nice-padding">
-
-        <div class="col10">
-            <form action="{% url 'wagtaildocs:edit' document.id %}" method="POST" enctype="multipart/form-data" novalidate>
-                {% csrf_token %}
-                <input type="hidden" value="{{ next }}" name="next">
-                <ul class="fields">
-                    {% for field in form %}
-                        {% if field.name == 'file' %}
-                            <li>{% include "wagtaildocs/documents/_file_field.html" %}</li>
-                        {% elif field.is_hidden %}
-                            {{ field }}
-                        {% else %}
-                            <li>{% formattedfield field %}</li>
-                        {% endif %}
-                    {% endfor %}
-                    <li>
-                        <input type="submit" value="{% trans 'Save' %}" class="button" />
-                        {% if user_can_delete %}
-                            <a href="{% url 'wagtaildocs:delete' document.id %}{% if next %}?next={{ next|urlencode }}{% endif %}" class="button no">{% trans "Delete document" %}</a>
-                        {% endif %}
-                    </li>
-                </ul>
-            </form>
-        </div>
-        <div class="col2">
-            <dl>
-                {% if document.file %}
-                    <dt>{% trans "Filesize" %}</dt>
-                    <dd>{% if filesize %}{{ filesize|filesizeformat }}{% else %}{% trans "File not found" %}{% endif %}</dd>
+{% block form_content %}
+    <div class="w-grid w-grid-cols-1 sm:w-grid-cols-6 w-gap-8">
+        <div class="sm:w-col-span-5">
+            <input type="hidden" value="{{ next }}" name="next">
+            {% for field in form %}
+                {% if field.name == 'file' %}
+                    {% include "wagtaildocs/documents/_file_field.html" %}
+                {% elif field.is_hidden %}
+                    {{ field }}
+                {% else %}
+                    {% formattedfield field %}
                 {% endif %}
-
-                <dt>{% trans "Usage" %}</dt>
-                <dd>
-                    <a href="{{ document.usage_url }}">{% blocktrans trimmed count usage_count=document.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>
-                </dd>
-            </dl>
+            {% endfor %}
         </div>
+
+        <dl>
+            {% if document.file %}
+                <dt>{% trans "Filesize" %}</dt>
+                <dd>{% if filesize %}{{ filesize|filesizeformat }}{% else %}{% trans "File not found" %}{% endif %}</dd>
+            {% endif %}
+
+            <dt>{% trans "Usage" %}</dt>
+            <dd>
+                {% with usage_count_val=document.get_usage.count %}
+                    <a href="{{ document.usage_url }}">{% blocktrans trimmed with usage_count=usage_count_val|intcomma count usage_count_val=usage_count_val %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}</a>
+                {% endwith %}
+            </dd>
+        </dl>
     </div>
 {% endblock %}

wagtail/documents/templates/wagtaildocs/documents/index.html

@@ -3,13 +3,10 @@
 
 {% block extra_js %}
     {{ block.super }}
-    <script>
-        window.wagtailConfig.BULK_ACTION_ITEM_TYPE = 'DOCUMENT';
-    </script>
     <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
 {% endblock %}
 
 {% block bulk_actions %}
     {% trans "Select all documents in listing" as select_all_text %}
-    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=select_all_text app_label=model_opts.app_label model_name=model_opts.model_name objects=page_obj parent=current_collection.id %}
+    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=select_all_text app_label=model_opts.app_label model_name=model_opts.model_name objects=page_obj parent=current_collection.id item_type="DOCUMENT" %}
 {% endblock %}

wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html

@@ -4,9 +4,9 @@
     {% icon name="doc-full" %}
     <a href="{% url 'wagtaildocs:index' %}">
         {% blocktrans trimmed count counter=total_docs with total_docs|intcomma as total %}
-            <span>{{ total }}</span> Document <span class="w-sr-only">created in {{ site_name }}</span>
+            {{ total }} Document <span class="w-sr-only">created in {{ site_name }}</span>
         {% plural %}
-            <span>{{ total }}</span> Documents <span class="w-sr-only">created in {{ site_name }}</span>
+            {{ total }} Documents <span class="w-sr-only">created in {{ site_name }}</span>
         {% endblocktrans %}
     </a>
 </li>