Skip to content

Commit c0f3906

Browse files
boulchboulch
committed
Migration to Plone 6.1.3
1 parent 85645bb commit c0f3906

File tree

3 files changed

+65
-99
lines changed

3 files changed

+65
-99
lines changed

‎base-6.1.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ extensions =
66
sources-dir = devel
77

88
extends =
9-
https://dist.plone.org/release/6.1.1/versions.cfg
10-
https://dist.plone.org/release/6.1.1/versions-ecosystem.cfg
11-
https://dist.plone.org/release/6.1.1/versions-extra.cfg
12-
https://raw.githubusercontent.com/IMIO/buildout.smartweb/main/versions.cfg
9+
https://dist.plone.org/release/6.1.3/versions.cfg
10+
https://dist.plone.org/release/6.1.3/versions-ecosystem.cfg
11+
https://dist.plone.org/release/6.1.3/versions-extra.cfg
12+
https://raw.githubusercontent.com/IMIO/buildout.smartweb/plone613/versions.cfg
1313
https://raw.githubusercontent.com/IMIO/buildout.smartweb/main/sources.cfg
1414

1515
parts =

‎requirements-6.1.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-r https://dist.plone.org/release/6.1.1/requirements.txt
1+
-r https://dist.plone.org/release/6.1.3/requirements.txt

‎src/imio/smartweb/common/profiles/default/registry/tinymce.xml‎

Lines changed: 60 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,8 @@
5353
<element>code</element>
5454
<element>charmap</element>
5555
<element>fullscreen</element>
56-
<element>hr</element>
5756
<element>lists</element>
5857
<element>nonbreaking</element>
59-
<element>noneditable</element>
60-
<element>paste</element>
6158
<element>searchreplace</element>
6259
<element>table</element>
6360
<element>visualblocks</element>
@@ -67,106 +64,75 @@
6764
</record>
6865

6966
<!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/menus-configuration-options/#menubar -->
70-
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
71-
name="plone.menubar"
72-
>
73-
<value purge="true">
74-
<element>edit</element>
75-
<element>format</element>
76-
<element>insert</element>
77-
<element>table</element>
78-
<element>view</element>
79-
</value>
80-
</record>
67+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
68+
name="plone.menubar">
69+
<value purge="true">edit format insert table view</value>
70+
</record>
71+
8172

8273
<!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/available-menu-items/ -->
8374
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
84-
name="plone.menu"
85-
>
86-
<value purge="true">
87-
{
88-
"file": {
89-
"title": "File",
90-
"items": ""
91-
},
92-
"tools": {
93-
"title": "Tools",
94-
"items": ""
95-
},
96-
"table": {
97-
"title": "Table",
98-
"items": ""
99-
},
100-
"edit": {
101-
"title": "Edit",
102-
"items": "undo redo | cut copy paste | searchreplace selectall"
103-
},
104-
"format": {
105-
"title": "Format",
106-
"items": ""
107-
},
108-
"insert": {
109-
"title": "Insert",
110-
"items": "hr"
111-
},
112-
"table": {
113-
"title": "Table",
114-
"items": "inserttable deletetable | cell row column"
115-
},
116-
"view": {
117-
"title": "View",
118-
"items": "visualblocks preview fullscreen"
119-
}
120-
}
121-
</value>
122-
</record>
75+
name="plone.menu">
76+
<value purge="true">
77+
{
78+
"file": {
79+
"title": "File",
80+
"items": ""
81+
},
82+
"tools": {
83+
"title": "Tools",
84+
"items": ""
85+
},
86+
"edit": {
87+
"title": "Edit",
88+
"items": "undo redo | selectall | searchreplace"
89+
},
90+
"format": {
91+
"title": "Format",
92+
"items": ""
93+
},
94+
"insert": {
95+
"title": "Insert",
96+
"items": "charmap nonbreaking"
97+
},
98+
"table": {
99+
"title": "Table",
100+
"items": "inserttable deletetable | cell row column"
101+
},
102+
"view": {
103+
"title": "View",
104+
"items": "visualblocks preview fullscreen"
105+
}
106+
}
107+
</value>
108+
</record>
123109

124-
<!-- See possible values in https://www.tiny.cloud/docs/tinymce/latest/available-toolbar-buttons/ -->
125-
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
126-
name="plone.toolbar"
127-
>
128-
<value>undo redo | styleselect | bold italic superscript | bullist numlist | nonbreaking | plonelink unlink | fullscreen</value>
129-
</record>
110+
<!-- Toolbar OK (garde nonbreaking ; plus de paste) -->
111+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
112+
name="plone.toolbar">
113+
<value>undo redo | styleselect | bold italic superscript | bullist numlist | nonbreaking | plonelink unlink | fullscreen</value>
114+
</record>
130115

131116

132117
<!-- See paste_as_text options in https://www.tiny.cloud/docs/tinymce/latest/copy-and-paste/#paste_as_text -->
133118
<!-- See style_formats options in https://www.tiny.cloud/docs/tinymce/latest/user-formatting-options/#style_formats -->
134119
<!-- See default table options in https://www.tiny.cloud/docs/tinymce/latest/table-options/ -->
135120
<!-- See plugin table options in https://www.tiny.cloud/docs/tinymce/latest/table/ -->
136-
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
137-
name="plone.other_settings"
138-
>
139-
<value>
140-
{
141-
"paste_as_text": true,
142-
"style_formats": [
143-
{
144-
"block": "p",
145-
"title": "Paragraphe"
146-
},
147-
{
148-
"block": "h2",
149-
"title": "Titre 2"
150-
},
151-
{
152-
"block": "h3",
153-
"title": "Titre 3"
154-
},
155-
{
156-
"block": "h4",
157-
"title": "Titre 4"
158-
},
159-
{
160-
"block": "mark",
161-
"title": "Mise en évidence"
162-
},
163-
{
164-
"block": "blockquote",
165-
"title": "Citation"
166-
}
167-
]
168-
}
169-
</value>
170-
</record>
121+
<record interface="plone.base.interfaces.controlpanel.ITinyMCESchema"
122+
name="plone.other_settings">
123+
<value>
124+
{
125+
"paste_as_text": true,
126+
"style_formats": [
127+
{ "block": "p", "title": "Paragraphe" },
128+
{ "block": "h2", "title": "Titre 2" },
129+
{ "block": "h3", "title": "Titre 3" },
130+
{ "block": "h4", "title": "Titre 4" },
131+
{ "block": "mark", "title": "Mise en évidence" },
132+
{ "block": "blockquote", "title": "Citation" }
133+
]
134+
}
135+
</value>
136+
</record>
171137

172138
</registry>

0 commit comments

Comments
 (0)