richie 2.32.1.dev1__tar.gz → 2.32.1.dev6__tar.gz

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/CHANGELOG.md

@@ -12,6 +12,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Add Slider plugin
 
+### Fixed
+
+- Ugrade to djangocms-link 5
+
 ## [2.32.0] - 2024-11-27
 
 ### Changed

{richie-2.32.1.dev1/src/richie.egg-info → richie-2.32.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: richie
-Version: 2.32.1.dev1
+Version: 2.32.1.dev6
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License
@@ -51,7 +51,7 @@ Requires-Dist: arrow
 Requires-Dist: Django<5
 Requires-Dist: djangocms-file
 Requires-Dist: djangocms-googlemap
-Requires-Dist: djangocms-link<5
+Requires-Dist: djangocms-link<6,>=5.0.0
 Requires-Dist: djangocms-picture
 Requires-Dist: djangocms-text-ckeditor
 Requires-Dist: djangocms-video
@@ -69,7 +69,7 @@ Requires-Dist: importlib-metadata
 Requires-Dist: oauthlib==3.2.2
 Requires-Dist: requests==2.32.3
 Provides-Extra: dev
-Requires-Dist: bandit==1.7.10; extra == "dev"
+Requires-Dist: bandit==1.8.0; extra == "dev"
 Requires-Dist: black==24.10.0; extra == "dev"
 Requires-Dist: pyRdfa3==3.6.4; extra == "dev"
 Requires-Dist: cssselect==1.2.0; extra == "dev"
@@ -97,7 +97,7 @@ Requires-Dist: dockerflow==2024.4.2; extra == "sandbox"
 Requires-Dist: factory-boy==3.3.1; extra == "sandbox"
 Requires-Dist: gunicorn==23.0.0; extra == "sandbox"
 Requires-Dist: psycopg2-binary==2.9.10; extra == "sandbox"
-Requires-Dist: sentry-sdk==2.18.0; extra == "sandbox"
+Requires-Dist: sentry-sdk==2.19.0; extra == "sandbox"
 
 # Richie, the best OpenSource CMS to build education portals
 

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "Django<5",
     "djangocms-file",
     "djangocms-googlemap",
-    "djangocms-link<5",
+    "djangocms-link>=5.0.0,<6",
     "djangocms-picture",
     "djangocms-text-ckeditor",
     "djangocms-video",
@@ -68,7 +68,7 @@ universal = true
 
 [project.optional-dependencies]
 dev = [
-    "bandit==1.7.10",
+    "bandit==1.8.0",
     "black==24.10.0",
     "pyRdfa3==3.6.4",
     "cssselect==1.2.0",
@@ -98,7 +98,7 @@ sandbox = [
     "factory-boy==3.3.1",
     "gunicorn==23.0.0",
     "psycopg2-binary==2.9.10",
-    "sentry-sdk==2.18.0",
+    "sentry-sdk==2.19.0",
 ]
 
 [tool.flake8]

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/renovate.json

@@ -31,8 +31,7 @@
       "matchPackageNames": [
         "Django",
         "django-cms",
-        "elasticsearch",
-        "djangocms-link"
+        "elasticsearch"
       ]
     }
   ]

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/src/frontend/package.json

@@ -132,7 +132,7 @@
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "typescript": "5.6.3",
     "uuid": "11.0.2",
-    "webpack": "5.95.0",
+    "webpack": "5.96.0",
     "webpack-cli": "5.1.4",
     "whatwg-fetch": "3.6.20",
     "xhr-mock": "2.5.1",

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/src/frontend/yarn.lock

@@ -3877,22 +3877,6 @@
   resolved "https://registry.yarnpkg.com/@types/escodegen/-/escodegen-0.0.6.tgz#5230a9ce796e042cda6f086dbf19f22ea330659c"
   integrity sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.0.tgz#51d4fe4d0316da9e9f2c80884f2c20ed5fb022ff"
-  integrity sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
 "@types/eslint@9":
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
@@ -3901,10 +3885,10 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+"@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/estree@^0.0.51":
   version "0.0.51"
@@ -4572,11 +4556,6 @@ acorn-globals@^7.0.0:
     acorn "^8.1.0"
     acorn-walk "^8.0.2"
 
-acorn-import-attributes@^1.9.5:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
-  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
-
 acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -4599,10 +4578,10 @@ acorn@^7.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.1.0, acorn@^8.11.0, acorn@^8.12.1, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
-  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+acorn@^8.1.0, acorn@^8.11.0, acorn@^8.12.1, acorn@^8.14.0, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
 agent-base@6:
   version "6.0.2"
