wagtail 6.2.1__py3-none-any.whl → 6.3rc1__py3-none-any.whl

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

@@ -1 +1 @@
-(()=>{"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]={exports:{}};return t[e](l,l.exports,a),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.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)})();
+(()=>{"use strict";var e,t={412:(e,t,n)=>{var a=n(6664),r=n(2833);var l=n(4072);const i=(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 o(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=i.bind(null,e),r=t.classList.contains("collapsed"),l=n.querySelector('[aria-invalid="true"], .error, .w-field--error'),o=r&&!l;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 s=n(2427),c=n.n(s),d=n(6931),u=n.n(d),m=n(8667),p=n(1238);const g=({expanded:e,floating:t,insideMinimap:n,onClick:a})=>c().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":""}`},c().createElement(p.A,{name:e?"collapse-up":"collapse-down"}),e?(0,r.AP)("Collapse all"):(0,r.AP)("Expand all")),f=c().createElement("span",{className:"w-required-mark"},"*"),h=({item:e,intersects:t,expanded:n,onClick:a})=>{const{href:l,label:i,icon:o,required:s,errorCount:d,level:u}=e,m=d>0,g=(0,r.WI)("%(num)s error","%(num)s errors",d).replace("%(num)s",`${d}`),h=i.length>22?`${i.substring(0,22)}…`:i;return c().createElement("a",{href:l,className:`w-minimap-item w-minimap-item--${u} ${t?"w-minimap-item--active":""} ${m?"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"},m?c().createElement("div",{className:"w-minimap-item__errors","aria-label":g},d):null,c().createElement(p.A,{name:"minus",className:"w-minimap-item__placeholder"}),"h1"!==u&&"h2"!==u?c().createElement(p.A,{name:o,className:"w-minimap-item__icon"}):null,c().createElement("span",{className:"w-minimap-item__label"},c().createElement("span",{className:"w-minimap-item__text"},h),s?f:null))},b={root:null,rootMargin:"-50px 0px -70px 0px",threshold:.1},v=(e,{target:t,isIntersecting:n})=>{const a=t.closest("[data-panel]")?.id;return a?(e[`#${a}`]=n,e):e},y=({container:e,anchorsContainer:t,links:n,onUpdate:a,toggleAllPanels:l})=>{const o=(0,s.useMemo)((()=>(()=>{let e="false";try{e=localStorage.getItem("wagtail:minimap-expanded")||e}catch{}return"true"===e})()),[]),[d,u]=(0,s.useState)(o),f=(0,s.useCallback)(((e=!d)=>{u(e),document.body.classList.toggle("minimap-open",e);try{localStorage.setItem("wagtail:minimap-expanded",e?"true":"false")}catch{}}),[d,u]),[y,E]=(0,s.useState)(!0),[w,S]=(0,s.useState)({}),x=(0,s.useRef)(null),A=(0,s.useRef)({}),q=(0,s.useRef)(null),L=(0,s.useRef)(null),_=(e,t)=>{d||t.preventDefault(),i(e.toggle,!0),f(!0)};return(0,s.useEffect)((()=>{f(o)}),[]),(0,s.useEffect)((()=>{x.current||(x.current=new IntersectionObserver((t=>{A.current=t.reduce(v,{...A.current}),q.current||(q.current=(0,m.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)}))}),b));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,s.useEffect)((()=>{E(!0)}),[t,E]),c().createElement("div",null,c().createElement(g,{expanded:y,onClick:()=>{E(!y),l(!y)},floating:!0,insideMinimap:d}),c().createElement("div",{className:"w-minimap "+(d?"w-minimap--expanded":"")},c().createElement("div",{className:"w-minimap__header"},c().createElement("button",{id:"w-minimap-toggle",type:"button","aria-expanded":d,onClick:()=>f(!d),className:"w-minimap__toggle","aria-label":(0,r.AP)("Toggle side panel")},c().createElement(p.A,{name:"expand-right"}))),c().createElement("ol",{className:"w-minimap__list",ref:L},n.map((e=>c().createElement("li",{key:e.href},c().createElement(h,{item:e,intersects:w[e.href],expanded:d,onClick:_}))))),c().createElement("div",{className:"w-minimap__footer"})))},E=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}},w=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(E).filter(Boolean);u().render(c().createElement(y,{container:e,anchorsContainer:t,links:r,onUpdate:w,toggleAllPanels:e=>{r.forEach(((t,n)=>{0===n&&t.href.includes("title")||i(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="${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,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")})),s&&s.dispatchEvent(new CustomEvent("show")),!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(o)}()})),window.addEventListener("load",(()=>{!function(e=document.getElementById(window.location.hash.slice(1))){const t=e?.matches("[data-panel]")?e:(0,l.KX)();t&&setTimeout((()=>{t.scrollIntoView({behavior:"smooth"})}),100)}(),((e=document.querySelector("[data-minimap-container]"))=>{if(!e)return;if(!document.body.querySelectorAll("[data-panel-anchor]").length)return;const t=(0,m.s)(w.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,m.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]={exports:{}};return t[e](l,l.exports,a),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.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={8080:(o,e,t)=>{var a=t(1669),n=t.n(a),r=t(6508);function i(o,e,t){const a=document.createElement("input");a.type="hidden",a.name=e,a.value=t,o.appendChild(a)}function c(){const o=document.querySelectorAll("[data-workflow-action-url]"),e=r.HE.CSRF_TOKEN;o.forEach((o=>{o.addEventListener("click",(t=>{if(t.preventDefault(),"launchModal"in o.dataset)ModalWorkflow({url:o.dataset.workflowActionUrl,onload:{action(o){const e=document.createElement("input");e.type="hidden",e.name="next",e.value=window.location,n()("form",o.body).append(e),o.ajaxifyForm(n()("form",o.body))},success(o,e){window.location.href=e.redirect}}});else{const t=document.createElement("form");t.action=o.dataset.workflowActionUrl,t.method="POST",i(t,"csrfmiddlewaretoken",e),i(t,"next",window.location),document.body.appendChild(t),t.submit()}}),{capture:!0})}))}function l(o){const e=n()(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(n()("form",o.body))},success(t,a){i(e,"action-workflow-action","true"),i(e,"workflow-action-name",o.dataset.workflowActionName),i(e,"workflow-action-extra-data",JSON.stringify(a.cleaned_data)),n()(e).submit()}}})):(i(e,"action-workflow-action","true"),i(e,"workflow-action-name",o.dataset.workflowActionName))}),{capture:!0})}))}window._addHiddenInput=i,window.ActivateWorkflowActionsForDashboard=c,window.ActivateWorkflowActionsForEditView=l;const d=document.currentScript,u=d.dataset.activate,f=d.dataset.confirmCancellationUrl;document.addEventListener("DOMContentLoaded",(()=>{if("dashboard"===u?c():"editor"===u&&l("[data-edit-form]"),f){let o=!1;n()("[name=action-publish]").click((e=>{o||(e.stopImmediatePropagation(),e.preventDefault(),window.ModalWorkflow({url:f,onload:{confirm(t,a){n()("[data-confirm-cancellation]",t.body).click((a=>{o=!0,t.close(),e.currentTarget.click()})),n()("[data-cancel-dialog]",t.body).click((o=>{t.close()}))},no_confirmation_needed(t,a){t.close(),o=!0,e.currentTarget.click()}},triggerElement:e.currentTarget}))}))}}))},1669:o=>{o.exports=jQuery}},t={};function a(o){var n=t[o];if(void 0!==n)return n.exports;var r=t[o]={exports:{}};return e[o](r,r.exports,a),r.exports}a.m=e,o=[],a.O=(e,t,n,r)=>{if(!t){var i=1/0;for(u=0;u<o.length;u++){for(var[t,n,r]=o[u],c=!0,l=0;l<t.length;l++)(!1&r||i>=r)&&Object.keys(a.O).every((o=>a.O[o](t[l])))?t.splice(l--,1):(c=!1,r<i&&(i=r));if(c){o.splice(u--,1);var d=n();void 0!==d&&(e=d)}}return e}r=r||0;for(var u=o.length;u>0&&o[u-1][2]>r;u--)o[u]=o[u-1];o[u]=[t,n,r]},a.n=o=>{var e=o&&o.__esModule?()=>o.default:()=>o;return a.d(e,{a:e}),e},a.d=(o,e)=>{for(var t in e)a.o(e,t)&&!a.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:e[t]})},a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(o){if("object"==typeof window)return window}}(),a.o=(o,e)=>Object.prototype.hasOwnProperty.call(o,e),a.r=o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})},a.j=327,(()=>{var o={327:0};a.O.j=e=>0===o[e];var e=(e,t)=>{var n,r,[i,c,l]=t,d=0;if(i.some((e=>0!==o[e]))){for(n in c)a.o(c,n)&&(a.m[n]=c[n]);if(l)var u=l(a)}for(e&&e(t);d<i.length;d++)r=i[d],a.o(o,r)&&o[r]&&o[r][0](),o[r]=0;return a.O(u)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(e.bind(null,0)),t.push=e.bind(null,t.push.bind(t))})();var n=a.O(void 0,[321],(()=>a(8080)));n=a.O(n)})();
+(()=>{"use strict";var o,e={8080:(o,e,t)=>{var a=t(1669),n=t.n(a),r=t(2898);function i(o,e,t){const a=document.createElement("input");a.type="hidden",a.name=e,a.value=t,o.appendChild(a)}function c(){const o=document.querySelectorAll("[data-workflow-action-url]"),e=r.HE.CSRF_TOKEN;o.forEach((o=>{o.addEventListener("click",(t=>{if(t.preventDefault(),"launchModal"in o.dataset)ModalWorkflow({url:o.dataset.workflowActionUrl,onload:{action(o){const e=document.createElement("input");e.type="hidden",e.name="next",e.value=window.location,n()("form",o.body).append(e),o.ajaxifyForm(n()("form",o.body))},success(o,e){window.location.href=e.redirect}}});else{const t=document.createElement("form");t.action=o.dataset.workflowActionUrl,t.method="POST",i(t,"csrfmiddlewaretoken",e),i(t,"next",window.location),document.body.appendChild(t),t.submit()}}),{capture:!0})}))}function l(o){const e=n()(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(n()("form",o.body))},success(t,a){i(e,"action-workflow-action","true"),i(e,"workflow-action-name",o.dataset.workflowActionName),i(e,"workflow-action-extra-data",JSON.stringify(a.cleaned_data)),n()(e).submit()}}})):(i(e,"action-workflow-action","true"),i(e,"workflow-action-name",o.dataset.workflowActionName))}),{capture:!0})}))}window._addHiddenInput=i,window.ActivateWorkflowActionsForDashboard=c,window.ActivateWorkflowActionsForEditView=l;const d=document.currentScript,u=d.dataset.activate,f=d.dataset.confirmCancellationUrl;document.addEventListener("DOMContentLoaded",(()=>{if("dashboard"===u?c():"editor"===u&&l("[data-edit-form]"),f){let o=!1;n()("[name=action-publish]").click((e=>{o||(e.stopImmediatePropagation(),e.preventDefault(),window.ModalWorkflow({url:f,onload:{confirm(t,a){n()("[data-confirm-cancellation]",t.body).click((a=>{o=!0,t.close(),e.currentTarget.click()})),n()("[data-cancel-dialog]",t.body).click((o=>{t.close()}))},no_confirmation_needed(t,a){t.close(),o=!0,e.currentTarget.click()}},triggerElement:e.currentTarget}))}))}}))},1669:o=>{o.exports=jQuery}},t={};function a(o){var n=t[o];if(void 0!==n)return n.exports;var r=t[o]={exports:{}};return e[o](r,r.exports,a),r.exports}a.m=e,o=[],a.O=(e,t,n,r)=>{if(!t){var i=1/0;for(u=0;u<o.length;u++){for(var[t,n,r]=o[u],c=!0,l=0;l<t.length;l++)(!1&r||i>=r)&&Object.keys(a.O).every((o=>a.O[o](t[l])))?t.splice(l--,1):(c=!1,r<i&&(i=r));if(c){o.splice(u--,1);var d=n();void 0!==d&&(e=d)}}return e}r=r||0;for(var u=o.length;u>0&&o[u-1][2]>r;u--)o[u]=o[u-1];o[u]=[t,n,r]},a.n=o=>{var e=o&&o.__esModule?()=>o.default:()=>o;return a.d(e,{a:e}),e},a.d=(o,e)=>{for(var t in e)a.o(e,t)&&!a.o(o,t)&&Object.defineProperty(o,t,{enumerable:!0,get:e[t]})},a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(o){if("object"==typeof window)return window}}(),a.o=(o,e)=>Object.prototype.hasOwnProperty.call(o,e),a.r=o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})},a.j=327,(()=>{var o={327:0};a.O.j=e=>0===o[e];var e=(e,t)=>{var n,r,[i,c,l]=t,d=0;if(i.some((e=>0!==o[e]))){for(n in c)a.o(c,n)&&(a.m[n]=c[n]);if(l)var u=l(a)}for(e&&e(t);d<i.length;d++)r=i[d],a.o(o,r)&&o[r]&&o[r][0](),o[r]=0;return a.O(u)},t=globalThis.webpackChunkwagtail=globalThis.webpackChunkwagtail||[];t.forEach(e.bind(null,0)),t.push=e.bind(null,t.push.bind(t))})();var n=a.O(void 0,[321],(()=>a(8080)));n=a.O(n)})();

