Skip to content

Commit af2689a

Browse files
authored
Merge branch '6.0' into dev-guide-create-a-backend-add-on
2 parents 6e92377 + f21d6d2 commit af2689a

File tree

15 files changed

+26
-21
lines changed

15 files changed

+26
-21
lines changed

docs/backend/relations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ minions = RelationList(
6161
)
6262
```
6363

64-
We can see that the [code for the behavior `IRelatedItems`](https://github.com/plone/plone.app.relationfield/blob/master/plone/app/relationfield/behavior.py) does exactly the same thing.
64+
We can see that the [code for the behavior `IRelatedItems`](https://github.com/plone/plone.app.relationfield/blob/master/src/plone/app/relationfield/behavior.py) does exactly the same thing.
6565

6666

6767
(relations-controlling-relation-targets-label)=

docs/backend/upgrading/version-specific-migration/upgrade-to-python3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,6 @@ Here is a list of helpful references on the topic of porting Python 2 to Python
382382
- https://eev.ee/blog/2016/07/31/python-faq-how-do-i-port-to-python-3/
383383
- https://diveintopython3.net/
384384
- https://docs.djangoproject.com/en/1.11/topics/python3/
385-
- https://docs.ansible.com/ansible/latest/dev_guide/developing_python_3.html
385+
- https://docs.ansible.com/projects/ansible/latest/dev_guide/developing_python_3.html
386386
- https://docs.python.org/2/library/doctest.html#debugging
387387
```

docs/backend/widgets.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ You can set the template used by the widget with the `<z3c:widgetTemplate>` ZCML
624624
### Widget frame override
625625

