Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the @navroot and @site controlpanels to render the <title> and the logo #3537

Merged
merged 113 commits into from Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
f4ad406
use @navroot endpoint to get the Logo component's title and alt
erral Jul 31, 2022
075ca24
changelog
erral Jul 31, 2022
322db46
Merge branch 'master' into site-and-navroot
erral Jul 31, 2022
98abb07
Merge branch 'master' of github.com:plone/volto into site-and-navroot
erral Jul 31, 2022
196467f
add navroot title in the <title> tag with the same Plone logic
erral Jul 31, 2022
bf8fe30
Merge branch 'site-and-navroot' of github.com:plone/volto into site-a…
erral Jul 31, 2022
141d131
use navroot url as the link of the Logo
erral Jul 31, 2022
abd132e
add url parameter to the getNavroot action
erral Jul 31, 2022
0cf7090
update Logo tests
erral Jul 31, 2022
8abfa9a
tests
erral Jul 31, 2022
7490bd8
add specific url to call the @site action
erral Jul 31, 2022
fdb0526
update i18n files
erral Jul 31, 2022
72829d1
actions and reducers
erral Aug 2, 2022
a1080d5
actions and reducers
erral Aug 2, 2022
c44620c
restore
erral Aug 2, 2022
d78cbcb
do not expand navroot
erral Aug 2, 2022
e00e223
logo from Plone
erral Aug 2, 2022
ab626b3
boolean condition
erral Aug 2, 2022
91ae301
default
erral Aug 2, 2022
5cae89e
search widget URL with navroot
erral Aug 2, 2022
9714c5e
fix tests
erral Aug 2, 2022
8e0d4b1
fix tests
erral Aug 2, 2022
45d350f
Merge branch 'master' into site-and-navroot
erral Aug 2, 2022
173c567
Merge branch 'master' into site-and-navroot
erral Aug 21, 2022
f80d4ca
Merge branch 'master' into site-and-navroot
erral Oct 11, 2022
d93da6e
Merge branch 'master' into site-and-navroot
erral Jun 5, 2023
8fa6958
Merge branch 'master' into site-and-navroot
erral Jun 7, 2023
a18c5b4
changes to get the information from the navroot
erral Jun 7, 2023
1e2aa29
lint
erral Jun 7, 2023
3b32260
i18n
erral Jun 7, 2023
c08a9fc
use explicit calls to @navroot and @site
erral Jun 7, 2023
606b03f
Revert "use explicit calls to @navroot and @site"
erral Jun 7, 2023
7f246f5
add changelog
erral Jun 7, 2023
8b1f8bc
Merge branch 'master' into site-and-navroot
avoinea Jun 8, 2023
6b5ae08
pass content in props to avoid extra queries
erral Jun 9, 2023
52d83c9
restore logo changes
erral Jun 9, 2023
27ee5db
restore i18n
erral Jun 9, 2023
d410ca6
whitespace
erral Jun 9, 2023
a41d5d4
restore i18n
erral Jun 9, 2023
55fdd62
restore
erral Jun 9, 2023
8001c5f
restore
erral Jun 9, 2023
7b7eb03
whitespace·
erral Jun 9, 2023
5dc2629
changelog
erral Jun 9, 2023
f49c3a6
update test snapshot
erral Jun 9, 2023
1de8d8b
update test snapshot
erral Jun 9, 2023
99dc8e1
feat: provide a widget to set the logo in the Site controlpanel and r…
erral Jun 10, 2023
877ed53
changelog
erral Jun 10, 2023
d6b8555
Merge branch 'master' into site-and-navroot
erral Jun 10, 2023
28f3554
Update src/actions/navroot/navroot.js
erral Jun 14, 2023
f0fab2c
Update src/actions/site/site.js
erral Jun 14, 2023
0d6d4ec
allow configuring the site title
erral Jun 14, 2023
6ec1a06
fix attribute name
erral Jun 14, 2023
44e191e
Merge branch 'master' into site-and-navroot
erral Jun 16, 2023
3f8d5e0
Merge branch 'master' into site-and-navroot
davisagli Jun 18, 2023
6cc6044
use hasApiExpander to query site and navroot
erral Jun 19, 2023
004485d
validate file size
erral Jun 19, 2023
a85f50c
remove unneeded code
erral Jun 19, 2023
81285b6
Upgrade p.restapi to support @site and @navroot endpoints
sneridagh Jun 20, 2023
97a7a06
Merge branch 'master' into site-and-navroot
avoinea Jun 20, 2023
2b3adb1
feat: rework the usage of navroot, obeying config.settings.apiExpanders
erral Jul 1, 2023
e93488d
remove unused
erral Jul 1, 2023
0a00e88
where possible make just one call
erral Jul 1, 2023
3d61c73
make one call where possible
erral Jul 1, 2023
a22a4fe
register an asyncPropExtender to load site settings on SSR
erral Jul 1, 2023
02420cc
tests for actions
erral Jul 1, 2023
77b0738
tests
erral Jul 1, 2023
8788ddf
Merge branch 'master' into site-and-navroot
erral Jul 1, 2023
6c74367
fix
erral Jul 1, 2023
5671dfe
fixes
erral Jul 1, 2023
c5bb6cb
fix test
erral Jul 1, 2023
a1ed66b
update Logo component tests
erral Jul 2, 2023
45f516d
update tests
erral Jul 2, 2023
d938864
use componentDidMount
erral Jul 2, 2023
1af9aaa
rename widget
erral Jul 2, 2023
3a6b3fa
add widget tests
erral Jul 2, 2023
81ed404
add KGS to the acceptance server
erral Jul 2, 2023
b473c6d
update locales
erral Jul 2, 2023
956850e
do not pass not-required props
erral Jul 2, 2023
f2905df
get pathname from props
erral Jul 2, 2023
2021f04
Merge branch 'master' into site-and-navroot
dobri1408 Jul 7, 2023
6454d2f
use DOCKER_IMAGE
erral Jul 18, 2023
23544ad
merge master
erral Jul 18, 2023
112c240
eslint
erral Jul 18, 2023
855ec5d
Merge branch 'master' into site-and-navroot
erral Jul 18, 2023
c09db3a
update
erral Jul 19, 2023
47023f5
document the setting
erral Jul 19, 2023
e4489a4
Merge branch 'master' into site-and-navroot
erral Jul 19, 2023
156ea15
Update docs/source/configuration/settings-reference.md
erral Jul 19, 2023
b5ae3f2
Update docs/source/configuration/settings-reference.md
erral Jul 19, 2023
dbba452
Update docs/source/configuration/settings-reference.md
erral Jul 19, 2023
7880c49
Update docs/source/configuration/settings-reference.md
erral Jul 19, 2023
0cef3ec
Update docs/source/configuration/settings-reference.md
erral Jul 19, 2023
8ef15b1
Update docs/source/configuration/settings-reference.md
erral Jul 19, 2023
dabaf03
styling fixes
erral Jul 19, 2023
c796eb3
Update news/3537.feature
erral Jul 19, 2023
188bef7
Update news/3537.feature
erral Jul 19, 2023
326df4e
Merge branch 'master' into site-and-navroot
erral Jul 19, 2023
7cbddec
Update news/3537.feature
erral Jul 19, 2023
9a6d67a
include navroot as a default expander
erral Jul 20, 2023
9d0e0cd
Merge branch 'master' into site-and-navroot
erral Aug 21, 2023
526a91f
update tests
erral Aug 21, 2023
c77c743
Merge branch 'master' into site-and-navroot
erral Aug 24, 2023
be9919c
Merge branch 'master' into site-and-navroot
erral Sep 11, 2023
9e92439
rollback testing docker image changes
erral Sep 11, 2023
dbf27ed
Merge branch 'master' into site-and-navroot
erral Sep 11, 2023
c4d8ec1
update snapshot
erral Sep 12, 2023
9442127
Merge branch 'master' into site-and-navroot
erral Sep 12, 2023
f23da4f
Fixed tests, now publicURL is in the fixture. Added one more just to …
sneridagh Sep 12, 2023
c36e623
Merge branch 'master' into site-and-navroot
erral Sep 12, 2023
8cccf82
Merge branch 'master' into site-and-navroot
erral Sep 13, 2023
bf67d2c
restore pathname
erral Sep 13, 2023
eee6091
remove unused import
erral Sep 13, 2023
14657a9
whitespace
erral Sep 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -15,7 +15,7 @@ MAKEFLAGS+=--no-builtin-rules
INSTANCE_PORT=8080
DOCKER_IMAGE=plone/server-dev:6.0.5
DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.5
KGS=
KGS=plone.restapi==8.40.0
NODEBIN = ./node_modules/.bin
SCRIPTSPACKAGE = ./packages/scripts