wagtail/admin/staticfiles.py

@@ -24,14 +24,16 @@ except AttributeError:
         use_version_strings = True
     else:
         # see if we're using a storage backend using hashed filenames
-        storage = storages[STATICFILES_STORAGE_ALIAS].__class__
-        use_version_strings = not issubclass(storage, HashedFilesMixin)
+        use_version_strings = not isinstance(
+            storages[STATICFILES_STORAGE_ALIAS], HashedFilesMixin
+        )
 
 
 if use_version_strings:
-    # SECRET_KEY is used to prevent exposing the Wagtail version
+    # INSTALLED_APPS is used as a unique value to distinguish Wagtail apps
+    # and avoid exposing the Wagtail version directly
     VERSION_HASH = hashlib.sha1(
-        (__version__ + settings.SECRET_KEY).encode("utf-8")
+        "".join([__version__] + list(settings.INSTALLED_APPS)).encode(),
     ).hexdigest()[:8]
 else:
     VERSION_HASH = None

wagtail/admin/templates/wagtailadmin/account/account.html

@@ -1,9 +1,7 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/form.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block content %}
-    {% include "wagtailadmin/shared/header.html" with title=_("Account") icon="user" merged=1 %}
-
+{% block form_content %}
     <div class="w-tabs" data-tabs>
         <div class="w-tabs__wrapper">
             <div role="tablist" class="w-tabs__list">