626626
You can override widget templates as instructed for `z3c.form`.
627-
`plone.app.z3cform` renders [a frame around each widget](https://github.com/plone/plone.app.z3cform/blob/master/plone/app/z3cform/templates/widget.pt), which usually consists of:
627+
`plone.app.z3cform` renders [a frame around each widget](https://github.com/plone/plone.app.z3cform/blob/master/src/plone/app/z3cform/templates/widget.pt), which usually consists of:
628628

629629
- Label
630630
- Required marker
@@ -633,7 +633,7 @@ You can override widget templates as instructed for `z3c.form`.
633633
You might want to customize this widget frame for your own form.
634634
Below is an example of how to do it.
635635

636-
Copy [`widget.pt`](https://github.com/plone/plone.app.z3cform/blob/master/plone/app/z3cform/templates/widget.pt) to your own package, rename it as `demo-widget.pt`, and edit it.
636+
Copy [`widget.pt`](https://github.com/plone/plone.app.z3cform/blob/master/src/plone/app/z3cform/templates/widget.pt) to your own package, rename it as `demo-widget.pt`, and edit it.
637637

638638
Then add the following code to `configure.zcml`.
639639
Remember to fix the path of the template according to your own paths.

docs/classic-ui/forms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ In the template, you can use the following variables:
174174
Dexterity content types come with default add and edit forms.
175175
You can build custom add and edit forms to adjust their behavior.
176176

177-
The implementation of the default edit and add forms is in [`plone.dexterity.browser.edit.py`](https://github.com/plone/plone.dexterity/blob/master/plone/dexterity/browser/edit.py) and [`plone.dexterity.browser.add.py`](https://github.com/plone/plone.dexterity/blob/master/plone/dexterity/browser/add.py).
177+
The implementation of the default edit and add forms is in [`plone.dexterity.browser.edit.py`](https://github.com/plone/plone.dexterity/blob/master/src/plone/dexterity/browser/edit.py) and [`plone.dexterity.browser.add.py`](https://github.com/plone/plone.dexterity/blob/master/src/plone/dexterity/browser/add.py).
178178

179179
```{todo}
180180
Describe Add/Edit forms here and how to customize them.

docs/classic-ui/images.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ To scale an image, you can use the `mode` parameter to control the scaling outpu
248248
You must use either `width` or `height`, or both.
249249

250250
Three different scaling options are supported.
251-
They correspond to the CSS [`background-size`](https://developer.mozilla.org/en-US/docs/Web/CSS/background-size) values.
251+
They correspond to the CSS [`background-size`](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/background-size) values.
252252

253253
The possible options for `mode` are listed below, where the default option is `scale`.
254254

@@ -279,6 +279,7 @@ These views help developers verify image scaling, `srcset` generation, and explo
279279
These views work on image content types, including images and documents with images.
280280

281281
Append the view name `/@@images-test` to an image URL, optionally followed by an anchor, such as `#srcset`, for specific sections.
282+
You must be authenticated as a site admin to view this demo.
282283

283284
For example, on the Classic UI demo site, the URL would be https://classic.demo.plone.org/en/demo/an-image.jpg/@@images-test#srcset.
284285

@@ -371,7 +372,7 @@ To access image scales, which are normally not accessible to the current user, o
371372
## Responsive image support
372373

373374
Plone supports the generation of [`picture`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/picture) tags with `srcset`s for image optimization.
374-
Additionally, you can define [media queries](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_media_queries/Using_media_queries) for [art direction](classic-ui-images-responsive-image-support-art-direction) and further optimization.
375+
Additionally, you can define [media queries](https://developer.mozilla.org/en-US/docs/Web/CSS/Guides/Media_queries/Using) for [art direction](classic-ui-images-responsive-image-support-art-direction) and further optimization.
375376

376377
The configuration allows you to define different `picture` variants, such as `Large`, `Medium`, or `Small`.
377378
Users can choose from them in editors, such as TinyMCE, and developers can use them in templates.

docs/classic-ui/theming/css-custom-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ myst:
1111

1212
# CSS custom properties
1313

14-
This chapter describes the [CSS custom properties](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_cascading_variables/Using_CSS_custom_properties) used in Bootstrap and customized by Classic UI themes.
14+
This chapter describes the [CSS custom properties](https://developer.mozilla.org/en-US/docs/Web/CSS/Guides/Cascading_variables/Using_custom_properties) used in Bootstrap and customized by Classic UI themes.
1515
Custom properties (sometimes referred to as CSS variables or cascading variables) are entities defined by CSS authors that represent specific values to be reused throughout a document.
1616

1717

docs/classic-ui/viewlets.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ These methods should honor the [`zope.contentprovider.interfaces.IContentProvide
190190

191191
```{seealso}
192192
- [`zope.contentprovider.interfaces`](https://github.com/zopefoundation/zope.contentprovider/blob/3.7.2/src/zope/contentprovider/interfaces.py)
193-
- [`plone.app.layout.viewlets.common`](https://github.com/plone/plone.app.layout/blob/master/plone/app/layout/viewlets/common.py)
193+
- [`plone.app.layout.viewlets.common`](https://github.com/plone/plone.app.layout/blob/master/src/plone/app/layout/viewlets/common.py)
194194
```
195195

196196

@@ -822,7 +822,7 @@ Hide the concerning viewlets in one manager using `/@@manage-viewlets` and {file
822822
```
823823
824824
Viewlet managers are based on [`zope.viewlet.manager.ViewletManager`](https://github.com/zopefoundation/zope.viewlet/blob/master/src/zope/viewlet/manager.py)
825-
and [`plone.app.viewletmanager.manager.OrderedViewletManager`](https://github.com/plone/plone.app.viewletmanager/blob/master/plone/app/viewletmanager/manager.py).
825+
and [`plone.app.viewletmanager.manager.OrderedViewletManager`](https://github.com/plone/plone.app.viewletmanager/blob/master/src/plone/app/viewletmanager/manager.py).
826826
827827
```{seealso}
828828
- [`zope.viewlet`](https://github.com/zopefoundation/zope.viewlet/blob/master/src/zope/viewlet/viewlet.py)

docs/classic-ui/views.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This enhances readability and makes components more reusable.
3838
You can override the Python logic, the template file, or both.
3939

4040
When you work with Plone, the most common view type is `BrowserView` from the package [`Products.Five`](https://github.com/zopefoundation/Zope/blob/master/src/Products/Five/doc/manual.txt).
41-
Other view types include `DefaultView` from [`plone.dexterity`](https://github.com/plone/plone.dexterity/blob/master/plone/dexterity/browser/view.py) and `CollectionView` from [`plone.app.contenttypes`](https://github.com/plone/plone.app.contenttypes/blob/master/plone/app/contenttypes/browser/collection.py).
41+
Other view types include `DefaultView` from [`plone.dexterity`](https://github.com/plone/plone.dexterity/blob/master/src/plone/dexterity/browser/view.py) and `CollectionView` from [`plone.app.contenttypes`](https://github.com/plone/plone.app.contenttypes/blob/master/src/plone/app/contenttypes/browser/collection.py).
4242

4343
Each `BrowserView` class is a Python callable.
4444
The `BrowserView.__call__()` method acts as an entry point to executing the view code.
@@ -255,7 +255,7 @@ Add the name of the new view `my-view` to the following list:
255255
### Template slots
256256

257257
In the generated template above, we have a `fill-slot` attribute.
258-
This will fill the slot with the name `content-core`, which is defined in Plone's [`main_template`](https://github.com/plone/Products.CMFPlone/blob/master/Products/CMFPlone/browser/templates/main_template.pt).
258+
This will fill the slot with the name `content-core`, which is defined in Plone's [`main_template`](https://github.com/plone/Products.CMFPlone/blob/master/src/Products/CMFPlone/browser/templates/main_template.pt).
259259
The following list shows the available options for `<metal fill-slot="">` in your template.
260260

261261
```{note}

docs/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@
8888
# Ignore pages that require authentication
8989
r"https://github.com/orgs/plone/teams/",
9090
r"https://github.com/plone/documentation/issues/new",
91+
r"https://classic.demo.plone.org/en/demo/an-image.jpg/@@images-test#srcset",
92+
# Ignore pages that are rate limited or otherwise blocked
9193
r"https://stackoverflow.com",
94+
r"https://www.npmjs.com/",
95+
r"https://hosted.weblate.org/",
9296
# Ignore github.com pages with anchors
9397
r"https://github.com/.*#.*",
9498
# Ignore rate limiting by github.com

docs/contributing/core/continuous-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ When you push a commit to a Plone repository on GitHub, the email address in you
3636
If it does not match, then `mr.roboto` will notify you that there is a problem that prevents your pull request from being merged.
3737
You must resolve the issue.
3838

39-
To change the email address in your commits, see [Setting your commit email address](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address).
39+
To change the email address in your commits, see [Setting your commit email address](https://docs.github.com/en/account-and-profile/how-tos/email-preferences/setting-your-commit-email-address).
4040

41-
To add an email address to your GitHub account, see [Adding an email address to your GitHub account](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account).
41+
To add an email address to your GitHub account, see [Adding an email address to your GitHub account](https://docs.github.com/en/account-and-profile/how-tos/email-preferences/adding-an-email-address-to-your-github-account).
4242

4343

4444
## Jenkins

0 commit comments

Comments
 (0)