diff --git a/composer.libraries.json b/composer.libraries.json
index 6fc539b6a89de645be51a390a48a4aeeb5d05be9..d3bd118b664b10589c2f95322d3ff17ba5733b8d 100644
--- a/composer.libraries.json
+++ b/composer.libraries.json
@@ -61,7 +61,6 @@
},
"patches": {
"drupal/core": {
- "Issue #3388047: Suppress Drupal core entity reference errors": "https://www.drupal.org/files/issues/2024-03-22/schemadotorg-drupal-core-3388047-4.patch",
"Issue #3345064: Media library field_widget_id is not unique enough": "https://www.drupal.org/files/issues/2023-02-28/3345064.patch",
"Issue #3356667: Error: Cannot read properties of undefined (reading 'settings') with dialog.position.js": "https://www.drupal.org/files/issues/2024-08-11/3356667-undefined-settings-dialog-position-52.patch"
},
diff --git a/config/install/schemadotorg.settings.yml b/config/install/schemadotorg.settings.yml
index 6fcf51ff65c8fcfde750a88350bb4e50a2916678..d5667a1fc405767a68b803c02a9f7ee7b010ad97 100644
--- a/config/install/schemadotorg.settings.yml
+++ b/config/install/schemadotorg.settings.yml
@@ -150,6 +150,14 @@ schema_types:
- numberOfCredits
Quiz:
- hasPart
+ Legislation:
+ - name
+ - text
+ - legislationDate
+ - legislationDateOfApplicability
+ - legislationPassedBy
+ - legislationResponsible
+ - legislationType
MediaObject:
- name
AudioObject:
@@ -373,7 +381,6 @@ schema_types:
- repeatFrequency
- startDate
Service:
- - availableChannel
- description
- hoursAvailable
- name
@@ -801,6 +808,7 @@ schema_types:
- Organization
- Service
- JobPosting
+ - Legislation
education:
label: Education
color: '#dbe7e4'
@@ -808,12 +816,19 @@ schema_types:
- EducationalOrganization
- CourseInstance
- Course
- hospitality:
- label: Hospitality
+ place:
+ label: Place
color: '#c5dedd'
types:
- - LodgingBusiness
- Accommodation
+ - AdministrativeArea
+ - CivicStructure
+ - Landform
+ - LandmarksOrHistoricalBuildings
+ - LodgingBusiness
+ - Residence
+ - TouristAttraction
+ - TouristDestination
food:
label: Food
color: '#f0efeb'
@@ -1338,6 +1353,8 @@ schema_properties:
unlimited: true
jobBenefits:
unlimited: true
+ jurisdiction:
+ type: text_long
keywords:
unlimited: true
knowsAbout:
@@ -1455,6 +1472,9 @@ schema_properties:
scale: 0
min: 0
max: 1000
+ provider:
+ label: Providers
+ unlimited: true
publication:
label: Publications
unlimited: true
@@ -1508,6 +1528,8 @@ schema_properties:
secondaryPrevention:
label: 'Secondary preventions'
unlimited: true
+ serviceOutput:
+ type: text_long
signOrSymptom:
label: 'Sign or symptoms'
unlimited: true
diff --git a/modules/schemadotorg_diagram/config/install/schemadotorg_diagram.settings.yml b/modules/schemadotorg_diagram/config/install/schemadotorg_diagram.settings.yml
index 67c32349f26a267f28b939c084d8a0cb52440fe1..2d860ee5dfc253c4458a359c1753d0e606a1e816 100644
--- a/modules/schemadotorg_diagram/config/install/schemadotorg_diagram.settings.yml
+++ b/modules/schemadotorg_diagram/config/install/schemadotorg_diagram.settings.yml
@@ -57,3 +57,11 @@ diagrams:
title: 'Related drugs'
parent: ''
child: relatedDrug
+ serviceOperator:
+ title: 'Service operator'
+ parent: serviceOperator
+ child: ''
+ hiringOrganization:
+ title: 'Hiring organization'
+ parent: hiringOrganization
+ child: ''
diff --git a/modules/schemadotorg_epp/config/install/schemadotorg_epp.settings.yml b/modules/schemadotorg_epp/config/install/schemadotorg_epp.settings.yml
index c43f39e33d42c5f1c25486b3c99718eb1af48900..79637ba9575a5f99968bef594e03d48aec28cab1 100644
--- a/modules/schemadotorg_epp/config/install/schemadotorg_epp.settings.yml
+++ b/modules/schemadotorg_epp/config/install/schemadotorg_epp.settings.yml
@@ -2,6 +2,7 @@ node_links:
Organization:
'Organization?parentOrganization': 'Add @label'
'JobPosting?hiringOrganization': 'Add @label'
+ 'Service?serviceOperator': 'Add @label'
'Person?memberOf': 'Add @label as member'
'Person?worksFor': 'Add @label as employee'
'Event?organizer': 'Add @label as organizer'
diff --git a/modules/schemadotorg_existing_values_autocomplete_widget/config/install/schemadotorg_existing_values_autocomplete_widget.settings.yml b/modules/schemadotorg_existing_values_autocomplete_widget/config/install/schemadotorg_existing_values_autocomplete_widget.settings.yml
index 206add6b2c77edc9499c32fbd91eba42db53b2d5..914344d955e2b2c928497de8f52adb95c149c927 100644
--- a/modules/schemadotorg_existing_values_autocomplete_widget/config/install/schemadotorg_existing_values_autocomplete_widget.settings.yml
+++ b/modules/schemadotorg_existing_values_autocomplete_widget/config/install/schemadotorg_existing_values_autocomplete_widget.settings.yml
@@ -54,6 +54,7 @@ default_schema_properties:
- productionCompany
- programPrerequisites
- programType
+ - provider
- qualifications
- responsibilities
- riskFactor
diff --git a/modules/schemadotorg_report/src/Controller/SchemaDotOrgReportItemController.php b/modules/schemadotorg_report/src/Controller/SchemaDotOrgReportItemController.php
index f69670283e72820a953b92fd5580706b5ac3e5a7..dc691eb4a7049e9035dbfca424b14b567504ff49 100644
--- a/modules/schemadotorg_report/src/Controller/SchemaDotOrgReportItemController.php
+++ b/modules/schemadotorg_report/src/Controller/SchemaDotOrgReportItemController.php
@@ -142,9 +142,15 @@ class SchemaDotOrgReportItemController extends ControllerBase {
$build = $this->buildHeader();
// Introduction.
- $introduction = '<p>' . $this->t('<a href="https://Schema.org/">Schema.org</a> is a collaborative, community activity with a mission to create, maintain, and promote schemas for structured data on the Internet, on web pages, in email messages, and beyond.') . '</p>'
+ $t_args = [
+ ':href_schemaorg' => 'https://Schema.org/',
+ ':href_w3_schemaorg' => 'https://www.w3.org/community/schemaorg',
+ ':href_w3_list' => 'http://lists.w3.org/Archives/Public/public-schemaorg',
+ ':href_github' => 'http://github.com/schemaorg/schemaorg',
+ ];
+ $introduction = '<p>' . $this->t('<a href=":href_schemaorg">Schema.org</a> is a collaborative, community activity with a mission to create, maintain, and promote schemas for structured data on the Internet, on web pages, in email messages, and beyond.', $t_args) . '</p>'
. '<p>' . $this->t('Schema.org vocabulary can be used with many different encodings, including RDFa, Microdata and JSON-LD. These vocabularies cover entities, relationships between entities and actions, and can easily be extended through a well-documented extension model. Over 10 million sites use Schema.org to markup their web pages and email messages. Many applications from Google, Microsoft, Pinterest, Yandex and others already use these vocabularies to power rich, extensible experiences.') . '</p>'
- . '<p>' . $this->t('Founded by Google, Microsoft, Yahoo and Yandex, Schema.org vocabularies are developed by an open community process, using the public-schemaorg@w3.org mailing list and through GitHub.') . '</p>'
+ . '<p>' . $this->t('Founded by Google, Microsoft, Yahoo and Yandex, Schema.org vocabularies are developed by an open <a href=":href_w3_schemaorg">community</a> process, using the <a href=":href_w3_list">public-schemaorg@w3.org</a> mailing list and through <a href=":href_github">GitHub</a>.', $t_args) . '</p>'
. '<p>' . $this->t('A shared vocabulary makes it easier for webmasters and developers to decide on a schema and get the maximum benefit for their efforts. It is in this spirit that the founders, together with the larger community have come together - to provide a shared collection of schemas.') . '</p>';
$build['introduction'] = ['#markup' => $introduction];
diff --git a/modules/schemadotorg_starterkit/tests/schemadotorg/config/snapshot/schemadotorg.settings.yml b/modules/schemadotorg_starterkit/tests/schemadotorg/config/snapshot/schemadotorg.settings.yml
index 5b82038101aaa9969185d8dcbe45c3163ca25d55..ffe7e25fb7bccbca27695c9d0a09691785c57b7d 100644
--- a/modules/schemadotorg_starterkit/tests/schemadotorg/config/snapshot/schemadotorg.settings.yml
+++ b/modules/schemadotorg_starterkit/tests/schemadotorg/config/snapshot/schemadotorg.settings.yml
@@ -157,6 +157,14 @@ schema_types:
- text
Quiz:
- hasPart
+ Legislation:
+ - legislationDate
+ - legislationDateOfApplicability
+ - legislationPassedBy
+ - legislationResponsible
+ - legislationType
+ - name
+ - text
MediaObject:
- name
AudioObject:
@@ -383,7 +391,6 @@ schema_types:
- repeatFrequency
- startDate
Service:
- - availableChannel
- description
- hoursAvailable
- name
@@ -803,6 +810,7 @@ schema_types:
- Organization
- Service
- JobPosting
+ - Legislation
education:
label: Education
color: '#dbe7e4'
@@ -810,12 +818,19 @@ schema_types:
- EducationalOrganization
- CourseInstance
- Course
- hospitality:
- label: Hospitality
+ place:
+ label: Place
color: '#c5dedd'
types:
- - LodgingBusiness
- Accommodation
+ - AdministrativeArea
+ - CivicStructure
+ - Landform
+ - LandmarksOrHistoricalBuildings
+ - LodgingBusiness
+ - Residence
+ - TouristAttraction
+ - TouristDestination
food:
label: Food
color: '#f0efeb'
@@ -1340,6 +1355,8 @@ schema_properties:
unlimited: true
jobBenefits:
unlimited: true
+ jurisdiction:
+ type: text_long
keywords:
unlimited: true
knowsAbout:
@@ -1457,6 +1474,9 @@ schema_properties:
scale: 0
min: 0
max: 1000
+ provider:
+ label: Providers
+ unlimited: true
publication:
label: Publications
unlimited: true
@@ -1510,6 +1530,8 @@ schema_properties:
secondaryPrevention:
label: 'Secondary preventions'
unlimited: true
+ serviceOutput:
+ type: text_long
signOrSymptom:
label: 'Sign or symptoms'
unlimited: true
diff --git a/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/article.png b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/article.png
new file mode 100644
index 0000000000000000000000000000000000000000..110c0573633071009a28dfed9702d5790acfa738
Binary files /dev/null and b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/article.png differ
diff --git a/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/civic_structure.png b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/civic_structure.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d431710e8561e3e4a2f7bedc7716ef0174dcf6e
Binary files /dev/null and b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/civic_structure.png differ
diff --git a/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/landmarks_or_historical_buildings.png b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/landmarks_or_historical_buildings.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5fc47a258be95555b3c3cf90649a839dfb51856
Binary files /dev/null and b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/landmarks_or_historical_buildings.png differ
diff --git a/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/legislation.png b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/legislation.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9bb4991d3a88ff2f67842db8c7576ef646c1e1b
Binary files /dev/null and b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/legislation.png differ
diff --git a/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/service.png b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/service.png
new file mode 100644
index 0000000000000000000000000000000000000000..797f5df7211da0dba830acb8c57472dca624193e
Binary files /dev/null and b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/service.png differ
diff --git a/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/tourist_attraction.png b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/tourist_attraction.png
new file mode 100644
index 0000000000000000000000000000000000000000..611dfdf655601eb5295c5896c43a130dcd73a584
Binary files /dev/null and b/modules/schemadotorg_type_tray/images/schemadotorg_type_tray/icon/tourist_attraction.png differ
diff --git a/modules/schemadotorg_type_tray/tests/src/Kernel/SchemaDotOrgTypeTrayKernelTest.php b/modules/schemadotorg_type_tray/tests/src/Kernel/SchemaDotOrgTypeTrayKernelTest.php
index 0f8723dd265b160186baf6be5bf341e94f3aa06d..67d3e84f64613dc66c4c4937f62471bc9bcf1291 100644
--- a/modules/schemadotorg_type_tray/tests/src/Kernel/SchemaDotOrgTypeTrayKernelTest.php
+++ b/modules/schemadotorg_type_tray/tests/src/Kernel/SchemaDotOrgTypeTrayKernelTest.php
@@ -51,7 +51,7 @@ class SchemaDotOrgTypeTrayKernelTest extends SchemaDotOrgEntityKernelTestBase {
'content' => 'Content',
'organization' => 'Organization',
'education' => 'Education',
- 'hospitality' => 'Hospitality',
+ 'place' => 'Place',
'food' => 'Food',
'media' => 'Media',
'medical_organization' => 'Medical organization',
diff --git a/tests/schemadotorg/entity_types/config/snapshot/schemadotorg.settings.yml b/tests/schemadotorg/entity_types/config/snapshot/schemadotorg.settings.yml
index 9a54d0df5b3553c9bafe654a0632f906c265ec45..4d471c58f579075b9231177961fa8a515c2a2c9c 100644
--- a/tests/schemadotorg/entity_types/config/snapshot/schemadotorg.settings.yml
+++ b/tests/schemadotorg/entity_types/config/snapshot/schemadotorg.settings.yml
@@ -150,6 +150,14 @@ schema_types:
- numberOfCredits
Quiz:
- hasPart
+ Legislation:
+ - name
+ - text
+ - legislationDate
+ - legislationDateOfApplicability
+ - legislationPassedBy
+ - legislationResponsible
+ - legislationType
MediaObject:
- name
AudioObject:
@@ -373,7 +381,6 @@ schema_types:
- repeatFrequency
- startDate
Service:
- - availableChannel
- description
- hoursAvailable
- name
@@ -801,6 +808,7 @@ schema_types:
- Organization
- Service
- JobPosting
+ - Legislation
education:
label: Education
color: '#dbe7e4'
@@ -808,12 +816,19 @@ schema_types:
- EducationalOrganization
- CourseInstance
- Course
- hospitality:
- label: Hospitality
+ place:
+ label: Place
color: '#c5dedd'
types:
- - LodgingBusiness
- Accommodation
+ - AdministrativeArea
+ - CivicStructure
+ - Landform
+ - LandmarksOrHistoricalBuildings
+ - LodgingBusiness
+ - Residence
+ - TouristAttraction
+ - TouristDestination
food:
label: Food
color: '#f0efeb'
@@ -1338,6 +1353,8 @@ schema_properties:
unlimited: true
jobBenefits:
unlimited: true
+ jurisdiction:
+ type: text_long
keywords:
unlimited: true
knowsAbout:
@@ -1455,6 +1472,9 @@ schema_properties:
scale: 0
min: 0
max: 1000
+ provider:
+ label: Providers
+ unlimited: true
publication:
label: Publications
unlimited: true
@@ -1508,6 +1528,8 @@ schema_properties:
secondaryPrevention:
label: 'Secondary preventions'
unlimited: true
+ serviceOutput:
+ type: text_long
signOrSymptom:
label: 'Sign or symptoms'
unlimited: true
diff --git a/tests/schemadotorg/schemadotorg_recipe_test/config/snapshot/schemadotorg.settings.yml b/tests/schemadotorg/schemadotorg_recipe_test/config/snapshot/schemadotorg.settings.yml
index 9a54d0df5b3553c9bafe654a0632f906c265ec45..4d471c58f579075b9231177961fa8a515c2a2c9c 100644
--- a/tests/schemadotorg/schemadotorg_recipe_test/config/snapshot/schemadotorg.settings.yml
+++ b/tests/schemadotorg/schemadotorg_recipe_test/config/snapshot/schemadotorg.settings.yml
@@ -150,6 +150,14 @@ schema_types:
- numberOfCredits
Quiz:
- hasPart
+ Legislation:
+ - name
+ - text
+ - legislationDate
+ - legislationDateOfApplicability
+ - legislationPassedBy
+ - legislationResponsible
+ - legislationType
MediaObject:
- name
AudioObject:
@@ -373,7 +381,6 @@ schema_types:
- repeatFrequency
- startDate
Service:
- - availableChannel
- description
- hoursAvailable
- name
@@ -801,6 +808,7 @@ schema_types:
- Organization
- Service
- JobPosting
+ - Legislation
education:
label: Education
color: '#dbe7e4'
@@ -808,12 +816,19 @@ schema_types:
- EducationalOrganization
- CourseInstance
- Course
- hospitality:
- label: Hospitality
+ place:
+ label: Place
color: '#c5dedd'
types:
- - LodgingBusiness
- Accommodation
+ - AdministrativeArea
+ - CivicStructure
+ - Landform
+ - LandmarksOrHistoricalBuildings
+ - LodgingBusiness
+ - Residence
+ - TouristAttraction
+ - TouristDestination
food:
label: Food
color: '#f0efeb'
@@ -1338,6 +1353,8 @@ schema_properties:
unlimited: true
jobBenefits:
unlimited: true
+ jurisdiction:
+ type: text_long
keywords:
unlimited: true
knowsAbout:
@@ -1455,6 +1472,9 @@ schema_properties:
scale: 0
min: 0
max: 1000
+ provider:
+ label: Providers
+ unlimited: true
publication:
label: Publications
unlimited: true
@@ -1508,6 +1528,8 @@ schema_properties:
secondaryPrevention:
label: 'Secondary preventions'
unlimited: true
+ serviceOutput:
+ type: text_long
signOrSymptom:
label: 'Sign or symptoms'
unlimited: true