Expand Down
15 changes: 5 additions & 10 deletions locales/ca/LC_MESSAGES/volto.po
Expand Up @@ -606,6 +606,7 @@ msgid "Choose Target"
msgstr "Trieu Destí"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Choose a file
msgid "Choose a file"
msgstr "Trieu un fitxer"
Expand Down Expand Up @@ -1097,16 +1098,19 @@ msgid "Drag and drop files from your computer onto this area or click the “Bro
msgstr "Arrossegueu i deixeu anar fitxers des del vostre ordinador a aquesta àrea o feu clic al botó 'Examinar'."

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to replace the existing file
msgid "Drop file here to replace the existing file"
msgstr "Deixeu anar el fitxer aquí per substituir el fitxer existent"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to upload a new file
msgid "Drop file here to upload a new file"
msgstr "Deixeu anar el fitxer aquí per pujar un fitxer nou"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop files here ...
msgid "Drop files here ..."
msgstr "Deixeu fitxers aquí..."
Expand Down Expand Up @@ -2519,11 +2523,6 @@ msgstr ""
msgid "Plone Foundation"
msgstr "Fundació Plone"

#: components/theme/Logo/Logo
# defaultMessage: Plone Site
msgid "Plone Site"
msgstr "Lloc de Plone"

#: components/theme/Footer/Footer
# defaultMessage: Plone{reg} Open Source CMS/WCM
msgid "Plone{reg} Open Source CMS/WCM"
Expand Down Expand Up @@ -2750,6 +2749,7 @@ msgid "Repeat on"
msgstr "Repetiu"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Replace existing file
msgid "Replace existing file"
msgstr "Substitueix el fitxer existent"
Expand Down Expand Up @@ -3181,11 +3181,6 @@ msgstr "Redueix la barra d'eines"
msgid "Sign in to start session"
msgstr "Inicieu la sessió per iniciar la sessió"