@@ -5070,27 +5049,7 @@ browser-assert@^1.2.1:
   resolved "https://registry.yarnpkg.com/browser-assert/-/browser-assert-1.2.1.tgz#9aaa5a2a8c74685c2ae05bfe46efd606f068c200"
   integrity sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==
 
-browserslist@^4.21.10, browserslist@^4.23.1:
-  version "4.23.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed"
-  integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==
-  dependencies:
-    caniuse-lite "^1.0.30001640"
-    electron-to-chromium "^1.4.820"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.1.0"
-
-browserslist@^4.23.3:
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
-  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
-  dependencies:
-    caniuse-lite "^1.0.30001646"
-    electron-to-chromium "^1.5.4"
-    node-releases "^2.0.18"
-    update-browserslist-db "^1.1.0"
-
-browserslist@^4.24.0:
+browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0:
   version "4.24.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4"
   integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==
@@ -5151,16 +5110,11 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001639, caniuse-lite@^1.0.30001640:
+caniuse-lite@^1.0.30001639:
   version "1.0.30001643"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd"
   integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
 
-caniuse-lite@^1.0.30001646:
-  version "1.0.30001660"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz#31218de3463fabb44d0b7607b652e56edf2e2355"
-  integrity sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==
-
 caniuse-lite@^1.0.30001663:
   version "1.0.30001667"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz#99fc5ea0d9c6e96897a104a8352604378377f949"
@@ -5494,9 +5448,9 @@ create-require@^1.1.0:
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -5845,21 +5799,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.820:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz#6126ad229ce45e781ec54ca40db0504787f23d19"
-  integrity sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==
-
 electron-to-chromium@^1.5.28:
   version "1.5.34"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.34.tgz#59f6eef987d2301d96d46b1bc4da913fe784baeb"
   integrity sha512-/TZAiChbAflBNjCg+VvstbcwAtIL/VdMFO3NgRFIzBjpvPzWOTIbbO8kNb6RwU4bt9TP7K+3KqBKw/lOU+Y+GA==
 
-electron-to-chromium@^1.5.4:
-  version "1.5.24"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.24.tgz#b3cd2f71b7a84bac340d862e3b7b0aadf48478de"
-  integrity sha512-0x0wLCmpdKFCi9ulhvYZebgcPmHTkFVUfU2wzDykadkslKwT4oAmDTHEKLnlrDsMGZe4B+ksn8quZfZjYsBetA==
-
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
@@ -5918,7 +5862,7 @@ enhanced-resolve@^0.9.1:
     memory-fs "^0.2.0"
     tapable "^0.1.8"
 
-enhanced-resolve@^5.17.0, enhanced-resolve@^5.17.1, enhanced-resolve@^5.7.0:
+enhanced-resolve@^5.17.1, enhanced-resolve@^5.7.0:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -8990,7 +8934,7 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.14, node-releases@^2.0.18:
+node-releases@^2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
@@ -11278,48 +11222,17 @@ webpack-virtual-modules@^0.6.0, webpack-virtual-modules@^0.6.2:
   resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz#057faa9065c8acf48f24cb57ac0e77739ab9a7e8"
   integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==
 
-webpack@5:
-  version "5.93.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
-  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.11"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.1"
-    webpack-sources "^3.2.3"
-
-webpack@5.95.0:
-  version "5.95.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
-  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
+webpack@5, webpack@5.96.0:
+  version "5.96.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.96.0.tgz#1e4dc9d1d819ff1b1f89d53e45a299ffe9231a8a"
+  integrity sha512-gvn84AfQ4f6vUeNWmFuRp3vGERyxK4epADKTaAo60K0EQbY/YBNQbXH3Ji/ZRK5M25O/XneAOuChF4xQZjQ4xA==
   dependencies:
-    "@types/estree" "^1.0.5"
+    "@types/estree" "^1.0.6"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
     "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
+    acorn "^8.14.0"
+    browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/src/richie/apps/demo/defaults.py

