wagtail 6.0.1__py3-none-any.whl → 6.1rc1__py3-none-any.whl

wagtail/admin/static/wagtailadmin/js/vendor.js.LICENSE.txt

@@ -5,17 +5,17 @@ object-assign
 */
 
 /*!
-* focus-trap 6.7.2
+* focus-trap 6.9.4
 * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
 */
 
 /*!
-* tabbable 5.2.1
+* tabbable 5.3.3
 * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
 */
 
-/*! axe v4.7.2
- * Copyright (c) 2023 Deque Systems, Inc.
+/*! axe v4.8.4
+ * Copyright (c) 2015 - 2024 Deque Systems, Inc.
  *
  * Your use of this Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

wagtail/admin/static/wagtailadmin/js/wagtailadmin.js

@@ -1 +1 @@
-(()=>{"use strict";var e,t={4174:(e,t,n)=>{var a=n(5781),r=n(9408);const l=(e,t=!("true"===e.getAttribute("aria-expanded")))=>{const n=document.querySelector(`#${e.getAttribute("aria-controls")}`);n&&(e.setAttribute("aria-expanded",`${t}`),t?n.removeAttribute("hidden"):"onbeforematch"in document.body?n.setAttribute("hidden","until-found"):n.setAttribute("hidden",""),e.dispatchEvent(new CustomEvent("commentAnchorVisibilityChange",{bubbles:!0})),e.dispatchEvent(new CustomEvent("wagtail:panel-toggle",{bubbles:!0,cancelable:!1,detail:{expanded:t}})))};function i(e){const t=e.closest("[data-panel]"),n=document.querySelector(`#${e.getAttribute("aria-controls")}`);if(!n||!t||t.collapsibleInitialised)return;t.collapsibleInitialised=!0;const a=l.bind(null,e),r=t.classList.contains("collapsed"),i=n.querySelector('[aria-invalid="true"], .error, .w-field--error'),o=r&&!i;o&&a(!1),e.addEventListener("click",a.bind(null,void 0));const s=t.querySelector("[data-panel-heading]");s&&s.addEventListener("click",a.bind(null,void 0)),n.addEventListener("beforematch",a.bind(null,!0)),e.dispatchEvent(new CustomEvent("wagtail:panel-init",{bubbles:!0,cancelable:!1,detail:{expanded:!o}}))}var o=n(7647),s=n.n(o),c=n(3416),d=n.n(c),u=n(9437),m=n(1302);const p=({expanded:e,floating:t,insideMinimap:n,onClick:a})=>s().createElement("button",{type:"button","aria-expanded":e,onClick:a,className:`button button-small button-secondary w-minimap__collapse-all ${t?"w-minimap__collapse-all--floating":""} ${n?"w-minimap__collapse-all--inside":""}`},s().createElement(m.Z,{name:e?"collapse-up":"collapse-down"}),e?(0,r.ih)("Collapse all"):(0,r.ih)("Expand all")),g=s().createElement("span",{className:"w-required-mark"},"*"),h=({item:e,intersects:t,expanded:n,onClick:a})=>{const{href:l,label:i,icon:o,required:c,errorCount:d,level:u}=e,p=d>0,h=(0,r.qP)("%(num)s error","%(num)s errors",d).replace("%(num)s",`${d}`),f=i.length>22?`${i.substring(0,22)}…`:i;return s().createElement("a",{href:l,className:`w-minimap-item w-minimap-item--${u} ${t?"w-minimap-item--active":""} ${p?"w-minimap-item--error":""}`,onClick:a.bind(null,e),"aria-current":t,tabIndex:n?void 0:-1,"aria-describedby":n?void 0:"w-minimap-toggle"},p?s().createElement("div",{className:"w-minimap-item__errors","aria-label":h},d):null,s().createElement(m.Z,{name:"minus",className:"w-minimap-item__placeholder"}),"h1"!==u&&"h2"!==u?s().createElement(m.Z,{name:o,className:"w-minimap-item__icon"}):null,s().createElement("span",{className:"w-minimap-item__label"},s().createElement("span",{className:"w-minimap-item__text"},f),c?g:null))},f={root:null,rootMargin:"-50px 0px -70px 0px",threshold:.1},b=(e,{target:t,isIntersecting:n})=>(e[`#${t.closest("[data-panel]")?.id}`||""]=n,e),v=({container:e,anchorsContainer:t,links:n,onUpdate:a,toggleAllPanels:i})=>{const c=(0,o.useMemo)((()=>(()=>{let e="false";try{e=localStorage.getItem("wagtail:minimap-expanded")||e}catch{}return"true"===e})()),[]),[d,g]=(0,o.useState)(c),v=(0,o.useCallback)(((e=!d)=>{g(e),document.body.classList.toggle("minimap-open",e);try{localStorage.setItem("wagtail:minimap-expanded",e?"true":"false")}catch{}}),[d,g]),[y,E]=(0,o.useState)(!0),[w,S]=(0,o.useState)({}),x=(0,o.useRef)(null),q=(0,o.useRef)({}),L=(0,o.useRef)(null),A=(0,o.useRef)(null),_=(e,t)=>{d||t.preventDefault(),l(e.toggle,!0),v(!0)};return(0,o.useEffect)((()=>{v(c)}),[]),(0,o.useEffect)((()=>{x.current||(x.current=new IntersectionObserver((t=>{q.current=t.reduce(b,{...q.current}),L.current||(L.current=(0,u.D)((e=>{S(e),(e=>{const t=e.querySelectorAll('a[aria-current="true"]');if(0===t.length||e.scrollHeight===e.clientHeight)return;const n=t[0],a=t[t.length-1];let r=e.scrollTop;n&&n.offsetTop<e.scrollTop&&(r=n.offsetTop),a&&a.offsetTop>e.scrollTop+e.offsetHeight&&(r=a.offsetTop-e.offsetHeight+a.offsetHeight),e.scrollTop=r})(A.current)}),100)),L.current(q.current),t.forEach((({target:t})=>{t.closest(".deleted")&&a(e)}))}),f));const t=x.current;return t.disconnect(),n.forEach((({panel:e,toggle:n})=>{const a=e.matches(".w-panel--nested")&&null===e.closest("[data-field]");t.observe(a?n:e)})),()=>{t.disconnect()}}),[n,e]),(0,o.useEffect)((()=>{E(!0)}),[t,E]),s().createElement("div",null,s().createElement(p,{expanded:y,onClick:()=>{E(!y),i(!y)},floating:!0,insideMinimap:d}),s().createElement("div",{className:"w-minimap "+(d?"w-minimap--expanded":"")},s().createElement("div",{className:"w-minimap__header"},s().createElement("button",{id:"w-minimap-toggle",type:"button","aria-expanded":d,onClick:()=>v(!d),className:"w-minimap__toggle","aria-label":(0,r.ih)("Toggle side panel")},s().createElement(m.Z,{name:"expand-right"}))),s().createElement("ol",{className:"w-minimap__list",ref:A},n.map((e=>s().createElement("li",{key:e.href},s().createElement(h,{item:e,intersects:w[e.href],expanded:d,onClick:_}))))),s().createElement("div",{className:"w-minimap__footer"})))},y=e=>{const t=e.closest("[data-panel]"),n=t?.getAttribute("aria-labelledby"),a=t?.querySelector(`#${n}`),r=t?.querySelector("[data-panel-toggle]"),l=e.closest("[data-inline-panel-child].deleted");if(!t||!a||!r||l)return null;const i=a.querySelector("[data-panel-heading-text]"),o=i?.textContent||a.textContent?.replace(/\s+\*\s+$/g,"").trim(),s=null!==t.querySelector("[data-panel-required]"),c=r.querySelector("use"),d=c?.getAttribute("href")?.replace("#icon-","")||"",u=`h${a.getAttribute("aria-level")||a.tagName[1]||2}`,m=[].slice.call(t.querySelectorAll(".error-message")).filter((e=>e.closest("[data-panel]")===t)).length;return{anchor:e,toggle:r,panel:t,icon:d,label:o||"",href:e.getAttribute("href")||"",required:s,errorCount:m,level:u}},E=e=>{let t=document.body;const n=document.querySelector("[data-tabs]");if(n){const e=n.querySelector('[role="tab"][aria-selected="true"]'),a=e?.getAttribute("aria-controls");t=n.querySelector(`#${a}`)||t}const a=t.querySelectorAll("[data-panel-anchor]"),r=[].slice.call(a).map(y).filter(Boolean);d().render(s().createElement(v,{container:e,anchorsContainer:t,links:r,onUpdate:E,toggleAllPanels:e=>{r.forEach(((t,n)=>{0===n&&t.href.includes("title")||l(t.toggle,e)}))}}),e)};document.addEventListener("DOMContentLoaded",(()=>{(0,a.U)(),function(){const e=document.querySelector("[data-form-side]");if(!e)return;const t="formSideExplorer"in e.dataset,n=document.querySelector("[data-form-side-resize-grip]"),a=document.querySelector("[data-form-side-width-input]"),l=()=>{const t=getComputedStyle(e),n=parseFloat(t.minWidth),a=parseFloat(t.maxWidth),r=parseFloat(t.width),l=a-n;return{minWidth:n,maxWidth:a,width:r,range:l,percentage:(r-n)/l*100}},i=e=>"rtl"===document.documentElement.dir?e:100-e;let o;const s=n=>{clearTimeout(o);const r=document.querySelector("body"),s=document.querySelector(`[data-side-panel-toggle="${n}"]`);if((!n||s)&&(""===n?(e.classList.remove("form-side--open"),e.removeAttribute("aria-labelledby")):(e.classList.add("form-side--open"),e.setAttribute("aria-labelledby",`side-panel-${n}-title`)),document.querySelectorAll("[data-side-panel]").forEach((t=>{const a=t.dataset.sidePanel;if(a===n)t.hidden&&(t.hidden=!1,t.dispatchEvent(new CustomEvent("show")),e.classList.add(`form-side--${a}`),r.classList.add("side-panel-open"));else if(!t.hidden){const l=()=>{t.hidden=!0,t.dispatchEvent(new CustomEvent("hide")),e.classList.remove(`form-side--${a}`)};""===n?(r.classList.remove("side-panel-open"),o=setTimeout(l,500)):l()}})),document.querySelectorAll("[data-side-panel-toggle]").forEach((e=>{e.setAttribute("aria-expanded",e.dataset.sidePanelToggle===n?"true":"false")})),!t)){try{localStorage.setItem("wagtail:side-panel-open",n)}catch(e){}setTimeout((()=>{const{percentage:e}=l();a.value=i(e)}),500)}};document.querySelectorAll("[data-side-panel]").forEach((e=>{e.addEventListener("open",(()=>{s(e.dataset.sidePanel)}))})),document.querySelectorAll("[data-side-panel-toggle]").forEach((e=>{e.addEventListener("click",(()=>{(e=>{const t=!document.querySelector(`[data-side-panel="${e}"]`).hasAttribute("hidden");s(t?"":e)})(e.dataset.sidePanelToggle)}))}));const c=document.querySelector("[data-form-side-close-button]");c instanceof HTMLButtonElement&&c.addEventListener("click",(()=>{s("")}));const d=e=>{const{minWidth:n,maxWidth:o,range:s,width:c}=l(),d=parseInt(Math.max(n,Math.min(e,o)),10)||c,u=(0,r.qP)("%(num)s pixel","%(num)s pixels",d).replace("%(num)s",d);document.documentElement.style.setProperty("--side-panel-width",`${d}px`);const m=(d-n)/s*100;if(a.value=i(m),a.setAttribute("aria-valuetext",u),!t)try{localStorage.setItem("wagtail:side-panel-width",d)}catch(e){}};let u,m;const p=e=>{if(!e.screenX||!u||!m)return;const t="rtl"===document.documentElement.dir?-1:1,n=u-e.screenX;d(m+n*t)},g=e=>{n.releasePointerCapture(e.pointerId),n.removeEventListener("pointermove",p),document.removeEventListener("pointerup",g),document.body.classList.remove("side-panel-resizing")};n.addEventListener("pointerdown",(e=>{0===e.button&&(u=e.screenX,m=l().width,document.body.classList.add("side-panel-resizing"),n.setPointerCapture(e.pointerId),n.addEventListener("pointermove",p),document.addEventListener("pointerup",g))})),a.addEventListener("change",(e=>{const{minWidth:t,range:n}=l(),a=parseInt(e.target.value,10),r=i(a);d(t+n*r/100)})),setTimeout((()=>{try{const e=localStorage.getItem("wagtail:side-panel-open");!t&&e&&s(e),d(localStorage.getItem("wagtail:side-panel-width"))}catch(e){}setTimeout((()=>{e.classList.remove("form-side--initial")}))}))}(),function(e=document.querySelectorAll("[data-panel-toggle]")){e.forEach(i)}()})),window.addEventListener("load",(()=>{!function(e=document.querySelector("[data-panel]:target")){e&&e.scrollIntoView({behavior:"smooth"})}(),((e=document.querySelector("[data-minimap-container]"))=>{if(!e)return;if(!document.body.querySelectorAll("[data-panel-anchor]").length)return;const t=(0,u.D)(E.bind(null,e),100);document.addEventListener("wagtail:tab-changed",t),document.addEventListener("wagtail:panel-init",t);const n=()=>e.style.setProperty("--offset-top",`${e.offsetTop}px`),a=(0,u.D)(n,100);document.addEventListener("resize",a),n(),t(e)})()}))}},n={};function a(e){var r=n[e];if(void 0!==r)return r.exports;var l=n[e]={id:e,loaded:!1,exports:{}};return t[e].call(l.exports,l,l.exports,a),l.loaded=!0,l.exports}a.m=t,e=[],a.O=(t,n,r,l)=>{if(!n){var i=1/0;for(d=0;d<e.length;d++){for(var[n,r,l]=e[d],o=!0,s=0;s<n.length;s++)(!1&l||i>=l)&&Object.keys(a.O).every((e=>a.O[e](n[s])))?n.splice(s--,1):(o=!1,l<i&&(i=l));if(o){e.splice(d--,1);var c=r();void 0!==c&&(t=c)}}return t}l=l||0;for(var d=e.length;d>0&&e[d-1][2]>l;d--)e[d]=e[d-1];e[d]=[n,r,l]},a.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return a.d(t,{a:t}),t},a.d=(e,t)=>{for(var n in t)a.o(t,n)&&!a.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.j=404,(()=>{var e={404:0};a.O.j=t=>0===e[t];var t=(t,n)=>{var r,l,[i,o,s]=n,c=0;if(i.some((t=>0!==e[t]))){for(r in o)a.o(o,r)&&(a.m[r]=o[r]);if(s)var d=s(a)}for(t&&t(n);c<i.length;c++)l=i[c],a.o(e,l)&&e[l]&&e[l][0](),e[l]=0;return a.O(d)},n=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];n.forEach(t.bind(null,0)),n.push=t.bind(null,n.push.bind(n))})();var r=a.O(void 0,[751],(()=>a(4174)));r=a.O(r)})();
+(()=>{"use strict";var e,t={412:(e,t,n)=>{var a=n(6664),r=n(2833);const l=(e,t=!("true"===e.getAttribute("aria-expanded")))=>{const n=document.querySelector(`#${e.getAttribute("aria-controls")}`);n&&(e.setAttribute("aria-expanded",`${t}`),t?n.removeAttribute("hidden"):"onbeforematch"in document.body?n.setAttribute("hidden","until-found"):n.setAttribute("hidden",""),e.dispatchEvent(new CustomEvent("commentAnchorVisibilityChange",{bubbles:!0})),e.dispatchEvent(new CustomEvent("wagtail:panel-toggle",{bubbles:!0,cancelable:!1,detail:{expanded:t}})))};function i(e){const t=e.closest("[data-panel]"),n=document.querySelector(`#${e.getAttribute("aria-controls")}`);if(!n||!t||t.collapsibleInitialised)return;t.collapsibleInitialised=!0;const a=l.bind(null,e),r=t.classList.contains("collapsed"),i=n.querySelector('[aria-invalid="true"], .error, .w-field--error'),o=r&&!i;o&&a(!1),e.addEventListener("click",a.bind(null,void 0));const s=t.querySelector("[data-panel-heading]");s&&s.addEventListener("click",a.bind(null,void 0)),n.addEventListener("beforematch",a.bind(null,!0)),e.dispatchEvent(new CustomEvent("wagtail:panel-init",{bubbles:!0,cancelable:!1,detail:{expanded:!o}}))}var o=n(2427),s=n.n(o),c=n(6931),d=n.n(c),u=n(8667),m=n(1238);const p=({expanded:e,floating:t,insideMinimap:n,onClick:a})=>s().createElement("button",{type:"button","aria-expanded":e,onClick:a,className:`button button-small button-secondary w-minimap__collapse-all ${t?"w-minimap__collapse-all--floating":""} ${n?"w-minimap__collapse-all--inside":""}`},s().createElement(m.A,{name:e?"collapse-up":"collapse-down"}),e?(0,r.AP)("Collapse all"):(0,r.AP)("Expand all")),g=s().createElement("span",{className:"w-required-mark"},"*"),f=({item:e,intersects:t,expanded:n,onClick:a})=>{const{href:l,label:i,icon:o,required:c,errorCount:d,level:u}=e,p=d>0,f=(0,r.WI)("%(num)s error","%(num)s errors",d).replace("%(num)s",`${d}`),h=i.length>22?`${i.substring(0,22)}…`:i;return s().createElement("a",{href:l,className:`w-minimap-item w-minimap-item--${u} ${t?"w-minimap-item--active":""} ${p?"w-minimap-item--error":""}`,onClick:a.bind(null,e),"aria-current":t,tabIndex:n?void 0:-1,"aria-describedby":n?void 0:"w-minimap-toggle"},p?s().createElement("div",{className:"w-minimap-item__errors","aria-label":f},d):null,s().createElement(m.A,{name:"minus",className:"w-minimap-item__placeholder"}),"h1"!==u&&"h2"!==u?s().createElement(m.A,{name:o,className:"w-minimap-item__icon"}):null,s().createElement("span",{className:"w-minimap-item__label"},s().createElement("span",{className:"w-minimap-item__text"},h),c?g:null))},h={root:null,rootMargin:"-50px 0px -70px 0px",threshold:.1},b=(e,{target:t,isIntersecting:n})=>{const a=t.closest("[data-panel]")?.id;return a?(e[`#${a}`]=n,e):e},v=({container:e,anchorsContainer:t,links:n,onUpdate:a,toggleAllPanels:i})=>{const c=(0,o.useMemo)((()=>(()=>{let e="false";try{e=localStorage.getItem("wagtail:minimap-expanded")||e}catch{}return"true"===e})()),[]),[d,g]=(0,o.useState)(c),v=(0,o.useCallback)(((e=!d)=>{g(e),document.body.classList.toggle("minimap-open",e);try{localStorage.setItem("wagtail:minimap-expanded",e?"true":"false")}catch{}}),[d,g]),[y,E]=(0,o.useState)(!0),[w,S]=(0,o.useState)({}),x=(0,o.useRef)(null),A=(0,o.useRef)({}),q=(0,o.useRef)(null),L=(0,o.useRef)(null),_=(e,t)=>{d||t.preventDefault(),l(e.toggle,!0),v(!0)};return(0,o.useEffect)((()=>{v(c)}),[]),(0,o.useEffect)((()=>{x.current||(x.current=new IntersectionObserver((t=>{A.current=t.reduce(b,{...A.current}),q.current||(q.current=(0,u.s)((e=>{S(e),(e=>{const t=e.querySelectorAll('a[aria-current="true"]');if(0===t.length||e.scrollHeight===e.clientHeight)return;const n=t[0],a=t[t.length-1];let r=e.scrollTop;n&&n.offsetTop<e.scrollTop&&(r=n.offsetTop),a&&a.offsetTop>e.scrollTop+e.offsetHeight&&(r=a.offsetTop-e.offsetHeight+a.offsetHeight),e.scrollTop=r})(L.current)}),100)),q.current(A.current),t.forEach((({target:t})=>{t.closest(".deleted")&&a(e)}))}),h));const t=x.current;return t.disconnect(),n.forEach((({panel:e,toggle:n})=>{const a=e.matches(".w-panel--nested")&&null===e.closest("[data-field]");t.observe(a?n:e)})),()=>{t.disconnect()}}),[n,e]),(0,o.useEffect)((()=>{E(!0)}),[t,E]),s().createElement("div",null,s().createElement(p,{expanded:y,onClick:()=>{E(!y),i(!y)},floating:!0,insideMinimap:d}),s().createElement("div",{className:"w-minimap "+(d?"w-minimap--expanded":"")},s().createElement("div",{className:"w-minimap__header"},s().createElement("button",{id:"w-minimap-toggle",type:"button","aria-expanded":d,onClick:()=>v(!d),className:"w-minimap__toggle","aria-label":(0,r.AP)("Toggle side panel")},s().createElement(m.A,{name:"expand-right"}))),s().createElement("ol",{className:"w-minimap__list",ref:L},n.map((e=>s().createElement("li",{key:e.href},s().createElement(f,{item:e,intersects:w[e.href],expanded:d,onClick:_}))))),s().createElement("div",{className:"w-minimap__footer"})))},y=e=>{const t=e.closest("[data-panel]"),n=t?.getAttribute("aria-labelledby"),a=t?.querySelector(`#${n}`),r=t?.querySelector("[data-panel-toggle]"),l=e.closest("[data-inline-panel-child].deleted");if(!t||!a||!r||l)return null;const i=a.querySelector("[data-panel-heading-text]"),o=i?.textContent||a.textContent?.replace(/\s+\*\s+$/g,"").trim(),s=null!==t.querySelector("[data-panel-required]"),c=r.querySelector("use"),d=c?.getAttribute("href")?.replace("#icon-","")||"",u=`h${a.getAttribute("aria-level")||a.tagName[1]||2}`,m=[].slice.call(t.querySelectorAll(".error-message")).filter((e=>e.closest("[data-panel]")===t)).length;return{anchor:e,toggle:r,panel:t,icon:d,label:o||"",href:e.getAttribute("href")||"",required:s,errorCount:m,level:u}},E=e=>{let t=document.body;const n=document.querySelector("[data-tabs]");if(n){const e=n.querySelector('[role="tab"][aria-selected="true"]'),a=e?.getAttribute("aria-controls");t=n.querySelector(`#${a}`)||t}const a=t.querySelectorAll("[data-panel-anchor]"),r=[].slice.call(a).map(y).filter(Boolean);d().render(s().createElement(v,{container:e,anchorsContainer:t,links:r,onUpdate:E,toggleAllPanels:e=>{r.forEach(((t,n)=>{0===n&&t.href.includes("title")||l(t.toggle,e)}))}}),e)};document.addEventListener("DOMContentLoaded",(()=>{(0,a.d)(),function(){const e=document.querySelector("[data-form-side]");if(!e)return;const t="formSideExplorer"in e.dataset,n=document.querySelector("[data-form-side-resize-grip]"),a=document.querySelector("[data-form-side-width-input]"),l=()=>{const t=getComputedStyle(e),n=parseFloat(t.minWidth),a=parseFloat(t.maxWidth),r=parseFloat(t.width),l=a-n;return{minWidth:n,maxWidth:a,width:r,range:l,percentage:(r-n)/l*100}},i=e=>"rtl"===document.documentElement.dir?e:100-e;let o;const s=n=>{clearTimeout(o);const r=document.querySelector("body"),s=document.querySelector(`[data-side-panel-toggle="${n}"]`);if((!n||s)&&(""===n?(e.classList.remove("form-side--open"),e.removeAttribute("aria-labelledby")):(e.classList.add("form-side--open"),e.setAttribute("aria-labelledby",`side-panel-${n}-title`)),document.querySelectorAll("[data-side-panel]").forEach((t=>{const a=t.dataset.sidePanel;if(a===n)t.hidden&&(t.hidden=!1,t.dispatchEvent(new CustomEvent("show")),e.classList.add(`form-side--${a}`),r.classList.add("side-panel-open"));else if(!t.hidden){const l=()=>{t.hidden=!0,t.dispatchEvent(new CustomEvent("hide")),e.classList.remove(`form-side--${a}`)};""===n?(r.classList.remove("side-panel-open"),o=setTimeout(l,500)):l()}})),document.querySelectorAll("[data-side-panel-toggle]").forEach((e=>{e.setAttribute("aria-expanded",e.dataset.sidePanelToggle===n?"true":"false")})),!t)){try{localStorage.setItem("wagtail:side-panel-open",n)}catch(e){}setTimeout((()=>{const{percentage:e}=l();a.value=i(e)}),500)}};document.querySelectorAll("[data-side-panel]").forEach((e=>{e.addEventListener("open",(()=>{s(e.dataset.sidePanel)}))})),document.querySelectorAll("[data-side-panel-toggle]").forEach((e=>{e.addEventListener("click",(()=>{(e=>{const t=!document.querySelector(`[data-side-panel="${e}"]`).hasAttribute("hidden");s(t?"":e)})(e.dataset.sidePanelToggle)}))}));const c=document.querySelector("[data-form-side-close-button]");c instanceof HTMLButtonElement&&c.addEventListener("click",(()=>{s("")}));const d=e=>{const{minWidth:n,maxWidth:o,range:s,width:c}=l(),d=parseInt(Math.max(n,Math.min(e,o)),10)||c,u=(0,r.WI)("%(num)s pixel","%(num)s pixels",d).replace("%(num)s",d);document.documentElement.style.setProperty("--side-panel-width",`${d}px`);const m=(d-n)/s*100;if(a.value=i(m),a.setAttribute("aria-valuetext",u),!t)try{localStorage.setItem("wagtail:side-panel-width",d)}catch(e){}};let u,m;const p=e=>{if(!e.screenX||!u||!m)return;const t="rtl"===document.documentElement.dir?-1:1,n=u-e.screenX;d(m+n*t)},g=e=>{n.releasePointerCapture(e.pointerId),n.removeEventListener("pointermove",p),document.removeEventListener("pointerup",g),document.body.classList.remove("side-panel-resizing")};n.addEventListener("pointerdown",(e=>{0===e.button&&(u=e.screenX,m=l().width,document.body.classList.add("side-panel-resizing"),n.setPointerCapture(e.pointerId),n.addEventListener("pointermove",p),document.addEventListener("pointerup",g))})),a.addEventListener("change",(e=>{const{minWidth:t,range:n}=l(),a=parseInt(e.target.value,10),r=i(a);d(t+n*r/100)})),setTimeout((()=>{try{const e=localStorage.getItem("wagtail:side-panel-open");!t&&e&&s(e),d(localStorage.getItem("wagtail:side-panel-width"))}catch(e){}setTimeout((()=>{e.classList.remove("form-side--initial")}))}))}(),function(e=document.querySelectorAll("[data-panel-toggle]")){e.forEach(i)}()})),window.addEventListener("load",(()=>{!function(e=document.querySelector("[data-panel]:target")){e&&e.scrollIntoView({behavior:"smooth"})}(),((e=document.querySelector("[data-minimap-container]"))=>{if(!e)return;if(!document.body.querySelectorAll("[data-panel-anchor]").length)return;const t=(0,u.s)(E.bind(null,e),100);document.addEventListener("wagtail:tab-changed",t),document.addEventListener("wagtail:panel-init",t);const n=()=>e.style.setProperty("--offset-top",`${e.offsetTop}px`),a=(0,u.s)(n,100);document.addEventListener("resize",a),n(),t(e)})()}))}},n={};function a(e){var r=n[e];if(void 0!==r)return r.exports;var l=n[e]={id:e,loaded:!1,exports:{}};return t[e].call(l.exports,l,l.exports,a),l.loaded=!0,l.exports}a.m=t,e=[],a.O=(t,n,r,l)=>{if(!n){var i=1/0;for(d=0;d<e.length;d++){for(var[n,r,l]=e[d],o=!0,s=0;s<n.length;s++)(!1&l||i>=l)&&Object.keys(a.O).every((e=>a.O[e](n[s])))?n.splice(s--,1):(o=!1,l<i&&(i=l));if(o){e.splice(d--,1);var c=r();void 0!==c&&(t=c)}}return t}l=l||0;for(var d=e.length;d>0&&e[d-1][2]>l;d--)e[d]=e[d-1];e[d]=[n,r,l]},a.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return a.d(t,{a:t}),t},a.d=(e,t)=>{for(var n in t)a.o(t,n)&&!a.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.j=445,(()=>{var e={445:0};a.O.j=t=>0===e[t];var t=(t,n)=>{var r,l,[i,o,s]=n,c=0;if(i.some((t=>0!==e[t]))){for(r in o)a.o(o,r)&&(a.m[r]=o[r]);if(s)var d=s(a)}for(t&&t(n);c<i.length;c++)l=i[c],a.o(e,l)&&e[l]&&e[l][0](),e[l]=0;return a.O(d)},n=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];n.forEach(t.bind(null,0)),n.push=t.bind(null,n.push.bind(n))})();var r=a.O(void 0,[321],(()=>a(412)));r=a.O(r)})();

wagtail/admin/static/wagtailadmin/js/workflow-action.js

@@ -1 +1 @@
-(()=>{"use strict";var o,e={3152:(o,e,t)=>{var n=t(5311),r=t.n(n);function a(o,e,t){const n=document.createElement("input");n.type="hidden",n.name=e,n.value=t,o.appendChild(n)}window._addHiddenInput=a,window.ActivateWorkflowActionsForDashboard=function(o){document.querySelectorAll("[data-workflow-action-url]").forEach((e=>{e.addEventListener("click",(t=>{if(t.preventDefault(),"launchModal"in e.dataset)ModalWorkflow({url:e.dataset.workflowActionUrl,onload:{action(o){const e=document.createElement("input");e.type="hidden",e.name="next",e.value=window.location,r()("form",o.body).append(e),o.ajaxifyForm(r()("form",o.body))},success(o,e){window.location.href=e.redirect}}});else{const t=document.createElement("form");t.action=e.dataset.workflowActionUrl,t.method="POST",a(t,"csrfmiddlewaretoken",o),a(t,"next",window.location),document.body.appendChild(t),t.submit()}}),{capture:!0})}))},window.ActivateWorkflowActionsForEditView=function(o){const e=r()(o).get(0);document.querySelectorAll("[data-workflow-action-name]").forEach((o=>{o.addEventListener("click",(t=>{"workflowActionModalUrl"in o.dataset?(t.preventDefault(),t.stopPropagation(),ModalWorkflow({url:o.dataset.workflowActionModalUrl,onload:{action(o){o.ajaxifyForm(r()("form",o.body))},success(t,n){a(e,"action-workflow-action","true"),a(e,"workflow-action-name",o.dataset.workflowActionName),a(e,"workflow-action-extra-data",JSON.stringify(n.cleaned_data)),r()(e).submit()}}})):(a(e,"action-workflow-action","true"),a(e,"workflow-action-name",o.dataset.workflowActionName))}),{capture:!0})}))}},5311:o=>{o.exports=jQuery}},t={};function n(o){var r=t[o];if(void 0!==r)return r.exports;var a=t[o]={id:o,loaded:!1,exports:{}};return e[o].call(a.exports,a,a.exports,n),a.loaded=!0,a.exports}n.m=e,o=[],n.O=(e,t,r,a)=>{if(!t){var i=1/0;for(f=0;f<o.length;f++){for(var[t,r,a]=o[f],l=!0,d=0;d<t.length;d++)(!1&a||i>=a)&&Object.keys(n.O).every((o=>n.O[o](t[d])))?t.splice(d--,1):(l=!1,a<i&&(i=a));if(l){o.splice(f--,1);var c=r();void 0!==c&&(e=c)}}return e}a=a||0;for(var f=o.length;f>0&&o[f-1][2]>a;f--)o[f]=o[f-1];o[f]=[t,r,a]},n.n=o=>{var e=o&&o.__esModule?()=>o.default:()=>o;return n.d(e,{a:e}),e},n.d=(o,e)=>{for(var t in e)n.o(e,t)&&!n.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:e[t]})},n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(o){if("object"==typeof window)return window}}(),n.o=(o,e)=>Object.prototype.hasOwnProperty.call(o,e),n.r=o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})},n.nmd=o=>(o.paths=[],o.children||(o.children=[]),o),n.j=477,(()=>{var o={477:0};n.O.j=e=>0===o[e];var e=(e,t)=>{var r,a,[i,l,d]=t,c=0;if(i.some((e=>0!==o[e]))){for(r in l)n.o(l,r)&&(n.m[r]=l[r]);if(d)var f=d(n)}for(e&&e(t);c<i.length;c++)a=i[c],n.o(o,a)&&o[a]&&o[a][0](),o[a]=0;return n.O(f)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(e.bind(null,0)),t.push=e.bind(null,t.push.bind(t))})();var r=n.O(void 0,[751],(()=>n(3152)));r=n.O(r)})();
+(()=>{"use strict";var o,e={8080:(o,e,t)=>{var n=t(1669),r=t.n(n);function a(o,e,t){const n=document.createElement("input");n.type="hidden",n.name=e,n.value=t,o.appendChild(n)}window._addHiddenInput=a,window.ActivateWorkflowActionsForDashboard=function(o){document.querySelectorAll("[data-workflow-action-url]").forEach((e=>{e.addEventListener("click",(t=>{if(t.preventDefault(),"launchModal"in e.dataset)ModalWorkflow({url:e.dataset.workflowActionUrl,onload:{action(o){const e=document.createElement("input");e.type="hidden",e.name="next",e.value=window.location,r()("form",o.body).append(e),o.ajaxifyForm(r()("form",o.body))},success(o,e){window.location.href=e.redirect}}});else{const t=document.createElement("form");t.action=e.dataset.workflowActionUrl,t.method="POST",a(t,"csrfmiddlewaretoken",o),a(t,"next",window.location),document.body.appendChild(t),t.submit()}}),{capture:!0})}))},window.ActivateWorkflowActionsForEditView=function(o){const e=r()(o).get(0);document.querySelectorAll("[data-workflow-action-name]").forEach((o=>{o.addEventListener("click",(t=>{"workflowActionModalUrl"in o.dataset?(t.preventDefault(),t.stopPropagation(),ModalWorkflow({url:o.dataset.workflowActionModalUrl,onload:{action(o){o.ajaxifyForm(r()("form",o.body))},success(t,n){a(e,"action-workflow-action","true"),a(e,"workflow-action-name",o.dataset.workflowActionName),a(e,"workflow-action-extra-data",JSON.stringify(n.cleaned_data)),r()(e).submit()}}})):(a(e,"action-workflow-action","true"),a(e,"workflow-action-name",o.dataset.workflowActionName))}),{capture:!0})}))}},1669:o=>{o.exports=jQuery}},t={};function n(o){var r=t[o];if(void 0!==r)return r.exports;var a=t[o]={id:o,loaded:!1,exports:{}};return e[o].call(a.exports,a,a.exports,n),a.loaded=!0,a.exports}n.m=e,o=[],n.O=(e,t,r,a)=>{if(!t){var i=1/0;for(f=0;f<o.length;f++){for(var[t,r,a]=o[f],l=!0,d=0;d<t.length;d++)(!1&a||i>=a)&&Object.keys(n.O).every((o=>n.O[o](t[d])))?t.splice(d--,1):(l=!1,a<i&&(i=a));if(l){o.splice(f--,1);var c=r();void 0!==c&&(e=c)}}return e}a=a||0;for(var f=o.length;f>0&&o[f-1][2]>a;f--)o[f]=o[f-1];o[f]=[t,r,a]},n.n=o=>{var e=o&&o.__esModule?()=>o.default:()=>o;return n.d(e,{a:e}),e},n.d=(o,e)=>{for(var t in e)n.o(e,t)&&!n.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:e[t]})},n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(o){if("object"==typeof window)return window}}(),n.o=(o,e)=>Object.prototype.hasOwnProperty.call(o,e),n.r=o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})},n.nmd=o=>(o.paths=[],o.children||(o.children=[]),o),n.j=327,(()=>{var o={327:0};n.O.j=e=>0===o[e];var e=(e,t)=>{var r,a,[i,l,d]=t,c=0;if(i.some((e=>0!==o[e]))){for(r in l)n.o(l,r)&&(n.m[r]=l[r]);if(d)var f=d(n)}for(e&&e(t);c<i.length;c++)a=i[c],n.o(o,a)&&o[a]&&o[a][0](),o[a]=0;return n.O(f)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(e.bind(null,0)),t.push=e.bind(null,t.push.bind(t))})();var r=n.O(void 0,[321],(()=>n(8080)));r=n.O(r)})();

wagtail/admin/staticfiles.py

@@ -29,6 +29,7 @@ except AttributeError:
 
 
 if use_version_strings:
+    # SECRET_KEY is used to prevent exposing the Wagtail version
     VERSION_HASH = hashlib.sha1(
         (__version__ + settings.SECRET_KEY).encode("utf-8")
     ).hexdigest()[:8]

wagtail/admin/templates/wagtailadmin/admin_base.html

@@ -56,6 +56,7 @@
     <script src="{% versioned_static 'wagtailadmin/js/wagtailadmin.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/telepath/telepath.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/sidebar.js' %}"></script>
+    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
 
     {% hook_output 'insert_global_admin_js' %}
 

wagtail/admin/templates/wagtailadmin/base.html

@@ -5,6 +5,7 @@
     <template data-wagtail-sidebar-branding-logo>{% block branding_logo %}{% endblock %}</template>
     {% sidebar_props %}
     <aside id="wagtail-sidebar" class="sidebar-loading" data-wagtail-sidebar aria-label="{% trans 'Sidebar' %}"></aside>
+    {% keyboard_shortcuts_dialog %}
     <main class="content-wrapper w-overflow-x-hidden" id="main">
         <div class="content">
             {# Always show messages div so it can be appended to by JS #}

wagtail/admin/templates/wagtailadmin/collection_privacy/set_privacy.html

@@ -3,7 +3,9 @@
 <form action="{% url 'wagtailadmin_collections:set_privacy' collection.id %}" method="POST" novalidate>
     {% csrf_token %}
     {% formattedfield field=form.restriction_type show_label=False %}
-    {% formattedfield form.password %}
+    {% if form.password is not None %}
+        {% formattedfield form.password %}
+    {% endif %}
     <div id="groups-fields">
         {% formattedfield form.groups %}
     </div>

wagtail/admin/templates/wagtailadmin/collections/edit.html

@@ -7,6 +7,5 @@
 
 {% block extra_js %}
     {{ block.super }}
-    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/collections/index_results.html

@@ -0,0 +1,10 @@
+{% extends "wagtailadmin/generic/index_results.html" %}
+{% load i18n wagtailadmin_tags %}
+
+{% block no_results_message %}
+    <p>
+        {% blocktrans trimmed with add_collection_url=add_url %}
+            No collections have been created. Why not <a href="{{ add_collection_url }}">add one</a>?
+        {% endblocktrans %}
+    </p>
+{% endblock %}

wagtail/admin/templates/wagtailadmin/generic/base.html

@@ -8,16 +8,8 @@
     {% block header %}
         {% block slim_header %}
             {% if breadcrumbs_items %}
-                {% fragment stripped as actions %}
-                    {% block header_buttons %}
-                        {% for button in header_buttons %}
-                            {% component button %}
-                        {% endfor %}
-                    {% endblock %}
-                {% endfragment %}
-
                 {# Ensure all necessary variables are passed explicitly here #}
-                {% include "wagtailadmin/shared/headers/slim_header.html" with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url title=header_title search_url=index_results_url search_form=search_form filters=filters actions=actions only %}
+                {% include "wagtailadmin/shared/headers/slim_header.html" with breadcrumbs_items=breadcrumbs_items side_panels=side_panels history_url=history_url title=header_title search_url=index_results_url search_form=search_form filters=filters buttons=header_buttons icon_name=header_icon only %}
             {% endif %}
         {% endblock %}
         {% block main_header %}

wagtail/admin/templates/wagtailadmin/generic/form.html

@@ -4,8 +4,9 @@
 
 {% block main_header %}
     {% if breadcrumbs_items %}
-        <div class="w-header nice-padding w-mt-8">
-            <h2 class="w-header__title" id="header-title">
+        <div class="nice-padding w-mt-8">
+            <h2 class="w-relative w-h1" id="header-title">
+                {% icon classname="w-absolute w-top-1 -w-left-11 w-max-w-[1em] w-max-h-[1em]" name=header_icon %}
                 {{ page_subtitle }}
             </h2>
         </div>
@@ -44,6 +45,7 @@
 {% block extra_js %}
     {{ block.super }}
     {{ media.js }}
+    {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
 
 {% block extra_css %}

wagtail/admin/templates/wagtailadmin/generic/history/action_cell.html

@@ -0,0 +1,27 @@
+{% load i18n wagtailadmin_tags %}
+
+<td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
+    <div class="w-flex w-items-center w-justify-between">
+        <div>
+            <div class="w-flex w-items-center w-gap-2">
+                {{ value }}
+
+                {% if status %}
+                    {% status status classname="w-status--primary" %}
+                {% endif %}
+            </div>
+
+            {% if instance.comment %}
+                <div>{% trans "Comment" %}: <em>{{ instance.comment }}</em></div>
+            {% endif %}
+        </div>
+
+        {% if actions %}
+            {% dropdown toggle_icon="dots-horizontal" toggle_aria_label=_("Actions") %}
+                {% for action in actions %}
+                    <a href="{{ action.url }}">{{ action.label }}</a>
+                {% endfor %}
+            {% enddropdown %}
+        {% endif %}
+    </div>
+</td>

wagtail/admin/templates/wagtailadmin/generic/index_results.html

@@ -12,6 +12,14 @@
         </template>
     {% endif %}
 
+    {% if render_buttons_fragment %}
+        <template data-controller="w-teleport" data-w-teleport-target-value="#w-slim-header-buttons" data-w-teleport-reset-value="true">
+            {% for button in header_buttons %}
+                {% component button %}
+            {% endfor %}
+        </template>
+    {% endif %}
+
     {% if is_searching and view.show_other_searches %}
         <div class="nice-padding">
             {% search_other %}

wagtail/admin/templates/wagtailadmin/home/workflow_objects_to_moderate.html

@@ -54,11 +54,11 @@
                                                 {% if obj.is_previewable %}
                                                     <a href="{% url state.workflow_preview_url_name obj.pk|admin_urlquote task_state.task.id %}" target="_blank" rel="noreferrer">{% trans 'Preview' %}</a>
                                                 {% endif %}
-                                                {% if state.live_revision %}
+                                                {% if state.live_revision_id %}
                                                     <a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote 'live' revision.id %}">{% trans "Compare with live version" %}</a>
                                                 {% endif %}
-                                                {% if state.previous_revision %}
-                                                    <a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote state.previous_revision.id revision.id %}">{% trans "Compare with previous version" %}</a>
+                                                {% if state.previous_revision_id %}
+                                                    <a href="{% url state.revisions_compare_url_name obj.pk|admin_urlquote state.previous_revision_id revision.id %}">{% trans "Compare with previous version" %}</a>
                                                 {% endif %}
                                             {% enddropdown %}
                                         </li>
@@ -89,7 +89,6 @@
         </table>
     {% endpanel %}
 
-    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/workflow-action.js' %}"></script>
     <script>
         document.querySelectorAll('[data-controller="w-dropdown"]').forEach((e) => {

wagtail/admin/templates/wagtailadmin/icons/keyboard.svg

@@ -0,0 +1 @@
+<svg id="icon-keyboard" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--! keyboard (solid): Font Awesome Free 6.5.1 --><path d="M64 64C28.7 64 0 92.7 0 128v256c0 35.3 28.7 64 64 64h448c35.3 0 64-28.7 64-64V128c0-35.3-28.7-64-64-64H64zm16 64h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16zM64 240c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-32zm16 80h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16zm80-176c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32zm16 80h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16zm-16 112c0-8.8 7.2-16 16-16h224c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16H176c-8.8 0-16-7.2-16-16v-32zm112-208h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16zm-16 112c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32zm112-112h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16zm-16 112c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32zm112-112h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16zm-16 112c0-8.8 7.2-16 16-16h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32zm16 80h32c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16z"/></svg>

wagtail/admin/templates/wagtailadmin/page_privacy/set_privacy.html

@@ -3,7 +3,9 @@
 <form action="{% url 'wagtailadmin_pages:set_privacy' page.id %}" method="POST" novalidate>
     {% csrf_token %}
     {% formattedfield field=form.restriction_type show_label=False %}
-    {% formattedfield form.password %}
+    {% if form.password is not None %}
+        {% formattedfield form.password %}
+    {% endif %}
     <div id="groups-fields">
         {% formattedfield form.groups %}
     </div>

wagtail/admin/templates/wagtailadmin/pages/_editor_js.html

@@ -4,25 +4,10 @@
     JavaScript declarations to be included on the 'create page' and 'edit page' views
 {% endcomment %}
 
-<script>
-    window.chooserUrls = {
-        'pageChooser': '{% url "wagtailadmin_choose_page" %}',
-        'externalLinkChooser': '{% url "wagtailadmin_choose_page_external_link" %}',
-        'emailLinkChooser': '{% url "wagtailadmin_choose_page_email_link" %}',
-        'phoneLinkChooser': '{% url "wagtailadmin_choose_page_phone_link" %}',
-        'anchorLinkChooser': '{% url "wagtailadmin_choose_page_anchor_link" %}',
-    };
-</script>
-
 <script src="{% versioned_static 'wagtailadmin/js/comments.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/vendor/mousetrap.min.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/expanding-formset.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/page-editor.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/preview-panel.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/vendor/xregexp.min.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/vendor/urlify.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/workflow-action.js' %}"></script>
 {% hook_output 'insert_editor_js' %}

wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html

@@ -2,8 +2,10 @@
 <button
     type="submit"
     class="button action-save button-longrunning {% if is_revision %}warning{% endif %}"
-    data-controller="w-progress"
+    data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
+    data-w-kbd-key-value="mod+s"
+    data-w-kbd-scope-value="global"
     data-w-progress-active-value="{% trans 'Saving…' %}"
 >
     {% icon name="draft" classname="button-longrunning__icon" %}

wagtail/admin/templates/wagtailadmin/pages/choose_parent.html

@@ -0,0 +1,17 @@
+{% extends "wagtailadmin/generic/form.html" %}
+{% load i18n wagtailadmin_tags %}
+
+{% block bodyclass %}
+    {# Unset the editor-view body class as this is just a simple form #}
+{% endblock %}
+
+{% block main_header %}
+    {# We only use the h1 from the breadcrumbs and don't need the h2 heading #}
+{% endblock %}
+
+{% block main_content %}
+    {# We don't use the h2 from main_header, so we need extra margin at the top #}
+    <div class="w-mt-8">
+        {{ block.super }}
+    </div>
+{% endblock %}

wagtail/admin/templates/wagtailadmin/pages/explorable_index.html

@@ -0,0 +1,8 @@
+{% extends "wagtailadmin/pages/index.html" %}
+{% load wagtailadmin_tags %}
+{% block bodyclass %}page-explorer {% if ordering == 'ord' %}w-overflow-visible{% endif %}{% endblock %}
+
+{% block header %}
+    {% page_permissions parent_page as parent_page_perms %}
+    {% include 'wagtailadmin/pages/page_listing_header.html' with title=header_title search_url=index_results_url page_perms=parent_page_perms %}
+{% endblock %}

wagtail/admin/templates/wagtailadmin/pages/history.html

@@ -1,61 +1 @@
-{% extends 'wagtailadmin/reports/base_report.html' %}
-{% load i18n wagtailadmin_tags %}
-
-{% block titletag %}{% blocktrans trimmed with title=subtitle %}Page history for {{ subtitle }}{% endblocktrans %}{% endblock %}
-
-{% block actions %}
-    <a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button bicolor button--icon">{% icon name="edit" wrapped=1 %}{% trans "Edit this page" %}</a>
-{% endblock %}
-
-{% block results %}
-    {% if object_list %}
-        <table class="listing listing--inline-actions">
-            <thead>
-                <tr>
-                    <th>
-                        {% trans 'Action' %}
-                    </th>
-                    <th>
-                        {% trans 'User' %}
-                    </th>
-                    <th class="updated">
-                        {% trans 'Date / Time' %}
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                {% page_permissions page as page_perms %}
-                {% for entry in object_list %}
-                    <tr>
-                        <td>
-                            {% if entry.revision %}<span class="report__results--text">{% endif %}
-                            {{ entry.message }}
-                            {% if entry.revision %}</span>{% endif %}
-                            {% if entry.comment %}
-                                <span class="report__results--comment">{% trans "Comment" %}: <em>{{ entry.comment }}</em></span>
-                            {% endif %}
-                            {% if entry.revision %}
-                                {% if entry.action == 'wagtail.publish' %}
-                                    {% if entry.revision_id == page.live_revision_id %}{% trans 'Live version' as status_label %}{% status status_label classname="w-status--primary" %}{% endif %}
-                                {% elif entry.content_changed %}
-                                    {% if entry.revision == page_latest_revision %}{% trans 'Current draft' as status_label %}{% status status_label classname="w-status--primary" %}{% endif %}
-                                    {% include "wagtailadmin/pages/revisions/_actions.html" with revision=entry.revision %}
-                                {% endif %}
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% include "wagtailadmin/shared/user_avatar.html" with user=entry.user username=entry.user_display_name %}
-                        </td>
-                        <td class="updated">{% human_readable_date entry.timestamp %}</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p>{% trans "No log entries found." %}</p>
-    {% endif %}
-{% endblock %}
-
-{% block no_results %}
-    <p>{% trans "No log entries found." %}</p>
-{% endblock %}
+{% extends 'wagtailadmin/generic/listing.html' %}

wagtail/admin/templates/wagtailadmin/pages/index.html

@@ -1,10 +1,8 @@
 {% extends "wagtailadmin/generic/index.html" %}
 {% load wagtailadmin_tags i18n %}
-{% block bodyclass %}page-explorer {% if ordering == 'ord' %}w-overflow-visible{% endif %}{% endblock %}
 
 {% block header %}
-    {% page_permissions parent_page as parent_page_perms %}
-    {% include 'wagtailadmin/pages/page_listing_header.html' with title=header_title search_url=index_results_url page_perms=parent_page_perms %}
+    {% include 'wagtailadmin/shared/headers/slim_header.html' with title=header_title icon_name=header_icon search_url=index_results_url buttons=header_buttons %}
 {% endblock %}
 
 {% block listing %}
@@ -23,8 +21,6 @@
 {% block extra_js %}
     {{ block.super }}
 
-    {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
-    <script src="{% versioned_static 'wagtailadmin/js/modal-workflow.js' %}"></script>
     <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
 
     {% comment %}

wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html

@@ -8,8 +8,8 @@
 
 {% if page.locked %}
     <span
-        class="indicator locked-indicator {% if page.locked_by == request.user %}indicator--is-inverse{% endif %}"
-        title="{% if page.locked_by == request.user %}{% trans 'This page is locked, by you, to further editing' %}{% else %}{% trans 'This page is locked to further editing' %}{% endif %}"
+        class="indicator locked-indicator {% if page.locked_by_id == request.user.pk %}indicator--is-inverse{% endif %}"
+        title="{% if page.locked_by_id == request.user.pk %}{% trans 'This page is locked, by you, to further editing' %}{% else %}{% trans 'This page is locked to further editing' %}{% endif %}"
     >
         {% icon name="lock" classname="initial" %}
     </span>

wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_column_header.html

@@ -2,37 +2,35 @@
 {% load wagtailadmin_tags i18n %}
 
 {% block after_label %}
-    {% if is_searching or is_filtering %}
-        {% if is_searching_whole_tree %}
-            {% if items_count %}
-                {% blocktranslate trimmed %}
-                    {{ start_index }}-{{ end_index }} of {{ items_count }} across entire site.
-                {% endblocktranslate %}
-            {% else %}
-                {% blocktranslate trimmed %}
-                    No results across entire site.
-                {% endblocktranslate %}
-            {% endif %}
-            <a href="{{ table.base_url }}{% querystring p=None search_all=None %}">
-                {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}Search in '<span class="w-title-ellipsis">{{ title }}</span>'{% endblocktranslate %}
-            </a>
+    {% if result_scope == "whole_tree" %}
+        {% if items_count %}
+            {% blocktranslate trimmed %}
+                {{ start_index }}-{{ end_index }} of {{ items_count }} across entire site.
+            {% endblocktranslate %}
         {% else %}
-            {% if items_count %}
-                {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}
-                    {{ start_index }}-{{ end_index }} of {{ items_count }} in '<span class="w-title-ellipsis">{{ title }}</span>'.
-                {% endblocktranslate %}
-            {% else %}
-                {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}
-                    No results in '<span class="w-title-ellipsis">{{ title }}</span>'.
-                {% endblocktranslate %}
-            {% endif %}
-            <a href="{{ table.base_url }}{% querystring p=None search_all=1 %}">
-                {% translate "Search the whole site" %}
-            </a>
+            {% blocktranslate trimmed %}
+                No results across entire site.
+            {% endblocktranslate %}
         {% endif %}
+        <a href="{{ table.base_url }}{% querystring p=None search_all=None %}">
+            {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}Search in '<span class="w-title-ellipsis">{{ title }}</span>'{% endblocktranslate %}
+        </a>
+    {% elif result_scope == "parent" %}
+        {% if items_count %}
+            {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}
+                {{ start_index }}-{{ end_index }} of {{ items_count }} in '<span class="w-title-ellipsis">{{ title }}</span>'.
+            {% endblocktranslate %}
+        {% else %}
+            {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}
+                No results in '<span class="w-title-ellipsis">{{ title }}</span>'.
+            {% endblocktranslate %}
+        {% endif %}
+        <a href="{{ table.base_url }}{% querystring p=None search_all=1 %}">
+            {% translate "Search the whole site" %}
+        </a>
     {% else %}
         {% blocktranslate trimmed %}
             {{ start_index }}-{{ end_index }} of {{ items_count }}
         {% endblocktranslate %}
     {% endif %}
-{% endblock %}
+{% endblock %}

wagtail/admin/templates/wagtailadmin/pages/page_listing_header.html

@@ -10,7 +10,8 @@
     {% page_permissions parent_page as parent_page_perms %}
     {% if parent_page_perms.can_add_subpage %}
         {% trans 'Add child page' as add_child_page_str %}
-        <a href="{% url "wagtailadmin_pages:add_subpage" parent_page.id %}" class="w-header-button" data-controller="w-tooltip" data-w-tooltip-content-value="{{ add_child_page_str }}" aria-label="{{ add_child_page_str }}">{% icon name="plus" %}</a>
+        {# Keep this in sync with the styles of HeaderButton. #}
+        <a href="{% url "wagtailadmin_pages:add_subpage" parent_page.id %}" class="w-header-button button" data-controller="w-tooltip" data-w-tooltip-content-value="{{ add_child_page_str }}" aria-label="{{ add_child_page_str }}">{% icon name="plus" %}</a>
     {% endif %}
 
     {# Page actions dropdown #}

wagtail/admin/templates/wagtailadmin/panels/multi_field_panel_child.html

@@ -1,5 +1,5 @@
 {% load wagtailadmin_tags %}
-<div class="{% classnames "w-panel__wrapper" child.classes|join:' ' %}" {% include "wagtailadmin/shared/attrs.html" with attrs=child.attrs %}>
+<div class="{% classnames "w-panel__wrapper" child.classes %}" {% include "wagtailadmin/shared/attrs.html" with attrs=child.attrs %}>
     {% if child.heading %}
         {% fragment as label_content %}
             {{ child.heading }}{% if child.is_required %}<span class="w-required-mark">*</span>{% endif %}

wagtail/admin/templates/wagtailadmin/panels/publishing/schedule_publishing_panel.html

@@ -21,8 +21,10 @@
     <button
         type="submit"
         class="button action-save button-longrunning"
-        data-controller="w-progress"
+        data-controller="w-progress w-kbd"
         data-action="w-progress#activate"
+        data-w-kbd-key-value="mod+s"
+        data-w-kbd-scope-value="global"
         data-w-progress-active-value="{% trans 'Saving…' %}"
     >
         <em data-w-progress-target="label">{% trans 'Save schedule' %}</em>

wagtail/admin/templates/wagtailadmin/panels/tabbed_interface.html

@@ -21,7 +21,7 @@
             {% if child.show_panel_furniture %}
                 <section
                     id="tab-{{ identifier }}"
-                    class="w-tabs__panel {{ child.classes|join:" " }}"
+                    class="{% classnames "w-tabs__panel" child.classes %}"
                     role="tabpanel"
                     aria-labelledby="tab-label-{{ identifier }}"
                     hidden

wagtail/admin/templates/wagtailadmin/shared/active_filters.html

@@ -2,7 +2,7 @@
 <ul class="w-active-filters">
     {% for filter in active_filters %}
         <li class="w-pill">
-            <button class="w-pill__content" data-controller="w-action" data-w-active-filter-name="{{ filter.auto_id }}" aria-controls="drilldown-{{ filter.auto_id }}">
+            <button class="w-pill__content" data-controller="w-action" data-w-active-filter-id="{{ filter.auto_id }}" aria-controls="drilldown-{{ filter.auto_id }}">
                 <span class="w-text-14">{{ filter.field_label }}:</span>
                 <b class="w-ml-1">{{ filter.value }}</b>
             </button>
@@ -11,6 +11,7 @@
                 data-action="click->w-swap#replaceLazy"
                 data-w-swap-src-value="{{ filter.removed_filter_url }}"
                 data-w-swap-target-value="#listing-results"
+                data-w-swap-reflect-value="true"
                 class="w-pill__remove"
                 aria-label="{% trans 'Clear' %}">
                 {% icon name="cross" classname="w-h-4 w-w-4" %}

wagtail/admin/templates/wagtailadmin/shared/breadcrumbs.html

@@ -6,6 +6,7 @@
     `items` - A list of {"url": Union[str, None], "label": str, "sublabel": Union[str, None]} dicts
     `classname` - Modifier classes
     `is_expanded` - Whether the breadcrumbs are always expanded or not, if True the breadcrumbs will not be collapsible
+    `icon_name` - The name of the icon to display before the final item when the breadcrumbs are collapsed
 {% endcomment %}
 {% with breadcrumb_link_classes='w-flex w-items-center w-text-text-label w-pr-0.5 w-text-14 w-no-underline w-outline-offset-inside w-border-b w-border-b-2 w-border-transparent w-box-content hover:w-border-current hover:w-text-text-label' breadcrumb_item_classes='w-h-full w-flex w-items-center w-overflow-hidden w-transition w-duration-300 w-whitespace-nowrap w-flex-shrink-0' icon_classes='w-w-4 w-h-4 w-ml-3' %}
     {# Breadcrumbs are visible on mobile by default but hidden on desktop #}
@@ -48,6 +49,11 @@
                                     data-w-breadcrumbs-target="content"
                                 {% endif %}
                             >
+                                {% fragment as icon %}
+                                    {% if icon_name and forloop.last %}
+                                        {% icon name=icon_name classname="w-breadcrumbs__icon w-hidden" %}
+                                    {% endif %}
+                                {% endfragment %}
                                 {% fragment as sublabel %}
                                     {% if item.sublabel %}
                                         <span class="w-sr-only">: </span>
@@ -58,11 +64,13 @@
                                 {% endfragment %}
                                 {% if item.url is not None %}
                                     <a class="{{ breadcrumb_link_classes }}" href="{{ item.url }}">
+                                        {{ icon }}
                                         {{ item.label }}
                                         {{ sublabel }}
                                     </a>
                                 {% else %}
                                     <div class="w-flex w-justify-start w-items-center">
+                                        {{ icon }}
                                         {{ item.label }}
                                         {{ sublabel }}
                                     </div>