#: components/theme/Logo/Logo
# defaultMessage: Site
msgid "Site"
msgstr "Lloc"

#: components/theme/NotFound/NotFound
#: components/theme/Unauthorized/Unauthorized
# defaultMessage: Site Administration
Expand Down
15 changes: 5 additions & 10 deletions locales/de/LC_MESSAGES/volto.po
Expand Up @@ -603,6 +603,7 @@ msgid "Choose Target"
msgstr "Ziel auswählen"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Choose a file
msgid "Choose a file"
msgstr "Datei auswählen"
Expand Down Expand Up @@ -1094,16 +1095,19 @@ msgid "Drag and drop files from your computer onto this area or click the “Bro
msgstr "Ziehen Sie Dateien von Ihrem Computer auf diesen Bereich oder drücken Sie den “Durchsuchen”-Knopf."

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to replace the existing file
msgid "Drop file here to replace the existing file"
msgstr "Datei hier ablegen um die bestehende Datei zu ersetzen"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to upload a new file
msgid "Drop file here to upload a new file"
msgstr "Datei hier ablegen um eine neue Datei hochzuladen"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop files here ...
msgid "Drop files here ..."
msgstr "Datei hier ablegen um die bestehende Datei zu ersetzen"
Expand Down Expand Up @@ -2516,11 +2520,6 @@ msgstr "Bitte upgraden Sie zu plone.restapi >= 8.35.3."
msgid "Plone Foundation"
msgstr "Plone Foundation"

#: components/theme/Logo/Logo
# defaultMessage: Plone Site
msgid "Plone Site"
msgstr "Website"

#: components/theme/Footer/Footer
# defaultMessage: Plone{reg} Open Source CMS/WCM
msgid "Plone{reg} Open Source CMS/WCM"
Expand Down Expand Up @@ -2747,6 +2746,7 @@ msgid "Repeat on"
msgstr "Wiederhole am"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Replace existing file
msgid "Replace existing file"
msgstr "Bestehende Datei ersetzen"
Expand Down Expand Up @@ -3178,11 +3178,6 @@ msgstr "Toolbar verkleinern"
msgid "Sign in to start session"
msgstr "Loggen Sie sich ein"