@@ -373,47 +373,57 @@ SINGLECOLUMN_CONTENT.update(getattr(settings, "RICHIE_DEMO_SINGLECOLUMN_CONTENT"
 
 FOOTER_CONTENT = {
     "en": [
-        {"name": "About", "internal_link": "annex__about"},
-        {"name": "Sitemap", "internal_link": "annex__sitemap"},
-        {"name": "Style guide", "external_link": "/styleguide/"},
+        {"name": "About", "link": {"internal_link": "annex__about"}},
+        {"name": "Sitemap", "link": {"internal_link": "annex__sitemap"}},
+        {"name": "Style guide", "link": {"external_link": "/styleguide/"}},
         {
             "title": "Richie community",
             "items": [
-                {"name": "Website", "external_link": "https://richie.education"},
+                {
+                    "name": "Website",
+                    "link": {"external_link": "https://richie.education"},
+                },
                 {
                     "name": "Github",
-                    "external_link": "https://github.com/openfun/richie",
+                    "link": {"external_link": "https://github.com/openfun/richie"},
                 },
                 {
                     "name": "Site factory",
-                    "external_link": "https://github.com/openfun/richie-site-factory",
+                    "link": {
+                        "external_link": "https://github.com/openfun/richie-site-factory"
+                    },
                 },
                 {
                     "name": "Example site",
-                    "external_link": "https://www.fun-campus.fr",
+                    "link": {"external_link": "https://www.fun-campus.fr"},
                 },
             ],
         },
     ],
     "fr": [
-        {"name": "A propos", "internal_link": "annex__about"},
-        {"name": "Plan du site", "internal_link": "annex__sitemap"},
-        {"name": "Style guide", "external_link": "/styleguide/"},
+        {"name": "A propos", "link": {"internal_link": "annex__about"}},
+        {"name": "Plan du site", "link": {"internal_link": "annex__sitemap"}},
+        {"name": "Style guide", "link": {"external_link": "/styleguide/"}},
         {
             "title": "Communauté Richie",
             "items": [
-                {"name": "Site web", "external_link": "https://richie.education"},
+                {
+                    "name": "Site web",
+                    "link": {"external_link": "https://richie.education"},
+                },
                 {
                     "name": "Github",
-                    "external_link": "https://github.com/openfun/richie",
+                    "link": {"external_link": "https://github.com/openfun/richie"},
                 },
                 {
                     "name": "Usine à sites",
-                    "external_link": "https://github.com/openfun/richie-site-factory",
+                    "link": {
+                        "external_link": "https://github.com/openfun/richie-site-factory"
+                    },
                 },
                 {
                     "name": "Site exemple",
-                    "external_link": "https://www.fun-campus.fr",
+                    "link": {"external_link": "https://www.fun-campus.fr"},
                 },
             ],
         },

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/src/richie/apps/demo/management/commands/create_demo_site.py

@@ -81,6 +81,9 @@ def create_demo_site():
     # Create pages as described in PAGES_INFOS
     pages_created = recursive_page_creation(site, defaults.PAGES_INFO)
 
+    def get_internal_link(page):
+        return f"cms.page:{page.id}"
+
     # Create the footer links
     def create_footer_link(**link_info):
         """
@@ -89,9 +92,10 @@ def create_demo_site():
         Links can be nested into a NestedItemPlugin, in this case link_info contains
         a target key.
         """
-        if "internal_link" in link_info:
+        if "internal_link" in link_info["link"]:
             link_info = link_info.copy()
-            link_info["internal_link"] = pages_created[link_info["internal_link"]]
+            link_page = pages_created[link_info["link"]["internal_link"]]
+            link_info["link"] = {"internal_link": get_internal_link(link_page)}
         add_plugin(plugin_type="LinkPlugin", **link_info)
 
     footer_static_ph = StaticPlaceholder.objects.get_or_create(code="footer")[0]
@@ -486,7 +490,7 @@ def create_demo_site():
             target=courses_section,
             name=content["courses_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["courses"],
+            link={"internal_link": get_internal_link(pages_created["courses"])},
         )
 
         # Add highlighted blogposts
@@ -512,7 +516,7 @@ def create_demo_site():
             target=blogposts_section,
             name=content["blogposts_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["blogposts"],
+            link={"internal_link": get_internal_link(pages_created["blogposts"])},
         )
 
         # Add highlighted programs
@@ -538,7 +542,7 @@ def create_demo_site():
             target=programs_section,
             name=content["programs_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["programs"],
+            link={"internal_link": get_internal_link(pages_created["programs"])},
         )
 
         # Add highlighted organizations
@@ -566,7 +570,7 @@ def create_demo_site():
             target=organizations_section,
             name=content["organizations_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["organizations"],
+            link={"internal_link": get_internal_link(pages_created["organizations"])},
         )
 
         # Add highlighted subjects
@@ -592,7 +596,7 @@ def create_demo_site():
             target=subjects_section,
             name=content["subjects_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["categories"],
+            link={"internal_link": get_internal_link(pages_created["categories"])},
         )
 
         # Add highlighted persons
@@ -618,7 +622,7 @@ def create_demo_site():
             target=persons_section,
             name=content["persons_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["persons"],
+            link={"internal_link": get_internal_link(pages_created["persons"])},
         )
 
         # Add Glimpse quotes with empty title
@@ -756,7 +760,7 @@ def create_demo_site():
             target=sample_section,
             name=content["section_sample_button_title"],
             template=content["button_template_name"],
-            internal_link=pages_created["home"],
+            link={"internal_link": get_internal_link(pages_created["home"])},
         )
         # Add a licence
         if licences:

{richie-2.32.1.dev1 → richie-2.32.1.dev6/src/richie.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: richie
-Version: 2.32.1.dev1
+Version: 2.32.1.dev6
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License
@@ -51,7 +51,7 @@ Requires-Dist: arrow
 Requires-Dist: Django<5
 Requires-Dist: djangocms-file
 Requires-Dist: djangocms-googlemap
-Requires-Dist: djangocms-link<5
+Requires-Dist: djangocms-link<6,>=5.0.0
 Requires-Dist: djangocms-picture
 Requires-Dist: djangocms-text-ckeditor
 Requires-Dist: djangocms-video
@@ -69,7 +69,7 @@ Requires-Dist: importlib-metadata
 Requires-Dist: oauthlib==3.2.2
 Requires-Dist: requests==2.32.3
 Provides-Extra: dev
-Requires-Dist: bandit==1.7.10; extra == "dev"
+Requires-Dist: bandit==1.8.0; extra == "dev"
 Requires-Dist: black==24.10.0; extra == "dev"
 Requires-Dist: pyRdfa3==3.6.4; extra == "dev"
 Requires-Dist: cssselect==1.2.0; extra == "dev"
@@ -97,7 +97,7 @@ Requires-Dist: dockerflow==2024.4.2; extra == "sandbox"
 Requires-Dist: factory-boy==3.3.1; extra == "sandbox"
 Requires-Dist: gunicorn==23.0.0; extra == "sandbox"
 Requires-Dist: psycopg2-binary==2.9.10; extra == "sandbox"
-Requires-Dist: sentry-sdk==2.18.0; extra == "sandbox"
+Requires-Dist: sentry-sdk==2.19.0; extra == "sandbox"
 
 # Richie, the best OpenSource CMS to build education portals
 

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/src/richie.egg-info/requires.txt

@@ -2,7 +2,7 @@ arrow
 Django<5
 djangocms-file
 djangocms-googlemap
-djangocms-link<5
+djangocms-link<6,>=5.0.0
 djangocms-picture
 djangocms-text-ckeditor
 djangocms-video
@@ -24,7 +24,7 @@ requests==2.32.3
 twine==5.1.1
 
 [dev]
-bandit==1.7.10
+bandit==1.8.0
 black==24.10.0
 pyRdfa3==3.6.4
 cssselect==1.2.0
@@ -51,4 +51,4 @@ dockerflow==2024.4.2
 factory-boy==3.3.1
 gunicorn==23.0.0
 psycopg2-binary==2.9.10
-sentry-sdk==2.18.0
+sentry-sdk==2.19.0

{richie-2.32.1.dev1 → richie-2.32.1.dev6}/tests/plugins/section/test_templates_section_default.py

@@ -27,7 +27,7 @@ class DefaultTemplatesTestCase(CMSPluginTestCase):
             placeholder,
             plugin_type="LinkPlugin",
             language="en",
-            external_link="http://www.example.com/1",
+            link={"external_link": "http://www.example.com/1"},
             name="Example 1",
             target=parent,
         )
@@ -35,7 +35,7 @@ class DefaultTemplatesTestCase(CMSPluginTestCase):
             placeholder,
             plugin_type="LinkPlugin",
             language="en",
-            external_link="http://www.example.com/2",
+            link={"external_link": "http://www.example.com/2"},
             name="Example 2",
             target=parent,
         )
@@ -159,7 +159,7 @@ class DefaultTemplatesTestCase(CMSPluginTestCase):
                 placeholder,
                 plugin_type="LinkPlugin",
                 language="en",
-                external_link="http://www.example.com/1",
+                link={"external_link": "http://www.example.com/1"},
                 name="Example 1",
                 target=parent,
             )
@@ -167,7 +167,7 @@ class DefaultTemplatesTestCase(CMSPluginTestCase):
                 placeholder,
                 plugin_type="LinkPlugin",
                 language="en",
-                external_link="http://www.example.com/2",
+                link={"external_link": "http://www.example.com/2"},
                 name="Example 2",
                 target=parent,
             )