@@ -17,62 +15,47 @@
             </div>
         </div>
 
-        <form action="{% url 'wagtailadmin_account' %}" method="post" enctype="multipart/form-data" novalidate>
-            <div class="tab-content">
-                {% csrf_token %}
-
-                {% for tab, panels in panels_by_tab.items %}
-                    <section
-                        id="tab-{{ tab.name|cautious_slugify }}"
-                        class="w-tabs__panel"
-                        role="tabpanel"
-                        hidden
-                        aria-labelledby="tab-label-{{ tab.name|cautious_slugify }}"
-                    >
-                        {% for panel in panels %}
-                            {% panel id=panel.name heading=panel.title heading_size="label" %}
-                                <div class="w-account-settings-panel w-mt-5">
-                                    {{ panel.render }}
+        <div class="tab-content">
+            {% csrf_token %}
+
+            {% for tab, panels in panels_by_tab.items %}
+                <section
+                    id="tab-{{ tab.name|cautious_slugify }}"
+                    class="w-tabs__panel"
+                    role="tabpanel"
+                    hidden
+                    aria-labelledby="tab-label-{{ tab.name|cautious_slugify }}"
+                >
+                    {% for panel in panels %}
+                        {% panel id=panel.name heading=panel.title heading_size="label" %}
+                            <div class="w-account-settings-panel w-mt-5">
+                                {{ panel.render }}
+                            </div>
+                        {% endpanel %}
+                    {% endfor %}
+                </section>
+            {% endfor %}
+
+            {% if menu_items %}
+                <section
+                    id="tab-actions"
+                    class="w-tabs__panel"
+                    role="tabpanel"
+                    hidden
+                    aria-labelledby="tab-label-actions"
+                >
+                    <ul class="listing">
+                        {% for item in menu_items %}
+                            <li class="row row-flush">
+                                <div class="col6">
+                                    <a href="{{ item.url }}" class="button button-primary">{{ item.label }}</a>
                                 </div>