#: components/theme/Logo/Logo
# defaultMessage: Site
msgid "Site"
msgstr "Website"

#: components/theme/NotFound/NotFound
#: components/theme/Unauthorized/Unauthorized
# defaultMessage: Site Administration
Expand Down
15 changes: 5 additions & 10 deletions locales/en/LC_MESSAGES/volto.po
Expand Up @@ -597,6 +597,7 @@ msgid "Choose Target"
msgstr ""

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Choose a file
msgid "Choose a file"
msgstr ""
Expand Down Expand Up @@ -1088,16 +1089,19 @@ msgid "Drag and drop files from your computer onto this area or click the “Bro
msgstr ""

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to replace the existing file
msgid "Drop file here to replace the existing file"
msgstr ""

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to upload a new file
msgid "Drop file here to upload a new file"
msgstr ""

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop files here ...
msgid "Drop files here ..."
msgstr ""
Expand Down Expand Up @@ -2510,11 +2514,6 @@ msgstr ""
msgid "Plone Foundation"
msgstr ""

#: components/theme/Logo/Logo
# defaultMessage: Plone Site
msgid "Plone Site"
msgstr ""

#: components/theme/Footer/Footer
# defaultMessage: Plone{reg} Open Source CMS/WCM
msgid "Plone{reg} Open Source CMS/WCM"
Expand Down Expand Up @@ -2741,6 +2740,7 @@ msgid "Repeat on"
msgstr ""

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Replace existing file
msgid "Replace existing file"
msgstr ""
Expand Down Expand Up @@ -3172,11 +3172,6 @@ msgstr ""
msgid "Sign in to start session"
msgstr ""

#: components/theme/Logo/Logo
# defaultMessage: Site
msgid "Site"
msgstr ""

#: components/theme/NotFound/NotFound
#: components/theme/Unauthorized/Unauthorized
# defaultMessage: Site Administration
Expand Down
15 changes: 5 additions & 10 deletions locales/es/LC_MESSAGES/volto.po
Expand Up @@ -608,6 +608,7 @@ msgid "Choose Target"
msgstr "Seleccione destino"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Choose a file
msgid "Choose a file"
msgstr "Seleccionar Archivo"
Expand Down Expand Up @@ -1099,16 +1100,19 @@ msgid "Drag and drop files from your computer onto this area or click the “Bro
msgstr "Arrastre y suelte los archivos desde su computador en esta área o haga clic al botón “Seleccionar”."

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to replace the existing file
msgid "Drop file here to replace the existing file"
msgstr "Arrastre aquí el archivo para reemplazar el actual"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to upload a new file
msgid "Drop file here to upload a new file"
msgstr "Arrastre aquí el archivo para añadir un nuevo"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop files here ...
msgid "Drop files here ..."
msgstr "Arrastrar archivos aquí..."
Expand Down Expand Up @@ -2521,11 +2525,6 @@ msgstr ""
msgid "Plone Foundation"
msgstr "Fundación Plone"

#: components/theme/Logo/Logo
# defaultMessage: Plone Site
msgid "Plone Site"
msgstr "Sitio Plone"

#: components/theme/Footer/Footer
# defaultMessage: Plone{reg} Open Source CMS/WCM
msgid "Plone{reg} Open Source CMS/WCM"
Expand Down Expand Up @@ -2752,6 +2751,7 @@ msgid "Repeat on"
msgstr "Repetir el"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Replace existing file
msgid "Replace existing file"
msgstr "Sustituir el archivo actual"
Expand Down Expand Up @@ -3183,11 +3183,6 @@ msgstr "Contraer barra de herramientas"
msgid "Sign in to start session"
msgstr "Acceda para iniciar sesión"

#: components/theme/Logo/Logo
# defaultMessage: Site
msgid "Site"
msgstr "Sitio"

