From 0df9ad7821bacd6ece5786f60edb18612de36165 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Thu, 13 Apr 2023 00:45:14 -0700 Subject: [PATCH] Clean up configuration and links for 2022 archive --- README.md | 9 ++------- docs/conf.py | 6 +++--- docs/mastering-plone-5/behaviors_2.md | 2 +- docs/mastering-plone-5/code.md | 2 +- docs/mastering-plone-5/deployment_sites.md | 2 +- docs/mastering-plone-5/resources.md | 2 +- docs/mastering-plone/deployment_sites.md | 2 +- docs/ttw/ttw-advanced-2.md | 10 +++++----- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index dbf2deb99..981cb137a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Testing Status](https://github.com/plone/training/actions/workflows/test.yml/badge.svg?branch=main "Testing Status")](https://github.com/plone/training/actions/workflows/test.yml) +[![Testing Status](https://github.com/plone/training/actions/workflows/test.yml/badge.svg?branch=2022 "Testing Status")](https://github.com/plone/training/actions/workflows/test.yml) # Training @@ -7,7 +7,7 @@ ## Contribute -A guide on how to contribute to the trainings can be found in [Contributing to Plone Trainings Documentation](https://training.plone.org/contributing/). +A guide on how to contribute to the trainings can be found in [Contributing to Plone Trainings](https://training.plone.org/contributing/). ## Support @@ -18,8 +18,3 @@ If you have issues, please open an issue in our [Issue Tracker](https://github.c ## License The project is licensed under the [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/) by the [Plone Foundation](https://plone.org). - - -## The landing page - -The code for the landing page at https://training.plone.org is in another repository at https://github.com/plone/training.plone.org. diff --git a/docs/conf.py b/docs/conf.py index 1d2844071..a46deb1df 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -175,7 +175,7 @@ ] # Used by sphinx_sitemap to generate a sitemap -html_baseurl = "https://training.plone.org" +html_baseurl = "https://2022.training.plone.org" sitemap_url_scheme = "{link}" # Add any paths that contain custom static files (such as style sheets) here, @@ -223,9 +223,9 @@ # -- OpenGraph configuration ---------------------------------- -ogp_site_url = "https://training.plone.org/" +ogp_site_url = "https://2022.training.plone.org/" ogp_description_length = 200 -ogp_image = "https://training.plone.org/_static/Plone_logo_square.png" +ogp_image = "https://2022.training.plone.org/_static/Plone_logo_square.png" ogp_site_name = "Plone Training" ogp_type = "website" ogp_custom_meta_tags = [ diff --git a/docs/mastering-plone-5/behaviors_2.md b/docs/mastering-plone-5/behaviors_2.md index 1ece778a2..3fcf0e072 100644 --- a/docs/mastering-plone-5/behaviors_2.md +++ b/docs/mastering-plone-5/behaviors_2.md @@ -445,7 +445,7 @@ You will also have to write a 'request' dummy that mocks the `getClientAddr` and :icon: question There are no tests for `starzel.votablebehavior` at all at the moment. -But you can refer to [chapter 24 (Testing in Plone)](https://2022.training.plone.org/mastering-plone-5/testing.html) for how to setup unit testing for a package. +But you can refer to {doc}`testing` for how to setup unit testing for a package. Put the particular test for this exercise into a file named {file}`starzel.votable_behavior/starzel/votable_behavior/tests/test_voting`. Remember you need an empty {file}`__init__.py` file in the {file}`tests` directory to make testing work. You also need to add `starzel.votable_behavior` to `test-eggs` in {file}`buildout.cfg` and re-run buildout. diff --git a/docs/mastering-plone-5/code.md b/docs/mastering-plone-5/code.md index 131887741..156606b06 100644 --- a/docs/mastering-plone-5/code.md +++ b/docs/mastering-plone-5/code.md @@ -33,7 +33,7 @@ git checkout views_2 ``` The names of the tags are the same as the URL of the chapter. -The tag for the chapter https://training.plone.org/mastering-plone/registry.html is `registry`. +The tag for the chapter {doc}`registry` is `registry`. You can get it with {command}`git checkout registry`. ## Moving from chapter to chapter diff --git a/docs/mastering-plone-5/deployment_sites.md b/docs/mastering-plone-5/deployment_sites.md index 35dcaa558..ff3c50c5a 100644 --- a/docs/mastering-plone-5/deployment_sites.md +++ b/docs/mastering-plone-5/deployment_sites.md @@ -71,7 +71,7 @@ Deploying Plone and production-setups are outside the scope for this training. ```{seealso} - -- +- {doc}`../deployment/index` ``` (plone5-deployment-tools-label)= diff --git a/docs/mastering-plone-5/resources.md b/docs/mastering-plone-5/resources.md index 025b3d876..3b0f71f03 100644 --- a/docs/mastering-plone-5/resources.md +++ b/docs/mastering-plone-5/resources.md @@ -114,4 +114,4 @@ Open the file {file}`profiles/default/registry.xml` and add the following: The resources that are part of the registered bundle will now be deployed with every request. For more information on working with CSS and JavaScript resources, please see the [resource registry documentation](https://5.docs.plone.org/adapt-and-extend/theming/resourceregistry.html) -or the [Advanced Diazo training class](https://2022.training.plone.org/theming_plone_5/adv-diazo.html). +or {doc}`../theming_plone_5/adv-diazo`. diff --git a/docs/mastering-plone/deployment_sites.md b/docs/mastering-plone/deployment_sites.md index db6d3ef59..1dede8d1d 100644 --- a/docs/mastering-plone/deployment_sites.md +++ b/docs/mastering-plone/deployment_sites.md @@ -76,7 +76,7 @@ Deploying Plone and production-setups are outside the scope for this training. ```{seealso} - -- +- {doc}`../plone-deployment/index` ``` (deployment-tools-label)= diff --git a/docs/ttw/ttw-advanced-2.md b/docs/ttw/ttw-advanced-2.md index 084618ada..b8acde8d2 100644 --- a/docs/ttw/ttw-advanced-2.md +++ b/docs/ttw/ttw-advanced-2.md @@ -311,7 +311,7 @@ The supporting files (CSS, JavasSript and other files) may be in subdirectories. 1. To get started [download a copy of the New Age theme as a zip file](https://codeload.github.com/StartBootstrap/startbootstrap-new-age/zip/refs/heads/master). Then upload it to the theme control panel. - ```{hint} + ```{dropdown} :animate: fade-in-slide-down :icon: question @@ -337,7 +337,7 @@ The supporting files (CSS, JavasSript and other files) may be in subdirectories. *Clean Blog* is a free Bootstrap theme, the latest version is available on GitHub https://github.com/StartBootstrap/startbootstrap-clean-blog ``` - ```{hint} + ```{dropdown} :animate: fade-in-slide-down :icon: question @@ -386,7 +386,7 @@ The supporting files (CSS, JavasSript and other files) may be in subdirectories. - it can be tricky to dynamically replace background images provided by inline styles. ``` -````{hint} +````{dropdown} :animate: fade-in-slide-down :icon: question @@ -473,7 +473,7 @@ In this exercise we will alter our theme from the previous exercise to make it i 1. Update the {file}`rules.xml` file to include Barceloneta rules. - ```{hint} + ```{dropdown} :animate: fade-in-slide-down :icon: question @@ -483,7 +483,7 @@ In this exercise we will alter our theme from the previous exercise to make it i 2. Add conditional rules to {file}`rules.xml` so that the new theme is only shown to anonymous users. Rename the theme's {file}`index.html` to {file}`front.html` and add a copy of the Barceloneta {file}`index.html`. - ````{hint} + ````{dropdown} :animate: fade-in-slide-down :icon: question