Skip to content

Commit 88d79b6

Browse files
iRohitSinghiRohitSingh
committed
Merge branch 'main' into commenting-styling
2 parents c3ea54f + 32c167c commit 88d79b6

14 files changed

Lines changed: 752 additions & 104 deletions

File tree

‎backend/news/470.internal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix broken footer link and update banner block example content @iRohitSingh

‎backend/src/kitconcept/intranet/distributions/intranet/content/content/912873ca2dae4228aa6c87c620a6bd85/data.json‎

Lines changed: 137 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,62 +8,175 @@
88
"02297aa5-fcbc-406e-a368-3a4dcc0d42ed": {
99
"@type": "banner",
1010
"styles": {
11-
"blockWidth:noprefix": "layout"
11+
"blockWidth:noprefix": {
12+
"--block-width": "100%"
13+
}
1214
},
13-
"text": "Test line no. 1",
1415
"theme": "default",
1516
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
1617
},
17-
"619a853d-8f33-4c54-9059-e080aadba1d2": {
18+
"087e3df4-9969-4d28-8f27-e936af49a706": {
19+
"@type": "heading",
20+
"alignment": "left",
21+
"heading": "Banner mit Text, 100% Breite, grauer Hintergrund",
22+
"styles": {},
23+
"tag": "h2",
24+
"theme": "grey"
25+
},
26+
"1bfe6103-1b85-4d5b-9840-c139109de8b0": {
1827
"@type": "banner",
19-
"additionalText": "Test line no. 2 Lorem ipsum is a dummy or placeholder text commonly used in graphic design, publishing, and web development.",
2028
"styles": {
21-
"blockWidth:noprefix": "layout"
29+
"blockWidth:noprefix": "full"
2230
},
23-
"text": "Test line no. 1",
2431
"theme": "default",
25-
"url": "../../../resolveuid/970ec24c76784c66a06d8c8d8b6522b2"
32+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
2633
},
27-
"768df7f7-d4ee-41a3-b798-96304eb58ad2": {
34+
"2fbbba14-6a01-4924-859b-0e55a17c14e5": {
2835
"@type": "heading",
29-
"heading": "Without Titel",
36+
"alignment": "left",
37+
"heading": "Banner ohne Text, Containerbreite, wei\u00dfer Hintergrund",
38+
"styles": {},
3039
"theme": "default"
3140
},
32-
"879e7fd7-ef4b-47dd-a8ae-8b7b72a2255a": {
33-
"@type": "title"
41+
"519eae41-e30c-4992-a06b-bdf92631b78d": {
42+
"@type": "banner",
43+
"styles": {
44+
"blockWidth:noprefix": {
45+
"--block-width": "100%"
46+
}
47+
},
48+
"text": "Text auf dem Banner",
49+
"theme": "grey",
50+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
51+
},
52+
"57c19e50-c32a-4f33-89d5-69655308b28a": {
53+
"@type": "heading",
54+
"alignment": "left",
55+
"heading": "Banner ohne Text, Containerbreite, grauer Hintergrund",
56+
"styles": {},
57+
"tag": "h2",
58+
"theme": "grey"
3459
},
35-
"a7e643a0-6aaa-47f5-8662-1c050f599dc7": {
60+
"583b2adb-a8c8-4dec-ab6d-732451e4c0c9": {
3661
"@type": "banner",
3762
"styles": {
38-
"blockWidth:noprefix": "layout"
63+
"blockWidth:noprefix": {
64+
"--block-width": "var(--layout-container-width)"
65+
}
66+
},
67+
"text": "Text auf dem Banner",
68+
"theme": "grey",
69+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
70+
},
71+
"5f4bd951-7bee-454f-8629-456564166ccd": {
72+
"@type": "banner",
73+
"styles": {
74+
"blockWidth:noprefix": {
75+
"--block-width": "100%"
76+
}
3977
},
78+
"text": "Text auf dem Banner",
4079
"theme": "default",
41-
"url": "../../../resolveuid/da07e218ea5e4c6c8582be7936d4686d"
80+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
81+
},
82+
"63193131-12df-48f7-bea5-c6b68ad6b94c": {
83+
"@type": "banner",
84+
"styles": {
85+
"blockWidth:noprefix": {
86+
"--block-width": "var(--layout-container-width)"
87+
}
88+
},
89+
"text": "Text auf dem Banner",
90+
"theme": "default",
91+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
92+
},
93+
"678f7f8f-22df-4ae3-9eb4-a61b786dba79": {
94+
"@type": "banner",
95+
"styles": {
96+
"blockWidth:noprefix": "layout"
97+
},
98+
"theme": "grey",
99+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
100+
},
101+
"70fcee4c-6c0e-4ba4-9ab5-df85a175080b": {
102+
"@type": "heading",
103+
"alignment": "left",
104+
"heading": "Banner ohne Text, 100% Breite, wei\u00dfer Hintergrund",
105+
"styles": {},
106+
"theme": "default"
42107
},
43-
"b3d29c96-2d84-4ccc-b77c-5ded6bf6f2fd": {
108+
"73fca46c-4c92-44b1-8ce6-f54a071bdb09": {
44109
"@type": "heading",
45110
"alignment": "left",
46-
"heading": "Both Titel",
111+
"heading": "Banner mit Text, Containerbreite, wei\u00dfer Hintergrund",
47112
"styles": {},
48113
"tag": "h2",
49114
"theme": "default"
50115
},
51-
"b818a9e1-835f-4b73-bf01-de0b07a72e99": {
116+
"768df7f7-d4ee-41a3-b798-96304eb58ad2": {
52117
"@type": "heading",
53-
"heading": "With One Titel",
118+
"alignment": "left",
119+
"heading": "Banner mit Text, 100% Breite, wei\u00dfer Hintergrund",
54120
"styles": {},
121+
"tag": "h2",
55122
"theme": "default"
123+
},
124+
"769b4563-95b5-444f-9b1f-5e19130855c9": {
125+
"@type": "banner",
126+
"styles": {
127+
"blockWidth:noprefix": "layout"
128+
},
129+
"theme": "default",
130+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
131+
},
132+
"879e7fd7-ef4b-47dd-a8ae-8b7b72a2255a": {
133+
"@type": "title"
134+
},
135+
"9ca47092-4690-48d4-93fa-2dfc4bd3c261": {
136+
"@type": "heading",
137+
"alignment": "left",
138+
"heading": "Banner mit Text, Containerbreite, grauer Hintergrund",
139+
"styles": {},
140+
"tag": "h2",
141+
"theme": "grey"
142+
},
143+
"d8d9fcfc-39b4-45dd-a060-7ec6f46875d0": {
144+
"@type": "banner",
145+
"styles": {
146+
"blockWidth:noprefix": "full"
147+
},
148+
"theme": "grey",
149+
"url": "../../../resolveuid/895d71d4500b41ecb85e9f4855556325"
150+
},
151+
"fe0c67cc-10b1-45d3-9512-3738503c3ec0": {
152+
"@type": "heading",
153+
"alignment": "left",
154+
"heading": "Banner ohne Text, 100% Breite, grauer Hintergrund",
155+
"styles": {},
156+
"tag": "h2",
157+
"theme": "grey"
56158
}
57159
},
58160
"blocks_layout": {
59161
"items": [
60-
"879e7fd7-ef4b-47dd-a8ae-8b7b72a2255a",
61-
"b818a9e1-835f-4b73-bf01-de0b07a72e99",
62162
"02297aa5-fcbc-406e-a368-3a4dcc0d42ed",
63-
"b3d29c96-2d84-4ccc-b77c-5ded6bf6f2fd",
64-
"619a853d-8f33-4c54-9059-e080aadba1d2",
163+
"879e7fd7-ef4b-47dd-a8ae-8b7b72a2255a",
65164
"768df7f7-d4ee-41a3-b798-96304eb58ad2",
66-
"a7e643a0-6aaa-47f5-8662-1c050f599dc7"
165+
"5f4bd951-7bee-454f-8629-456564166ccd",
166+
"73fca46c-4c92-44b1-8ce6-f54a071bdb09",
167+
"63193131-12df-48f7-bea5-c6b68ad6b94c",
168+
"70fcee4c-6c0e-4ba4-9ab5-df85a175080b",
169+
"1bfe6103-1b85-4d5b-9840-c139109de8b0",
170+
"2fbbba14-6a01-4924-859b-0e55a17c14e5",
171+
"769b4563-95b5-444f-9b1f-5e19130855c9",
172+
"087e3df4-9969-4d28-8f27-e936af49a706",
173+
"519eae41-e30c-4992-a06b-bdf92631b78d",
174+
"9ca47092-4690-48d4-93fa-2dfc4bd3c261",
175+
"583b2adb-a8c8-4dec-ab6d-732451e4c0c9",
176+
"fe0c67cc-10b1-45d3-9512-3738503c3ec0",
177+
"d8d9fcfc-39b4-45dd-a060-7ec6f46875d0",
178+
"57c19e50-c32a-4f33-89d5-69655308b28a",
179+
"678f7f8f-22df-4ae3-9eb4-a61b786dba79"
67180
]
68181
},
69182
"changeNote": "",
@@ -90,7 +203,7 @@
90203
"locked": false,
91204
"stealable": true
92205
},
93-
"modified": "2026-08-04T12:31:08+00:00",
206+
"modified": "2026-08-10T09:35:16+00:00",
94207
"nav_title": null,
95208
"organisational_unit_reference": null,
96209
"preview_caption_link": null,

‎backend/src/kitconcept/intranet/distributions/intranet/content/content/plone_site_root/data.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,11 @@
436436
"@id": "6ffa227c-965d-4eec-b76c-6cf34dc80739",
437437
"href": [
438438
{
439-
"@id": "resolveuid/0eab0d751a0a49b8964e6b4741dce4d6",
440-
"@type": "Person",
441-
"Description": "Lorem ipsum is a dummy or placeholder text",
442-
"Title": "Ralf L\u00f6ber",
443-
"title": "Ralf L\u00f6ber"
439+
"@id": "resolveuid/3a0f24fe528f49eb8273784127ffaf51",
440+
"@type": "News Item",
441+
"Description": "Das ZTS-Institut f\u00fcr Energiesysteme erh\u00e4lt 4,2 Mio. Euro F\u00f6rdermittel im Rahmen von \u201eHorizon Europe\u201c f\u00fcr das Projekt H2SmartGrid. Ziel ist die Integration von gr\u00fcnem Wasserstoff in bestehende Stromnetze.",
442+
"Title": "ZTS erh\u00e4lt EU-F\u00f6rderung f\u00fcr Wasserstoff-Forschungsprojekt",
443+
"title": "ZTS erh\u00e4lt EU-F\u00f6rderung f\u00fcr Wasserstoff-Forschungsprojekt"
444444
}
445445
],
446446
"title": "Link Eins"
@@ -449,11 +449,11 @@
449449
"@id": "0b015842-63a5-42dd-81bc-9c50e75fe856",
450450
"href": [
451451
{
452-
"@id": "resolveuid/6d119c6ea149486da6f90af351e49014",
453-
"@type": "Person",
454-
"Description": "Lorem ipsum is a dummy or placeholder text",
455-
"Title": "Dr. Bernadette Biermann",
456-
"title": "Dr. Bernadette Biermann"
452+
"@id": "resolveuid/6b1c57b5651546eab14fd5e0e1e32aeb",
453+
"@type": "Document",
454+
"Description": "",
455+
"Title": "Bilder",
456+
"title": "Bilder"
457457
}
458458
],
459459
"title": "Link Zwei"
@@ -517,11 +517,11 @@
517517
"@id": "58e6894d-d949-4be1-9e81-4cfbcc8c7ba1",
518518
"href": [
519519
{
520-
"@id": "resolveuid/6fb793fcdcaa47ba81c6226e1ea3267a",
521-
"@type": "Person",
522-
"Description": "Abteilungsleiter III",
523-
"Title": "Bernhard Ehmann",
524-
"title": "Bernhard Ehmann"
520+
"@id": "resolveuid/6e4e9914ff9e4955a1b8b459e743f361",
521+
"@type": "Document",
522+
"Description": "",
523+
"Title": "Personen",
524+
"title": "Personen"
525525
}
526526
],
527527
"title": "Link Vier"

‎backend/src/kitconcept/intranet/distributions/intranet/content/relations.json‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,66 @@
474474
"from_uuid": "6f42321fa6cf4f57969c78a21f92dd79",
475475
"to_uuid": "bd2b39d2745847db82ed197a4eb1effc"
476476
},
477+
{
478+
"from_attribute": "isReferencing",
479+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
480+
"to_uuid": "0e78d2b30abb4d4283068556dc58c9e2"
481+
},
482+
{
483+
"from_attribute": "isReferencing",
484+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
485+
"to_uuid": "1e7262f173a54700a5ca2578506b1bc1"
486+
},
487+
{
488+
"from_attribute": "isReferencing",
489+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
490+
"to_uuid": "239b6e7bb69e4cd79b71be7a4e90a285"
491+
},
492+
{
493+
"from_attribute": "isReferencing",
494+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
495+
"to_uuid": "2c2f8092acfc4f55830b16af13273882"
496+
},
497+
{
498+
"from_attribute": "isReferencing",
499+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
500+
"to_uuid": "3a0f24fe528f49eb8273784127ffaf51"
501+
},
502+
{
503+
"from_attribute": "isReferencing",
504+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
505+
"to_uuid": "575ada43fa3047218a8824890fd3355a"
506+
},
507+
{
508+
"from_attribute": "isReferencing",
509+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
510+
"to_uuid": "66ceae4426a347e19e158f36202c98b5"
511+
},
512+
{
513+
"from_attribute": "isReferencing",
514+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
515+
"to_uuid": "6e4e9914ff9e4955a1b8b459e743f361"
516+
},
517+
{
518+
"from_attribute": "isReferencing",
519+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
520+
"to_uuid": "70e63351448f45968af7bca53f418e6b"
521+
},
522+
{
523+
"from_attribute": "isReferencing",
524+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
525+
"to_uuid": "7fce8b9becbb43d091604ae5b3e84ac0"
526+
},
527+
{
528+
"from_attribute": "isReferencing",
529+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
530+
"to_uuid": "f255cc2bd29849d19428b865f52819d9"
531+
},
532+
{
533+
"from_attribute": "isReferencing",
534+
"from_uuid": "70badbc8275f4952935ab2c3177f72a4",
535+
"to_uuid": "f29a0a79ff974cbab0ea9b016944336a"
536+
},
477537
{
478538
"from_attribute": "isReferencing",
479539
"from_uuid": "77d4a8332ab846648cba950015973f24",
@@ -769,16 +829,6 @@
769829
"from_uuid": "912873ca2dae4228aa6c87c620a6bd85",
770830
"to_uuid": "895d71d4500b41ecb85e9f4855556325"
771831
},
772-
{
773-
"from_attribute": "isReferencing",
774-
"from_uuid": "912873ca2dae4228aa6c87c620a6bd85",
775-
"to_uuid": "970ec24c76784c66a06d8c8d8b6522b2"
776-
},
777-
{
778-
"from_attribute": "isReferencing",
779-
"from_uuid": "912873ca2dae4228aa6c87c620a6bd85",
780-
"to_uuid": "da07e218ea5e4c6c8582be7936d4686d"
781-
},
782832
{
783833
"from_attribute": "preview_image_link",
784834
"from_uuid": "917046c2cd2d42e68dbce39dc596ee36",

0 commit comments

Comments
 (0)