#: components/theme/NotFound/NotFound
#: components/theme/Unauthorized/Unauthorized
# defaultMessage: Site Administration
Expand Down
15 changes: 5 additions & 10 deletions locales/eu/LC_MESSAGES/volto.po
Expand Up @@ -604,6 +604,7 @@ msgid "Choose Target"
msgstr "Aukeratu helburua"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Choose a file
msgid "Choose a file"
msgstr "Aukeratu fitxategia"
Expand Down Expand Up @@ -1095,16 +1096,19 @@ msgid "Drag and drop files from your computer onto this area or click the “Bro
msgstr "Arrastatu fitxategiak hona edo erabili Arakatu botoia."

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to replace the existing file
msgid "Drop file here to replace the existing file"
msgstr "Arrastatu fitxategia hona orain dagoena ordezkatzeko"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to upload a new file
msgid "Drop file here to upload a new file"
msgstr "Arrastatu fitxategia hona fitxategi berria kargatzeko"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop files here ...
msgid "Drop files here ..."
msgstr "Arrastatu fitxategiak hona..."
Expand Down Expand Up @@ -2517,11 +2521,6 @@ msgstr ""
msgid "Plone Foundation"
msgstr "Plone Fundazioa"

#: components/theme/Logo/Logo
# defaultMessage: Plone Site
msgid "Plone Site"
msgstr "Plone Ataria"

#: components/theme/Footer/Footer
# defaultMessage: Plone{reg} Open Source CMS/WCM
msgid "Plone{reg} Open Source CMS/WCM"
Expand Down Expand Up @@ -2748,6 +2747,7 @@ msgid "Repeat on"
msgstr "Egun honetan errepikatu"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Replace existing file
msgid "Replace existing file"
msgstr "Ordezkatu fitxategia"
Expand Down Expand Up @@ -3179,11 +3179,6 @@ msgstr "Txikitu tresna-barra"
msgid "Sign in to start session"
msgstr "Sartu saioa hasteko"

#: components/theme/Logo/Logo
# defaultMessage: Site
msgid "Site"
msgstr "Ataria"

#: components/theme/NotFound/NotFound
#: components/theme/Unauthorized/Unauthorized
# defaultMessage: Site Administration
Expand Down
15 changes: 5 additions & 10 deletions locales/fi/LC_MESSAGES/volto.po
Expand Up @@ -608,6 +608,7 @@ msgid "Choose Target"
msgstr "Valitse sisältö"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Choose a file
msgid "Choose a file"
msgstr "Valitse tiedosto"
Expand Down Expand Up @@ -1099,16 +1100,19 @@ msgid "Drag and drop files from your computer onto this area or click the “Bro
msgstr "Raahaa ja pudota tiedostoja tietokoneeltasi tähän tai paina “Selaa”."

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to replace the existing file
msgid "Drop file here to replace the existing file"
msgstr "Pudota tiedosto tähän korvataksesi olemassaolevan tiedoston"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop file here to upload a new file
msgid "Drop file here to upload a new file"
msgstr "Pudota tiedosto tähän ladataksesi uuden tiedoston"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Drop files here ...
msgid "Drop files here ..."
msgstr "Pudota tiedosto tänne... "
Expand Down Expand Up @@ -2521,11 +2525,6 @@ msgstr ""
msgid "Plone Foundation"
msgstr "Plone-säätiön"

#: components/theme/Logo/Logo
# defaultMessage: Plone Site
msgid "Plone Site"
msgstr "Plone-sivusto"

#: components/theme/Footer/Footer
# defaultMessage: Plone{reg} Open Source CMS/WCM
msgid "Plone{reg} Open Source CMS/WCM"
Expand Down Expand Up @@ -2752,6 +2751,7 @@ msgid "Repeat on"
msgstr "Toista"

#: components/manage/Widgets/FileWidget
#: components/manage/Widgets/SiteLogoWidget
# defaultMessage: Replace existing file
msgid "Replace existing file"
msgstr "Korvaa olemassaoleva tiedosto"
Expand Down Expand Up @@ -3183,11 +3183,6 @@ msgstr "Kutista työkalupalkki"
msgid "Sign in to start session"
msgstr "Kirjaudu sisään"

#: components/theme/Logo/Logo
# defaultMessage: Site
msgid "Site"
msgstr "Sivusto"

#: components/theme/NotFound/NotFound
#: components/theme/Unauthorized/Unauthorized
# defaultMessage: Site Administration
Expand Down