-                            {% endpanel %}
+                                <small class="col6">{{ item.help_text }}</small>
+                            </li>
                         {% endfor %}
-
-                        <button type="submit" class="button">{% trans 'Save account details' %}</button>
-                    </section>
-                {% endfor %}
-
-                {% if menu_items %}
-                    <section
-                        id="tab-actions"
-                        class="w-tabs__panel"
-                        role="tabpanel"
-                        hidden
-                        aria-labelledby="tab-label-actions"
-                    >
-                        <ul class="listing">
-                            {% for item in menu_items %}
-                                <li class="row row-flush">
-                                    <div class="col6">
-                                        <a href="{{ item.url }}" class="button button-primary">{{ item.label }}</a>
-                                    </div>
-                                    <small class="col6">{{ item.help_text }}</small>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </section>
-                {% endif %}
-            </div>
-        </form>
+                    </ul>
+                </section>
+            {% endif %}
+        </div>
     </div>
-
-{% endblock %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-{% endblock %}
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ media.js }}
 {% endblock %}

wagtail/admin/templates/wagtailadmin/admin_base.html

@@ -14,34 +14,6 @@
 {% endblock %}
 
 {% block js %}
-    <script>
-        (function(document, window) {
-            window.wagtailConfig = window.wagtailConfig || {};
-            wagtailConfig.ADMIN_API = {
-                PAGES: '{% url "wagtailadmin_api:pages:listing" %}',
-                DOCUMENTS: '{% url "wagtailadmin_api:documents:listing" %}',
-                IMAGES: '{% url "wagtailadmin_api:images:listing" %}',
-                {# // Use this to add an extra query string on all API requests. #}
-                {# // Example value: '&order=-id' #}
-                EXTRA_CHILDREN_PARAMETERS: '',
-            };
-
-            {% i18n_enabled as i18n_enabled %}
-            {% locales as locales %}
-            wagtailConfig.I18N_ENABLED = {% if i18n_enabled %}true{% else %}false{% endif %};
-            wagtailConfig.LOCALES = {{ locales|safe }};
-
-            {% if locale %}
-                wagtailConfig.ACTIVE_CONTENT_LOCALE = '{{ locale.language_code }}'
-            {% endif %}
-
-            wagtailConfig.STRINGS = {% js_translation_strings %};
-
-            wagtailConfig.ADMIN_URLS = {
-                PAGES: '{% url "wagtailadmin_explore_root" %}'
-            };
-        })(document, window);
-    </script>
     {% wagtail_config as config %}
     {{ config|json_script:"wagtail-config" }}
     <script src="{% versioned_static 'wagtailadmin/js/vendor/jquery-3.6.0.min.js' %}"></script>

wagtail/admin/templates/wagtailadmin/bulk_actions/footer.html

@@ -1,5 +1,5 @@
 {% load i18n wagtailadmin_tags %}
-<section class="footer bulk-actions-choices hidden" data-bulk-action-footer aria-labelledby="bulk-actions-heading">
+<section class="footer bulk-actions-choices hidden" data-bulk-action-footer="{% if item_type %}{{ item_type }}{% else %}{{ model_name|upper }}{% endif %}" aria-labelledby="bulk-actions-heading">
     <h2 id="bulk-actions-heading" class="w-sr-only">{% trans "Bulk actions" %}</h2>
     <div class="footer__container">
         {% include 'wagtailadmin/bulk_actions/select_all_checkbox_input.html' with parent=parent %}

wagtail/admin/templates/wagtailadmin/bulk_actions/select_all_checkbox_input.html

@@ -1,2 +1,2 @@
-{% load i18n %}
-<input {% if parent %}data-bulk-action-parent-id="{{ parent }}"{% endif %} data-bulk-action-select-all-checkbox type="checkbox" aria-label="{{ _('Select all') }}"/>
+{% load i18n l10n %}
+<input {% if parent %}data-bulk-action-parent-id="{{ parent|unlocalize }}"{% endif %} data-bulk-action-select-all-checkbox type="checkbox" aria-label="{{ _('Select all') }}"/>

wagtail/admin/templates/wagtailadmin/chooser/_search_results.html

@@ -1,11 +1,13 @@
 {% load i18n wagtailadmin_tags %}
 
 <h2 role="alert">
-    {% blocktrans trimmed count counter=pages.paginator.count %}
-        There is {{ counter }} match
-    {% plural %}
-        There are {{ counter }} matches
-    {% endblocktrans %}
+    {% with counter_val=pages.paginator.count %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}
+            There is {{ counter }} match
+        {% plural %}
+            There are {{ counter }} matches
+        {% endblocktrans %}
+    {% endwith %}
 </h2>
 
 {% if pages %}

wagtail/admin/templates/wagtailadmin/chooser/tables/page_navigate_to_children_cell.html

@@ -1,6 +1,6 @@
 {% load i18n wagtailadmin_tags %}
 <td class="{% if value.can_descend %}children{% endif %} {% if column.classname %}{{ column.classname }}{% endif %}">
     {% if value.can_descend %}
-        <a href="{% url 'wagtailadmin_choose_page_child' value.id %}{% querystring p=None %}" class="navigate-pages" title="{% blocktrans trimmed with title=value.get_admin_display_title %}Explore subpages of '{{ title }}'{% endblocktrans %}" arial-label="{% trans 'Explore' %}">{% icon name="arrow-right" classname="default" %}</a>
+        <a href="{% url 'wagtailadmin_choose_page_child' value.id %}{% querystring p=None %}" class="navigate-pages" title="{% blocktrans trimmed with title=value.get_admin_display_title %}Explore subpages of '{{ title }}'{% endblocktrans %}" aria-label="{% trans 'Explore' %}">{% icon name="arrow-right" classname="default" %}</a>
     {% endif %}
 </td>

wagtail/admin/templates/wagtailadmin/generic/chooser/results.html

@@ -4,11 +4,13 @@
     {% if is_searching %}
         {% block search_results_count %}
             <h2 role="alert">
-                {% blocktrans trimmed count counter=results.paginator.count %}
-                    There is {{ counter }} match
-                {% plural %}
-                    There are {{ counter }} matches
-                {% endblocktrans %}
+                {% with result_count=results.paginator.count %}
+                    {% blocktrans trimmed with counter=result_count|intcomma count counter_val=result_count %}
+                        There is {{ counter }} match
+                    {% plural %}
+                        There are {{ counter }} matches
+                    {% endblocktrans %}
+                {% endwith %}
             </h2>
         {% endblock %}
     {% else %}

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

@@ -1,9 +1 @@
 {% extends "wagtailadmin/generic/form.html" %}
-{% load i18n %}
-
-{% block actions %}
-    {{ block.super }}
-    {% if delete_url %}
-        <a href="{{ delete_url }}" class="button no">{{ delete_item_label }}</a>
-    {% endif %}
-{% endblock %}

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

@@ -17,27 +17,70 @@
 
 {% block main_content %}
     {% block before_form %}{% endblock %}
-    <form action="{{ action_url }}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %} data-edit-form>
+    <form
+        id="w-editor-form"
+        action="{{ action_url }}"
+        method="POST"
+        novalidate
+        {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}
+        data-edit-form
+        data-controller="w-unsaved"
+        data-action="w-unsaved#submit beforeunload@window->w-unsaved#confirm change->w-unsaved#check keyup->w-unsaved#check"
+        data-w-unsaved-confirmation-value="true"
+        data-w-unsaved-force-value="{{ has_unsaved_changes|yesno:'true,false' }}"
+        data-w-unsaved-watch-value="edits"
+    >
         {% csrf_token %}
 
-        {% if panel %}
-            {{ panel.render_form_content }}
-        {% else %}
-            {% block hidden_fields %}
-                {% for field in form.hidden_fields %}{{ field }}{% endfor %}
-            {% endblock %}
-
-            <ul class="fields">
-                {% block visible_fields %}
-                    {% for field in form.visible_fields %}
-                        <li>{% formattedfield field %}</li>
-                    {% endfor %}
+        {% block form_content %}
+            {% if panel %}
+                {{ panel.render_form_content }}
+            {% else %}
+                {% block hidden_fields %}
+                    {% for field in form.hidden_fields %}{{ field }}{% endfor %}
                 {% endblock %}
-            </ul>
-        {% endif %}
 
-        {% block actions %}
-            <button type="submit" class="button">{{ submit_button_label }}</button>
+                <ul class="fields">
+                    {% block visible_fields %}
+                        {% for field in form.visible_fields %}
+                            <li>{% formattedfield field %}</li>
+                        {% endfor %}
+                    {% endblock %}
+                </ul>
+            {% endif %}
+        {% endblock %}
+
+        {% block footer %}
+            <footer class="footer w-grid md:w-grid-flow-col">
+                <nav class="actions actions--primary footer__container" aria-label="{% trans 'Actions' %}">
+                    {% block actions %}
+                        {% fragment as main_action %}
+                            {% block main_action %}
+                                <button
+                                    type="submit"
+                                    class="button button-longrunning"
+                                    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="{{ submit_button_active_label }}"
+                                >
+                                    {% icon name="spinner" %}
+                                    <em data-w-progress-target="label">{{ submit_button_label }}</em>
+                                </button>
+                            {% endblock %}
+                        {% endfragment %}
+
+                        {% fragment stripped as extra_actions %}{% block extra_actions %}{% endblock %}{% endfragment %}
+
+                        {% include "wagtailadmin/shared/action_menu/menu.html" with show_menu=extra_actions default_menu_item=main_action menu_items_fragment=extra_actions %}
+
+                    {% endblock %}
+                </nav>
+                {% block unsaved_changes_warning %}
+                    {% include "wagtailadmin/shared/unsaved_changes_warning.html" %}
+                {% endblock%}
+            </footer>
         {% endblock %}
     </form>
 {% endblock %}

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

@@ -13,3 +13,20 @@
         {% include "wagtailadmin/shared/header.html" with title=page_title subtitle=page_subtitle action_url=header_action_url action_text=header_action_label action_icon=header_action_icon extra_actions=extra_actions icon=header_icon search_url=search_url search_form=search_form search_results_url=index_results_url only %}
     {% endif %}
 {% endblock %}
+
+{% block listing %}
+    {% comment %}
+        DEPRECATED: This block override is for supporting views that have filters
+        but not using breadcrumbs (thus have no slim_header to put the filters in).
+        There is no longer such a view in Wagtail core, but we keep this block
+        until we can enforce the use of breadcrumbs in all listing views.
+    {% endcomment %}
+    {% if filters and not breadcrumbs_items %}
+        <div class="filterable">
+            {{ block.super }}
+            {% include "wagtailadmin/shared/filters.html" %}
+        </div>
+    {% else %}
+        {{ block.super }}
+    {% endif %}
+{% endblock %}

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

@@ -1,47 +1,21 @@
 {% extends "wagtailadmin/generic/listing_results.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block before_results %}
-    {{ block.super }}
-
+{% block other_searches %}
     {% if is_searching and view.show_other_searches %}
         <div class="nice-padding">
             {% search_other %}
         </div>
     {% endif %}
-
-    {% if not object_list %}
-        {# pass, to allow the same logic as `if object_list and (is_searching or is_filtering)` #}
-    {% elif is_searching or is_filtering %}
-        <div class="nice-padding">
-            <h2 role="alert">
-                {% blocktrans trimmed count counter=items_count %}
-                    There is {{ counter }} match
-                {% plural %}
-                    There are {{ counter }} matches
-                {% endblocktrans %}
-            </h2>
-        </div>
-    {% endif %}
 {% endblock %}
 
 {% block no_results_message %}
-    {% fragment as no_results_message %}
-        {% if is_searching or is_filtering %}
-            {% blocktrans trimmed with model_name=model_opts.verbose_name_plural asvar no_results_text %}
-                No {{ model_name }} match your query.
-            {% endblocktrans %}
-        {% elif add_url %}
-            {% blocktrans trimmed with model_name=model_opts.verbose_name_plural asvar no_results_text %}
-                There are no {{ model_name }} to display. Why not <a href="{{ add_url }}">add one</a>?
-            {% endblocktrans %}
-        {% else %}
-            {% blocktrans trimmed with model_name=model_opts.verbose_name_plural asvar no_results_text %}
-                There are no {{ model_name }} to display.
-            {% endblocktrans %}
-        {% endif %}
-        {{ no_results_text|capfirst }}
-    {% endfragment %}
-
-    <p>{{ no_results_message }}</p>
+    {% if add_url and not is_searching and not is_filtering %}
+        {% blocktrans trimmed with model_name=verbose_name_plural asvar no_results_text %}
+            There are no {{ model_name }} to display. Why not <a href="{{ add_url }}">add one</a>?
+        {% endblocktrans %}
+        <p>{{ no_results_text|capfirst }}</p>
+    {% else %}
+        {{ block.super }}
+    {% endif %}
 {% endblock %}

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

@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/generic/base.html" %}
-{% load i18n wagtailadmin_tags %}
+{% load i18n wagtailadmin_tags l10n %}
 
 {% block main_content %}
     {% block fields_output %}
@@ -11,7 +11,7 @@
                         {% if field.component %}
                             {% component field.component %}
                         {% else %}
-                            {{ field.value }}
+                            {{ field.value|localize }}
                         {% endif %}
                     </dd>
                 {% endfor %}
@@ -19,22 +19,3 @@
         {% endif %}
     {% endblock %}
 {% endblock %}
-
-{% block content %}
-    {{ block.super }}
-
-    {% block footer %}
-        {% if edit_url or delete_url %}
-            <footer class="footer">
-                <div class="footer__container">
-                    {% if edit_url %}
-                        <a href="{{ edit_url }}" class="button">{% trans 'Edit' %}</a>
-                    {% endif %}
-                    {% if delete_url %}
-                        <a href="{{ delete_url }}" class="button serious">{% trans 'Delete' %}</a>
-                    {% endif %}
-                </div>
-            </footer>
-        {% endif %}
-    {% endblock %}
-{% endblock %}

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

@@ -1,29 +1,23 @@
 {% extends "wagtailadmin/generic/base.html" %}
 {% load i18n %}
 
-{% block main_header %}
-    {% if not breadcrumbs_items %}
-        {% include "wagtailadmin/shared/header.html" with title=page_title subtitle=page_subtitle action_url=header_action_url action_text=header_action_label icon=header_icon only %}
-    {% endif %}
-{% endblock %}
-
 {% block content %}
+    {% comment %}
+        Override the content block instead of main_content so we get the full-width layout without the nice-padding.
+        However, this means we need to include the header block again (and only do {{ block.super }} inside it).
+    {% endcomment %}
+
     {% block header %}
         {{ block.super }}
     {% endblock %}
 
     {% block listing %}
-        <div class="{% if filters and not breadcrumbs_items %}filterable{% endif %}">
-            <div id="listing-results">
-                {% comment %}
-                    This div will be replaced on AJAX refreshes.
-                    Do not add page furniture here unless you intend it to disappear on AJAX refresh
-                {% endcomment %}
-                {% include view.results_template_name|default:"wagtailadmin/generic/listing_results.html" %}
-            </div>
-            {% if filters and not breadcrumbs_items %}
-                {% include "wagtailadmin/shared/filters.html" %}
-            {% endif %}
+        <div id="listing-results">
+            {% comment %}
+                This div will be replaced on AJAX refreshes.
+                Do not add page furniture here unless you intend it to disappear on AJAX refresh
+            {% endcomment %}
+            {% include view.results_template_name|default:"wagtailadmin/generic/listing_results.html" %}
         </div>
     {% endblock %}
 

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

@@ -18,6 +18,22 @@
             {% endfor %}
         </template>
     {% endif %}
+
+    {% block other_searches %}{% endblock %}
+
+    {% if not object_list %}
+        {# pass, to allow the same logic as `if object_list and (is_searching or is_filtering)` #}
+    {% elif is_searching or is_filtering %}
+        <div class="nice-padding">
+            <h2 role="alert">
+                {% blocktrans trimmed with counter=items_count|intcomma count counter_val=items_count %}
+                    There is {{ counter }} match
+                {% plural %}
+                    There are {{ counter }} matches
+                {% endblocktrans %}
+            </h2>
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% if object_list %}
@@ -33,6 +49,8 @@
     {% endblock %}
 {% else %}
     <div class="nice-padding w-mt-8">
-        {% block no_results_message %}<p>{% trans "There are no results." %}</p>{% endblock %}
+        {% block no_results_message %}
+            <p>{{ no_results_message|capfirst }}</p>
+        {% endblock %}
     </div>
 {% endif %}