@eeacms/volto-eea-website-theme 1.6.3 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -10
- package/package.json +2 -2
- package/src/components/manage/Blocks/Title/View.jsx +16 -8
- package/src/config.js +3 -0
- package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderSearchPopUp.js +1 -1
- package/src/customizations/volto/components/manage/Sidebar/ObjectBrowserNav.jsx +12 -2
- package/src/customizations/volto/components/theme/View/EventView.jsx +10 -13
- package/src/customizations/volto/components/theme/View/style.less +17 -0
- package/src/icons/content-box-src.svg +36 -0
- package/src/icons/content-box.svg +12 -3
- package/src/icons/light-src.svg +22 -0
- package/src/icons/light.svg +5 -0
- package/src/icons/small-src.svg +22 -0
- package/src/icons/small.svg +5 -0
- package/src/index.js +119 -9
package/CHANGELOG.md
CHANGED
@@ -4,10 +4,40 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
4
4
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
6
6
|
|
7
|
+
### [1.7.0](https://github.com/eea/volto-eea-website-theme/compare/1.6.4...1.7.0) - 7 February 2023
|
8
|
+
|
9
|
+
#### :rocket: New Features
|
10
|
+
|
11
|
+
- feat(slate): Remove blockquote, italic, strikethrough slate button from expandedToolbarButtons - refs #160747 [Alin Voinea - [`c5a2684`](https://github.com/eea/volto-eea-website-theme/commit/c5a268428737374802a02c69fd6d24ddc5a8d3d3)]
|
12
|
+
- feat(slate): Remove 'underline' and 'italic' hotkeys - refs #160747 [Alin Voinea - [`82b6404`](https://github.com/eea/volto-eea-website-theme/commit/82b6404b044cc15f3612cee36c0ddef5973dfeeb)]
|
13
|
+
- feat(slate-buttons): Remove Italic, Strikethrough; Add Light, small - refs #160747 [Alin Voinea - [`7a78b42`](https://github.com/eea/volto-eea-website-theme/commit/7a78b42cf2158daa4a7d7ecc3f64611d4321147d)]
|
14
|
+
|
15
|
+
#### :nail_care: Enhancements
|
16
|
+
|
17
|
+
- change(object-browser): Use scale for img in obj browser and preview in popup #95 from eea/image_preview_object_browser [ichim-david - [`ac8f233`](https://github.com/eea/volto-eea-website-theme/commit/ac8f2333f46de737ccad5e10531f4deedc24c57f)]
|
18
|
+
- change(header): Add link in search popup to the search landing page #94 from eea/search-popup [ichim-david - [`fe7aab9`](https://github.com/eea/volto-eea-website-theme/commit/fe7aab90fc51dbb3aa4fb961470fe9bd73938314)]
|
19
|
+
- refactor(styleMenu): remove bordered styles #93 from eea/remove-bordered-styles [ichim-david - [`24bab89`](https://github.com/eea/volto-eea-website-theme/commit/24bab8912831e0b0ee30d8508400359c2f26893f)]
|
20
|
+
- change(header): Add link in search popup to the landing page [kreafox - [`d1e97df`](https://github.com/eea/volto-eea-website-theme/commit/d1e97df9766ef43d34c09c7c993123edf4dc0e0a)]
|
21
|
+
- change(header): Add link in search popup to the landing page [kreafox - [`9a8ec3a`](https://github.com/eea/volto-eea-website-theme/commit/9a8ec3aff4f37c562d6e377b9d4c2a48fc5c451a)]
|
22
|
+
- refactor(styleMenu): remove bordered styles [nileshgulia1 - [`97a7079`](https://github.com/eea/volto-eea-website-theme/commit/97a707934343cde875a59f33751d2c61267ddf7d)]
|
23
|
+
- refactor(config): Move some common settings from volto-eea-website-policy - refs #160747 [Alin Voinea - [`a40b6a3`](https://github.com/eea/volto-eea-website-theme/commit/a40b6a3719140a9be343e7d1aeca3d7098f3b1be)]
|
24
|
+
- change(theme widget): the first value is no value [ichim-david - [`12b8a5a`](https://github.com/eea/volto-eea-website-theme/commit/12b8a5ada013d7f28c89b596e2675e8cb0bfbb5e)]
|
25
|
+
|
26
|
+
#### :hammer_and_wrench: Others
|
27
|
+
|
28
|
+
- Release 1.7.0 [Alin Voinea - [`065c0d0`](https://github.com/eea/volto-eea-website-theme/commit/065c0d05cb43458463e3ca293bd51b32d2e89f34)]
|
29
|
+
- Use scale for img in obj browser and preview in popup [andreiggr - [`e78e21d`](https://github.com/eea/volto-eea-website-theme/commit/e78e21d0b35d69242833914ff41455f24d31927b)]
|
30
|
+
### [1.6.4](https://github.com/eea/volto-eea-website-theme/compare/1.6.3...1.6.4) - 31 January 2023
|
31
|
+
|
32
|
+
#### :bug: Bug Fixes
|
33
|
+
|
34
|
+
- fix(diff): Fix history diff - refs #159677 [Alin Voinea - [`0188cf4`](https://github.com/eea/volto-eea-website-theme/commit/0188cf4e40ee314920f9ba33423d409a39f21cae)]
|
35
|
+
|
7
36
|
### [1.6.3](https://github.com/eea/volto-eea-website-theme/compare/1.6.2...1.6.3) - 30 January 2023
|
8
37
|
|
9
38
|
#### :nail_care: Enhancements
|
10
39
|
|
40
|
+
- change(menu): use nav title if found for menu items #90 from eea/develop [ichim-david - [`f5ff1a1`](https://github.com/eea/volto-eea-website-theme/commit/f5ff1a1b017a515f997455ef564e4562e73e587a)]
|
11
41
|
- change(menu): use nav title if found for menu items otherwise fallback to normal item title [David Ichim - [`77fd15a`](https://github.com/eea/volto-eea-website-theme/commit/77fd15aadec86831f6192ae86b4291fd903e1b1a)]
|
12
42
|
|
13
43
|
### [1.6.2](https://github.com/eea/volto-eea-website-theme/compare/1.6.1...1.6.2) - 27 January 2023
|
@@ -43,7 +73,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
43
73
|
|
44
74
|
- For some reasons types is a string [Alin Voinea - [`3769a09`](https://github.com/eea/volto-eea-website-theme/commit/3769a0981181d5b633f3498daebbe96be8b4b833)]
|
45
75
|
- Fix(redirect): o.filter - refs #157627 [Alin Voinea - [`deb23da`](https://github.com/eea/volto-eea-website-theme/commit/deb23da846444cc96539697fd798429ae0abe89e)]
|
46
|
-
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`f1fffc5`](https://github.com/eea/volto-eea-website-theme/commit/f1fffc5db96725440863d545580b4e76cce4b796)]
|
47
76
|
### [1.5.0](https://github.com/eea/volto-eea-website-theme/compare/1.4.2...1.5.0) - 9 January 2023
|
48
77
|
|
49
78
|
#### :hammer_and_wrench: Others
|
@@ -77,7 +106,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
77
106
|
|
78
107
|
- Release 1.4.0 [Alin Voinea - [`bd42a0d`](https://github.com/eea/volto-eea-website-theme/commit/bd42a0d26e928cac5d99933194755da3db06b341)]
|
79
108
|
- bump version to use as volto-eea-design-system [David Ichim - [`f4be047`](https://github.com/eea/volto-eea-website-theme/commit/f4be047328b46399b03b612d378b18aaf82e7dc1)]
|
80
|
-
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`9b7cfef`](https://github.com/eea/volto-eea-website-theme/commit/9b7cfefb4d34fc1c948015e491feb370f9795bd8)]
|
81
109
|
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`df252a9`](https://github.com/eea/volto-eea-website-theme/commit/df252a9bfed0bb86cadf53c59dd1603b1e2cd822)]
|
82
110
|
### [1.3.2](https://github.com/eea/volto-eea-website-theme/compare/1.3.1...1.3.2) - 16 December 2022
|
83
111
|
|
@@ -87,7 +115,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
87
115
|
|
88
116
|
#### :hammer_and_wrench: Others
|
89
117
|
|
90
|
-
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`a43c658`](https://github.com/eea/volto-eea-website-theme/commit/a43c658a7920c8df95e763b9a637f38ce77eba2c)]
|
91
118
|
- Better razzle.config [Tiberiu Ichim - [`81dbf48`](https://github.com/eea/volto-eea-website-theme/commit/81dbf48815fb27facb4f82c9b764540fdf188b2e)]
|
92
119
|
- Better razzle.config [Tiberiu Ichim - [`7bc9da2`](https://github.com/eea/volto-eea-website-theme/commit/7bc9da2cd837ab62a95cd29979cdd9b0055b7d67)]
|
93
120
|
### [1.3.1](https://github.com/eea/volto-eea-website-theme/compare/1.3.0...1.3.1) - 28 November 2022
|
@@ -96,9 +123,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
96
123
|
|
97
124
|
- feat(Footer): Bring back footer contacts extra actions - refs #151856 [Alin Voinea - [`6c19413`](https://github.com/eea/volto-eea-website-theme/commit/6c194139420c9fd847692d180db1c1593e2483de)]
|
98
125
|
|
99
|
-
#### :hammer_and_wrench: Others
|
100
|
-
|
101
|
-
- yarn 3 [Alin Voinea - [`ea7a709`](https://github.com/eea/volto-eea-website-theme/commit/ea7a7094945312776e9b6f44e371178603e92139)]
|
102
126
|
### [1.3.0](https://github.com/eea/volto-eea-website-theme/compare/1.2.0...1.3.0) - 22 November 2022
|
103
127
|
|
104
128
|
#### :rocket: New Features
|
@@ -139,7 +163,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
139
163
|
- Add subsite class to body [Tiberiu Ichim - [`74d700f`](https://github.com/eea/volto-eea-website-theme/commit/74d700fbfd6249a8604762a7e4e49cce857db0f3)]
|
140
164
|
- Add subsite info to header [Tiberiu Ichim - [`47daf8b`](https://github.com/eea/volto-eea-website-theme/commit/47daf8bb6374a1222040626b19d4154df7ba1b83)]
|
141
165
|
- fix eslint [Miu Razvan - [`eb8d0a7`](https://github.com/eea/volto-eea-website-theme/commit/eb8d0a790bc70c0aae256c6ff35f63c4885f338e)]
|
142
|
-
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`cc578a4`](https://github.com/eea/volto-eea-website-theme/commit/cc578a413b205a8e61e091fab3a88f94cedefc89)]
|
143
166
|
### [1.1.0](https://github.com/eea/volto-eea-website-theme/compare/1.0.0...1.1.0) - 28 October 2022
|
144
167
|
|
145
168
|
#### :nail_care: Enhancements
|
@@ -187,7 +210,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
187
210
|
|
188
211
|
#### :hammer_and_wrench: Others
|
189
212
|
|
190
|
-
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
|
191
213
|
### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022
|
192
214
|
|
193
215
|
#### :hammer_and_wrench: Others
|
@@ -455,7 +477,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
455
477
|
- Header refactor, add custom logo #5 [ichim-david - [`4950235`](https://github.com/eea/volto-eea-website-theme/commit/49502358105437cfeac3b144e6d301cb59aa2346)]
|
456
478
|
- Update footer.config with new publication card component [ichim-david - [`2e38e9a`](https://github.com/eea/volto-eea-website-theme/commit/2e38e9a417f835009d60c80d4eb4b30229f55e45)]
|
457
479
|
- feature(breadcrumbs): implement eea-design-system breadcrumb as Volto component #32 #7 [ichim-david - [`181af41`](https://github.com/eea/volto-eea-website-theme/commit/181af4125ce2b9ddac56dab4723cb11c26633221)]
|
458
|
-
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`da8ceb6`](https://github.com/eea/volto-eea-website-theme/commit/da8ceb68ea68bfbc9504e48ccd4d68277f11ab9a)]
|
459
480
|
- use breadcrumbs from eea-design-system [nileshgulia1 - [`db2f9e9`](https://github.com/eea/volto-eea-website-theme/commit/db2f9e9a4327420a3cce9a9903cd88549b129eab)]
|
460
481
|
- Update theme.config [ichim-david - [`8eca4f4`](https://github.com/eea/volto-eea-website-theme/commit/8eca4f40397a4aeca6d39029c92db78968d37064)]
|
461
482
|
- Added keyContent component to theme.config [ichim-david - [`d86f202`](https://github.com/eea/volto-eea-website-theme/commit/d86f202d0274d839487a88b51cae9a0e899beb23)]
|
@@ -497,5 +518,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
497
518
|
|
498
519
|
#### :hammer_and_wrench: Others
|
499
520
|
|
500
|
-
- yarn bootstrap [Alin Voinea - [`6995e9e`](https://github.com/eea/volto-eea-website-theme/commit/6995e9e091f21fdbbdffa8a44fc0e2c626f6d46a)]
|
501
521
|
- Initial commit [Alin Voinea - [`6a9c03a`](https://github.com/eea/volto-eea-website-theme/commit/6a9c03a7cebe71ca87e82cf58c42904063e9d8d3)]
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@eeacms/volto-eea-website-theme",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.7.0",
|
4
4
|
"description": "@eeacms/volto-eea-website-theme: Volto add-on",
|
5
5
|
"main": "src/index.js",
|
6
6
|
"author": "European Environment Agency: IDM2 A-Team",
|
@@ -22,7 +22,7 @@
|
|
22
22
|
"url": "git@github.com:eea/volto-eea-website-theme.git"
|
23
23
|
},
|
24
24
|
"dependencies": {
|
25
|
-
"@eeacms/volto-eea-design-system": "^1.0.0-alpha.
|
25
|
+
"@eeacms/volto-eea-design-system": "^1.0.0-alpha.15",
|
26
26
|
"volto-subsites": "*"
|
27
27
|
},
|
28
28
|
"devDependencies": {
|
@@ -9,19 +9,27 @@ import PropTypes from 'prop-types';
|
|
9
9
|
|
10
10
|
import BannerView from '@eeacms/volto-eea-website-theme/components/theme/Banner/View';
|
11
11
|
|
12
|
+
function IsomorphicPortal({ children }) {
|
13
|
+
const [isClient, setIsClient] = React.useState();
|
14
|
+
React.useEffect(() => setIsClient(true), []);
|
15
|
+
|
16
|
+
return isClient ? (
|
17
|
+
<Portal node={document.getElementById('page-header')}>{children}</Portal>
|
18
|
+
) : (
|
19
|
+
children
|
20
|
+
);
|
21
|
+
}
|
22
|
+
|
12
23
|
/**
|
13
24
|
* View title block class.
|
14
25
|
* @class View
|
15
26
|
* @extends Component
|
16
27
|
*/
|
17
|
-
const View = (props) =>
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
</Portal>
|
23
|
-
);
|
24
|
-
};
|
28
|
+
const View = (props) => (
|
29
|
+
<IsomorphicPortal>
|
30
|
+
<BannerView {...props} />
|
31
|
+
</IsomorphicPortal>
|
32
|
+
);
|
25
33
|
|
26
34
|
/**
|
27
35
|
* Property types.
|
package/src/config.js
CHANGED
@@ -259,6 +259,9 @@ export const headerSearchBox = [
|
|
259
259
|
isDefault: true,
|
260
260
|
path: '/en/advanced-search',
|
261
261
|
placeholder: 'Search...',
|
262
|
+
description:
|
263
|
+
'Looking for more information? Try searching the full EEA website content',
|
264
|
+
buttonTitle: 'Go to full site search',
|
262
265
|
},
|
263
266
|
{
|
264
267
|
path: '/en/datahub',
|
@@ -74,7 +74,17 @@ const ObjectBrowserNav = ({
|
|
74
74
|
key={item['@id']}
|
75
75
|
content={
|
76
76
|
<>
|
77
|
-
|
77
|
+
{item['@type'] === 'Image' && (
|
78
|
+
<Image
|
79
|
+
style={{
|
80
|
+
marginLeft: 'auto',
|
81
|
+
marginRight: 'auto',
|
82
|
+
marginBottom: '5px',
|
83
|
+
}}
|
84
|
+
src={`${item?.getURL}/@@images/image/mini`}
|
85
|
+
/>
|
86
|
+
)}
|
87
|
+
<Icon name={homeSVG} size="18px" />
|
78
88
|
{flattenToAppURL(item['@id'])} ( {item['@type']})
|
79
89
|
</>
|
80
90
|
}
|
@@ -82,7 +92,7 @@ const ObjectBrowserNav = ({
|
|
82
92
|
<span>
|
83
93
|
{item['@type'] === 'Image' ? (
|
84
94
|
<Image
|
85
|
-
src={`${item?.getURL}/@@images/image`}
|
95
|
+
src={`${item?.getURL}/@@images/image/icon`}
|
86
96
|
style={{
|
87
97
|
marginRight: '10px',
|
88
98
|
maxHeight: '24px',
|
@@ -6,9 +6,10 @@
|
|
6
6
|
import React from 'react';
|
7
7
|
import PropTypes from 'prop-types';
|
8
8
|
import { hasBlocksData, flattenHTMLToAppURL } from '@plone/volto/helpers';
|
9
|
-
import { Image
|
9
|
+
import { Image } from 'semantic-ui-react';
|
10
10
|
import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
|
11
11
|
import { EventDetails } from '@plone/volto/components';
|
12
|
+
import './style.less';
|
12
13
|
|
13
14
|
const EventTextfieldView = ({ content }) => (
|
14
15
|
<React.Fragment>
|
@@ -44,18 +45,14 @@ const EventView = (props) => {
|
|
44
45
|
|
45
46
|
return (
|
46
47
|
<div id="page-document" className="ui container viewwrapper event-view">
|
47
|
-
<
|
48
|
-
<
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
<Grid.Column mobile={12} tablet={5} computer={5}>
|
56
|
-
<EventDetails content={content} />
|
57
|
-
</Grid.Column>
|
58
|
-
</Grid>
|
48
|
+
<div className="event-view-box">
|
49
|
+
<EventDetails content={content} />
|
50
|
+
</div>
|
51
|
+
{hasBlocksData(content) ? (
|
52
|
+
<RenderBlocks {...props} />
|
53
|
+
) : (
|
54
|
+
<EventTextfieldView {...props} />
|
55
|
+
)}
|
59
56
|
</div>
|
60
57
|
);
|
61
58
|
};
|
@@ -0,0 +1,17 @@
|
|
1
|
+
@type: 'extra';
|
2
|
+
@element: 'custom';
|
3
|
+
|
4
|
+
@import (multiple, reference, optional) '../../theme.config';
|
5
|
+
|
6
|
+
.event-view-box {
|
7
|
+
position: relative;
|
8
|
+
top: -5vh;
|
9
|
+
right: 0vw;
|
10
|
+
}
|
11
|
+
|
12
|
+
@media only screen and (max-width: @largestMobileScreen) {
|
13
|
+
.event-view-box aside {
|
14
|
+
margin-left: 0 !important;
|
15
|
+
float: none !important;
|
16
|
+
}
|
17
|
+
}
|
@@ -0,0 +1,36 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
2
|
+
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
3
|
+
|
4
|
+
<svg
|
5
|
+
width="90mm"
|
6
|
+
height="90mm"
|
7
|
+
version="1.1"
|
8
|
+
viewBox="0 0 90 90"
|
9
|
+
id="svg8"
|
10
|
+
xmlns="http://www.w3.org/2000/svg"
|
11
|
+
xmlns:svg="http://www.w3.org/2000/svg">
|
12
|
+
<defs
|
13
|
+
id="defs12" />
|
14
|
+
<text
|
15
|
+
x="44.72715"
|
16
|
+
y="38.463978"
|
17
|
+
fill="#000000"
|
18
|
+
font-family="sans-serif"
|
19
|
+
font-size="16.933px"
|
20
|
+
letter-spacing="0px"
|
21
|
+
stroke-width=".26458"
|
22
|
+
text-align="center"
|
23
|
+
text-anchor="middle"
|
24
|
+
word-spacing="0px"
|
25
|
+
style="line-height:1.5"
|
26
|
+
xml:space="preserve"
|
27
|
+
id="text6"><tspan
|
28
|
+
x="44.72715"
|
29
|
+
y="38.463978"
|
30
|
+
text-align="center"
|
31
|
+
id="tspan2">Content</tspan><tspan
|
32
|
+
x="44.72715"
|
33
|
+
y="63.863926"
|
34
|
+
text-align="center"
|
35
|
+
id="tspan4">Box</tspan></text>
|
36
|
+
</svg>
|
@@ -1,5 +1,14 @@
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
-
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
3
1
|
<svg width="90mm" height="90mm" version="1.1" viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg">
|
4
|
-
<
|
2
|
+
<g stroke-width=".26458" aria-label="ContentBox">
|
3
|
+
<path d="m21.961 27.071v1.7611q-0.84334-0.78547-1.8024-1.1741-0.95083-0.3886-2.0257-0.3886-2.1166 0-3.2411 1.2981-1.1245 1.2898-1.1245 3.7372 0 2.4391 1.1245 3.7372 1.1245 1.2898 3.2411 1.2898 1.0748 0 2.0257-0.3886 0.9591-0.3886 1.8024-1.1741v1.7446q-0.87642 0.5953-1.8603 0.89295-0.97563 0.29765-2.067 0.29765-2.8029 0-4.4151-1.7115-1.6123-1.7198-1.6123-4.688 0-2.9765 1.6123-4.688 1.6123-1.7198 4.4151-1.7198 1.1079 0 2.0836 0.29765 0.9839 0.28938 1.8438 0.87642z"/>
|
4
|
+
<path d="m28.063 30.27q-1.2237 0-1.9347 0.9591-0.71105 0.95083-0.71105 2.6127 0 1.6619 0.70278 2.621 0.71105 0.95083 1.943 0.95083 1.2154 0 1.9265-0.9591 0.71105-0.9591 0.71105-2.6127 0-1.6453-0.71105-2.6044-0.71105-0.96736-1.9265-0.96736zm0-1.2898q1.9843 0 3.1171 1.2898 1.1327 1.2898 1.1327 3.5718 0 2.2737-1.1327 3.5718-1.1327 1.2898-3.1171 1.2898-1.9926 0-3.1253-1.2898-1.1245-1.2981-1.1245-3.5718 0-2.282 1.1245-3.5718 1.1327-1.2898 3.1253-1.2898z"/>
|
5
|
+
<path d="m42.532 32.875v5.5892h-1.5213v-5.5396q0-1.3146-0.51262-1.9678-0.51262-0.65318-1.5379-0.65318-1.2319 0-1.943 0.78547-0.71105 0.78547-0.71105 2.1414v5.2337h-1.5296v-9.2602h1.5296v1.4386q0.54569-0.83508 1.2816-1.2485 0.74413-0.4134 1.7115-0.4134 1.5957 0 2.4143 0.99217 0.81854 0.9839 0.81854 2.9021z"/>
|
6
|
+
<path d="m47.071 26.574v2.6292h3.1336v1.1823h-3.1336v5.027q0 1.1327 0.30592 1.4552 0.31419 0.32246 1.265 0.32246h1.5627v1.2733h-1.5627q-1.7611 0-2.4308-0.65318-0.66971-0.66145-0.66971-2.3977v-5.027h-1.1162v-1.1823h1.1162v-2.6292z"/>
|
7
|
+
<path d="m60.126 33.454v0.74413h-6.9948q0.09922 1.5709 0.94256 2.3977 0.85161 0.81854 2.3647 0.81854 0.87642 0 1.695-0.21497 0.82681-0.21497 1.6371-0.64491v1.4386q-0.81854 0.34726-1.6784 0.52916-0.85988 0.1819-1.7446 0.1819-2.2158 0-3.5139-1.2898-1.2898-1.2898-1.2898-3.4891 0-2.2737 1.2237-3.6049 1.2319-1.3394 3.3155-1.3394 1.8686 0 2.9517 1.2071 1.0914 1.1989 1.0914 3.2659zm-1.5213-0.44648q-0.01654-1.2485-0.70279-1.9926-0.67798-0.74413-1.8024-0.74413-1.2733 0-2.0422 0.71932-0.76066 0.71932-0.87642 2.0257z"/>
|
8
|
+
<path d="m70.321 32.875v5.5892h-1.5213v-5.5396q0-1.3146-0.51262-1.9678-0.51262-0.65318-1.5379-0.65318-1.2319 0-1.943 0.78547-0.71105 0.78547-0.71105 2.1414v5.2337h-1.5296v-9.2602h1.5296v1.4386q0.54569-0.83508 1.2816-1.2485 0.74413-0.4134 1.7115-0.4134 1.5957 0 2.4143 0.99217 0.81854 0.9839 0.81854 2.9021z"/>
|
9
|
+
<path d="m74.86 26.574v2.6292h3.1336v1.1823h-3.1336v5.027q0 1.1327 0.30592 1.4552 0.31419 0.32246 1.265 0.32246h1.5627v1.2733h-1.5627q-1.7611 0-2.4308-0.65318-0.66971-0.66145-0.66971-2.3977v-5.027h-1.1162v-1.1823h1.1162v-2.6292z"/>
|
10
|
+
<path d="m32.321 57.969v4.5226h2.6789q1.3477 0 1.9926-0.55396 0.65318-0.56223 0.65318-1.7115 0-1.1575-0.65318-1.7032-0.64491-0.55396-1.9926-0.55396zm0-5.0766v3.7206h2.4722q1.2237 0 1.819-0.45474 0.60357-0.46301 0.60357-1.4056 0-0.93429-0.60357-1.3973-0.5953-0.46301-1.819-0.46301zm-1.6702-1.3725h4.2663q1.9099 0 2.9434 0.79374 1.0335 0.79373 1.0335 2.2572 0 1.1327-0.52916 1.8024-0.52916 0.66971-1.5544 0.83507 1.2319 0.26458 1.9099 1.1079 0.68625 0.83508 0.68625 2.0918 0 1.6536-1.1245 2.5548-1.1245 0.90122-3.1997 0.90122h-4.4317z"/>
|
11
|
+
<path d="m45.79 55.67q-1.2237 0-1.9347 0.9591-0.71105 0.95083-0.71105 2.6127 0 1.6619 0.70279 2.621 0.71105 0.95083 1.943 0.95083 1.2154 0 1.9265-0.9591 0.71105-0.9591 0.71105-2.6127 0-1.6453-0.71105-2.6044-0.71105-0.96736-1.9265-0.96736zm0-1.2898q1.9843 0 3.1171 1.2898 1.1327 1.2898 1.1327 3.5718 0 2.2737-1.1327 3.5718-1.1327 1.2898-3.1171 1.2898-1.9926 0-3.1253-1.2898-1.1245-1.2981-1.1245-3.5718 0-2.282 1.1245-3.5718 1.1327-1.2898 3.1253-1.2898z"/>
|
12
|
+
<path d="m59.738 54.604-3.3486 4.5061 3.5222 4.7541h-1.7942l-2.6954-3.6379-2.6954 3.6379h-1.7942l3.5966-4.8451-3.2907-4.4151h1.7942l2.4556 3.299 2.4556-3.299z"/>
|
13
|
+
</g>
|
5
14
|
</svg>
|
@@ -0,0 +1,22 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
2
|
+
<svg
|
3
|
+
width="36"
|
4
|
+
height="36"
|
5
|
+
viewBox="0 0 36 36"
|
6
|
+
version="1.1"
|
7
|
+
id="svg4"
|
8
|
+
xmlns="http://www.w3.org/2000/svg"
|
9
|
+
xmlns:svg="http://www.w3.org/2000/svg">
|
10
|
+
<defs
|
11
|
+
id="defs8" />
|
12
|
+
<text
|
13
|
+
xml:space="preserve"
|
14
|
+
style="font-size:42.6667px;line-height:1.25;font-family:'Serto Urhoy';-inkscape-font-specification:'Serto Urhoy';letter-spacing:0px;word-spacing:0px"
|
15
|
+
x="5.9687409"
|
16
|
+
y="30.979166"
|
17
|
+
id="text349"><tspan
|
18
|
+
id="tspan347"
|
19
|
+
x="5.9687409"
|
20
|
+
y="30.979166"
|
21
|
+
style="font-size:42.6667px">L</tspan></text>
|
22
|
+
</svg>
|
@@ -0,0 +1,5 @@
|
|
1
|
+
<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
|
2
|
+
<g aria-label="L">
|
3
|
+
<path d="m26.906 30.979-16.646 0.02083q-1.1667 0-1.1667-0.875 0-0.89583 1.1667-0.89583h1.4792l0.02083-20.875h-1.4792q-1.1667 0-1.1667-0.89583 0-0.875 1.1042-0.875h4.8333q1.1042 0 1.1042 0.875 0 0.89583-1.1667 0.89583h-1.4792v20.875h11.646l-0.02083-1.4792q0-1.1667 0.89583-1.1667 0.875 0 0.875 1.1042z"/>
|
4
|
+
</g>
|
5
|
+
</svg>
|
@@ -0,0 +1,22 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
2
|
+
<svg
|
3
|
+
width="36"
|
4
|
+
height="36"
|
5
|
+
viewBox="0 0 36 36"
|
6
|
+
version="1.1"
|
7
|
+
id="svg4"
|
8
|
+
xmlns="http://www.w3.org/2000/svg"
|
9
|
+
xmlns:svg="http://www.w3.org/2000/svg">
|
10
|
+
<defs
|
11
|
+
id="defs8" />
|
12
|
+
<text
|
13
|
+
xml:space="preserve"
|
14
|
+
style="font-size:42.6667px;line-height:1.25;font-family:'Serto Urhoy';-inkscape-font-specification:'Serto Urhoy';letter-spacing:0px;word-spacing:0px"
|
15
|
+
x="5.9687409"
|
16
|
+
y="30.979166"
|
17
|
+
id="text349"><tspan
|
18
|
+
id="tspan347"
|
19
|
+
x="5.9687409"
|
20
|
+
y="30.979166"
|
21
|
+
style="font-size:42.6667px">s</tspan></text>
|
22
|
+
</svg>
|
@@ -0,0 +1,5 @@
|
|
1
|
+
<svg width="36" height="36" version="1.1" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
|
2
|
+
<g aria-label="s">
|
3
|
+
<path d="m24.427 26.5q0 2.625-2.625 4.0208-2.125 1.125-5 1.125-3.75 0-6.125-1.8958 0.0625 1.2917-0.79167 1.2917-0.79167 0-0.79167-1.0625v-3.25q0-1.0625 0.79167-1.0625 0.58333 0 0.83333 0.91667 0.35417 1.3125 0.39583 1.3958 1.375 2.1042 5.625 2.1042 2.1667 0 3.875-0.75 2.2292-0.95833 2.2292-2.8333 0-2.2708-3.3542-3.0417-3.125-0.5625-6.2292-1.125-3.3542-0.95833-3.3542-3.7292 0-2.25 2.375-3.4583 1.8958-0.95833 4.375-0.95833 3.2708 0 5.3125 1.6042-0.0625-1.0417 0.79167-1.0417 0.8125 0 0.8125 1.0625v2.7083q0 1.0625-0.8125 1.0625-0.52083 0-0.8125-0.95833-0.35417-1.2083-1.1458-1.7917-1.4167-1.0417-4.0833-1.0417-1.7708 0-3.25 0.58333-1.9583 0.79167-1.9583 2.2917 0 1.6667 2.4375 2.2708l5.125 0.83333q3.2083 0.625 4.4583 2.2083 0.89583 1.1458 0.89583 2.5208z"/>
|
4
|
+
</g>
|
5
|
+
</svg>
|
package/src/index.js
CHANGED
@@ -8,8 +8,12 @@ import SubsiteClass from './components/theme/SubsiteClass';
|
|
8
8
|
import HomePageView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageView';
|
9
9
|
import HomePageInverseView from '@eeacms/volto-eea-website-theme/components/theme/Homepage/HomePageInverseView';
|
10
10
|
import { Icon } from '@plone/volto/components';
|
11
|
+
import { MarkElementButton } from '@plone/volto-slate/editor/ui';
|
12
|
+
import installCallout from '@plone/volto-slate/editor/plugins/Callout';
|
11
13
|
import paintSVG from '@plone/volto/icons/paint.svg';
|
12
14
|
import contentBoxSVG from './icons/content-box.svg';
|
15
|
+
import lightIcon from './icons/light.svg';
|
16
|
+
import smallIcon from './icons/small.svg';
|
13
17
|
import voltoCustomMiddleware from './middleware/voltoCustom';
|
14
18
|
import { List } from 'semantic-ui-react';
|
15
19
|
|
@@ -20,6 +24,24 @@ const applyConfig = (config) => {
|
|
20
24
|
...(config.settings.eea || {}),
|
21
25
|
};
|
22
26
|
|
27
|
+
// Insert scripts on Error pages
|
28
|
+
if (config.settings?.serverConfig?.extractScripts) {
|
29
|
+
config.settings.serverConfig.extractScripts.errorPages = true;
|
30
|
+
}
|
31
|
+
|
32
|
+
// Disable tags on View
|
33
|
+
config.settings.showTags = false;
|
34
|
+
|
35
|
+
// Enable Title block
|
36
|
+
config.blocks.blocksConfig.title.restricted = false;
|
37
|
+
|
38
|
+
// Enable description block (also for cypress)
|
39
|
+
config.blocks.blocksConfig.description.restricted = false;
|
40
|
+
config.blocks.requiredBlocks = [];
|
41
|
+
|
42
|
+
// Date format for EU
|
43
|
+
config.settings.dateLocale = 'en-gb';
|
44
|
+
|
23
45
|
// Custom Homepage layouts
|
24
46
|
config.views.layoutViews = {
|
25
47
|
...(config.views.layoutViews || {}),
|
@@ -31,6 +53,7 @@ const applyConfig = (config) => {
|
|
31
53
|
homepage_view: 'Homepage view',
|
32
54
|
homepage_inverse_view: 'Homepage white view',
|
33
55
|
};
|
56
|
+
|
34
57
|
// Apply accordion block customization
|
35
58
|
if (config.blocks.blocksConfig.accordion) {
|
36
59
|
config.blocks.blocksConfig.accordion.semanticIcon = 'ri-arrow-down-s-line';
|
@@ -89,6 +112,99 @@ const applyConfig = (config) => {
|
|
89
112
|
];
|
90
113
|
|
91
114
|
if (config.settings.slate) {
|
115
|
+
// Callout slate button
|
116
|
+
config = installCallout(config);
|
117
|
+
|
118
|
+
// Remove blockquote, italic, strikethrough slate button from toolbarButtons
|
119
|
+
config.settings.slate.toolbarButtons = config.settings.slate.toolbarButtons.filter(
|
120
|
+
(item) => !['blockquote', 'italic', 'strikethrough'].includes(item),
|
121
|
+
);
|
122
|
+
|
123
|
+
// Remove blockquote, italic, strikethrough slate button from expandedToolbarButtons
|
124
|
+
config.settings.slate.expandedToolbarButtons = config.settings.slate.expandedToolbarButtons.filter(
|
125
|
+
(item) => !['blockquote', 'italic', 'strikethrough'].includes(item),
|
126
|
+
);
|
127
|
+
|
128
|
+
// Remove 'underline' and 'italic' hotkeys
|
129
|
+
config.settings.slate.hotkeys = Object.keys(config.settings.slate.hotkeys)
|
130
|
+
.filter((item) => !['mod+u', 'mod+i'].includes(item))
|
131
|
+
.reduce((out, key) => {
|
132
|
+
out[key] = config.settings.slate.hotkeys[key];
|
133
|
+
return out;
|
134
|
+
}, {});
|
135
|
+
|
136
|
+
// Small button
|
137
|
+
if (!config.settings.slate.toolbarButtons.includes('small')) {
|
138
|
+
config.settings.slate.elements.small = ({ children }) => (
|
139
|
+
<small>{children}</small>
|
140
|
+
);
|
141
|
+
|
142
|
+
config.settings.slate.buttons.small = (props) => (
|
143
|
+
<MarkElementButton
|
144
|
+
title="Small"
|
145
|
+
format="small"
|
146
|
+
icon={smallIcon}
|
147
|
+
{...props}
|
148
|
+
/>
|
149
|
+
);
|
150
|
+
|
151
|
+
config.settings.slate.inlineElements = [
|
152
|
+
...config.settings.slate.inlineElements,
|
153
|
+
'small',
|
154
|
+
];
|
155
|
+
|
156
|
+
config.settings.slate.toolbarButtons = [
|
157
|
+
...config.settings.slate.toolbarButtons.slice(0, 1),
|
158
|
+
'small',
|
159
|
+
...config.settings.slate.toolbarButtons.slice(1),
|
160
|
+
];
|
161
|
+
|
162
|
+
config.settings.slate.hotkeys['mod+s'] = {
|
163
|
+
format: 'small',
|
164
|
+
type: 'inline',
|
165
|
+
};
|
166
|
+
}
|
167
|
+
|
168
|
+
// Light button
|
169
|
+
if (!config.settings.slate.toolbarButtons.includes('light')) {
|
170
|
+
config.settings.slate.elements.light = ({ children }) => (
|
171
|
+
<span className="fw-light">{children}</span>
|
172
|
+
);
|
173
|
+
|
174
|
+
config.settings.slate.buttons.light = (props) => (
|
175
|
+
<MarkElementButton
|
176
|
+
title="Light"
|
177
|
+
format="light"
|
178
|
+
icon={lightIcon}
|
179
|
+
{...props}
|
180
|
+
/>
|
181
|
+
);
|
182
|
+
|
183
|
+
config.settings.slate.inlineElements = [
|
184
|
+
...config.settings.slate.inlineElements,
|
185
|
+
'light',
|
186
|
+
];
|
187
|
+
|
188
|
+
config.settings.slate.toolbarButtons = [
|
189
|
+
...config.settings.slate.toolbarButtons.slice(0, 1),
|
190
|
+
'light',
|
191
|
+
...config.settings.slate.toolbarButtons.slice(1),
|
192
|
+
];
|
193
|
+
|
194
|
+
config.settings.slate.hotkeys['mod+l'] = {
|
195
|
+
format: 'light',
|
196
|
+
type: 'inline',
|
197
|
+
};
|
198
|
+
}
|
199
|
+
|
200
|
+
// Clear formatting
|
201
|
+
if (!config.settings.slate.toolbarButtons.includes('clearformatting')) {
|
202
|
+
config.settings.slate.toolbarButtons = [
|
203
|
+
...config.settings.slate.toolbarButtons,
|
204
|
+
'clearformatting',
|
205
|
+
];
|
206
|
+
}
|
207
|
+
|
92
208
|
// Align Slate Lists to EEA Design System
|
93
209
|
config.settings.slate.elements.ul = ({ attributes, children }) => (
|
94
210
|
<List bulleted as="ul" {...attributes}>
|
@@ -127,11 +243,6 @@ const applyConfig = (config) => {
|
|
127
243
|
label: 'Tertiary',
|
128
244
|
icon: () => <Icon name={paintSVG} size="18px" />,
|
129
245
|
},
|
130
|
-
{
|
131
|
-
cssClass: 'bordered',
|
132
|
-
label: 'Bordered',
|
133
|
-
icon: () => <Icon name={paintSVG} size="18px" />,
|
134
|
-
},
|
135
246
|
],
|
136
247
|
};
|
137
248
|
}
|
@@ -140,15 +251,14 @@ const applyConfig = (config) => {
|
|
140
251
|
config.settings.available_colors = eea.colors;
|
141
252
|
|
142
253
|
// Site theme colors
|
143
|
-
|
144
254
|
config.settings.themeColors = [
|
145
|
-
{ value:
|
255
|
+
{ value: undefined, title: 'No theme' },
|
146
256
|
{ value: 'primary', title: 'Primary' },
|
147
257
|
{ value: 'secondary', title: 'Secondary' },
|
148
258
|
{ value: 'tertiary', title: 'Tertiary' },
|
149
259
|
];
|
150
260
|
|
151
|
-
// Custom
|
261
|
+
// Custom preset styles - content-box
|
152
262
|
config.settings.previewText = '';
|
153
263
|
config.settings.pluggableStyles = [
|
154
264
|
...(config.settings.pluggableStyles || []),
|
@@ -210,7 +320,7 @@ const applyConfig = (config) => {
|
|
210
320
|
},
|
211
321
|
];
|
212
322
|
|
213
|
-
// Custom blocks
|
323
|
+
// Custom blocks: Title
|
214
324
|
return [installCustomTitle].reduce((acc, apply) => apply(acc), config);
|
215
325
|
};
|
216
326
|
|