richie 2.32.1.dev4__py2.py3-none-any.whl → 2.32.1.dev6__py2.py3-none-any.whl

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/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.dev4.dist-info → richie-2.32.1.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: richie
-Version: 2.32.1.dev4
+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.dev4.dist-info → richie-2.32.1.dev6.dist-info}/RECORD

@@ -1035,7 +1035,7 @@ richie/apps/courses/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 richie/apps/courses/templatetags/category_tags.py,sha256=cSwWFtxiubAPgx9kTdDoOe3XOoPNfYirxA4xjAQjOk0,2147
 richie/apps/courses/templatetags/extra_tags.py,sha256=3cHfVQke07dCuuiuunQsJdBA9U6F8swH2bjHwMds0HM,11299
 richie/apps/demo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-richie/apps/demo/defaults.py,sha256=jjx2C3n3OeUbb-QZVEabZXI2qdNZtpwhC4JnjgyFw8k,16134
+richie/apps/demo/defaults.py,sha256=5rNkofz-ReovOHi4nOlv97xLE3fShrjF6upFNhPfg8Q,16484
 richie/apps/demo/helpers.py,sha256=bg8RPWA-ZZme99pDswWHCpoPGZfWoFwe85fL7nv9FNA,2221
 richie/apps/demo/utils.py,sha256=P91d0Ex0COMFNEXYChVdibd5HXaAIEsqQgufml253LA,1446
 richie/apps/demo/fixtures/banner/banner1.jpg,sha256=I2zL-PU6I1_encvPajqW1tdYDYQ4zZSaDB1V2xuRjiw,99758
@@ -1092,7 +1092,7 @@ richie/apps/demo/fixtures/portrait/portrait-7.png,sha256=76tK5-lMED4mW8TN8JFRlOF
 richie/apps/demo/fixtures/portrait/portrait-8.png,sha256=BvA5je_9wioCgz56GxRIWX9XrcKQdGzCPi8xHvxF7O8,9370
 richie/apps/demo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/demo/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-richie/apps/demo/management/commands/create_demo_site.py,sha256=3nVwGCRhkCzj2VslwxwYvHUhu5ZfNzRkzlrN-cg1zb0,30860
+richie/apps/demo/management/commands/create_demo_site.py,sha256=WNiln1ZLrAGPSyVVteK5hxaZt9JYhQhJv7IX-bo16EY,31213
 richie/apps/search/__init__.py,sha256=pSGulmcMEHgv84OVt3RpNAKmw4egImIssH2Q4qebn4A,469
 richie/apps/search/apps.py,sha256=HA1uuHRRtW0LxBIjkcu3iSKI98fHLZwZy_2R9fqtYGQ,742
 richie/apps/search/cms_toolbars.py,sha256=z7n3QDSPIQks2NvmGRBWd58cbJq0lqEsBJmhK9eTKns,1272
@@ -2458,9 +2458,9 @@ richie/static/richie/js/build/99716.15b5bd6b657143458713.index.js,sha256=PKLluC8
 richie/static/richie/js/build/9986.15b5bd6b657143458713.index.js,sha256=YZTuD2ZqVOt-M6_gN3COhaA9URHuY6oP9IqymHl0Idc,133
 richie/static/richie/js/build/99953.15b5bd6b657143458713.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=iBeHUT7aIDdbL4E3EAisLOfhTLcoR_mD6quOyodpSXs,1367259
-richie-2.32.1.dev4.dist-info/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-2.32.1.dev4.dist-info/METADATA,sha256=dDYGtV4-q_652WdEOxHnzNNQoQv2ayqIxTLR0WkkQWg,6853
-richie-2.32.1.dev4.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-richie-2.32.1.dev4.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-2.32.1.dev4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-2.32.1.dev4.dist-info/RECORD,,
+richie-2.32.1.dev6.dist-info/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-2.32.1.dev6.dist-info/METADATA,sha256=NxXX6zFvzOArRVghi2Pfa_mXRCkSmpuy7zeYtliFzR0,6860
+richie-2.32.1.dev6.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+richie-2.32.1.dev6.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-2.32.1.dev6.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-2.32.1.dev6.dist-info/RECORD,,