From a560182afdc8e760b6c94102a84ab61404a8b6d2 Mon Sep 17 00:00:00 2001 From: FlxAlbroscheit Date: Thu, 5 Nov 2020 16:09:04 +0100 Subject: [PATCH] Changed default map-type to thunderforest.neighbourhood, activated inherit-filter-setting in akteure- & events-list-view --- ...ty_view_display.node.le_akteur.default.yml | 12 ++--- .../install/views.view.le_view_akteure.yml | 5 +- .../custom/le_akteure/le_akteure.info.yml | 2 +- ...ity_view_display.node.le_event.default.yml | 10 ++-- .../views.view.le_akteur_has_events.yml | 47 ++++++++++++++++++- .../install/views.view.le_view_events.yml | 5 +- web/modules/custom/le_event/le_event.info.yml | 2 +- .../config/install/views.view.marktplatz.yml | 2 +- .../le_remote_content_depot_social.info.yml | 2 +- .../config/optional/views.view.frontpage.yml | 2 +- .../custom/le_website/le_website.info.yml | 2 +- .../leipziger_ecken/leipziger_ecken.info.yml | 1 + 12 files changed, 70 insertions(+), 22 deletions(-) diff --git a/web/modules/custom/le_akteure/config/install/core.entity_view_display.node.le_akteur.default.yml b/web/modules/custom/le_akteure/config/install/core.entity_view_display.node.le_akteur.default.yml index 3a3376a23..64ee4be70 100644 --- a/web/modules/custom/le_akteure/config/install/core.entity_view_display.node.le_akteur.default.yml +++ b/web/modules/custom/le_akteure/config/install/core.entity_view_display.node.le_akteur.default.yml @@ -60,9 +60,10 @@ content: multiple_map: '0' popup: '1' popup_content: "[node:title]
\r\n[node:field_adresse:address_line1]\r\n[node:field_adresse:address_line2]\r\n[node:field_adresse:postal_code] [node:field_adresse:locality]" - leaflet_map: 'OSM Mapnik' + leaflet_map: osm-neighbourhood height: '100' height_unit: '%' + hide_empty_map: '1' fullscreen_control: '1' reset_map: position: topright @@ -71,21 +72,21 @@ content: center: lat: '0' lon: '0' - zoom: '12' + zoom: '14' minZoom: '1' maxZoom: '18' zoomFiner: '0' force: 0 icon: iconType: marker - iconUrl: '' + iconUrl: themes/custom/swinger/icons/marker_le_akteur.svg shadowUrl: '' html: '
' html_class: leaflet-map-divicon circle_marker_options: '{"radius":100,"color":"red","fillColor":"#f03","fillOpacity":0.5}' iconSize: - x: '' - 'y': '' + x: '25' + 'y': '40' iconAnchor: x: '' 'y': '' @@ -116,7 +117,6 @@ content: options: '' popup: 0 control: 0 - hide_empty_map: 0 disable_wheel: 0 gesture_handling: 0 third_party_settings: { } diff --git a/web/modules/custom/le_akteure/config/install/views.view.le_view_akteure.yml b/web/modules/custom/le_akteure/config/install/views.view.le_view_akteure.yml index a6718cb0a..907fb4218 100644 --- a/web/modules/custom/le_akteure/config/install/views.view.le_view_akteure.yml +++ b/web/modules/custom/le_akteure/config/install/views.view.le_view_akteure.yml @@ -385,7 +385,7 @@ display: operator: field_le_akteur_kategorie_typ_target_id_op operator_limit_selection: false operator_list: { } - identifier: field_le_akteur_kategorie_typ_target_id + identifier: kategorie_id required: false remember: false multiple: false @@ -719,7 +719,7 @@ display: name_field: title description_field: title view_mode: full - leaflet_map: 'OSM Mapnik' + leaflet_map: osm-neighbourhood height: '400' height_unit: px hide_empty_map: 0 @@ -793,6 +793,7 @@ display: inherit_exposed_filters: true display_description: 'Leaflet Map - erhält Filter aus Seite, aber OHNE Paginierung' empty: { } + inherit_arguments: false cache_metadata: max-age: -1 contexts: diff --git a/web/modules/custom/le_akteure/le_akteure.info.yml b/web/modules/custom/le_akteure/le_akteure.info.yml index 2a9baa679..d5a9f8e44 100755 --- a/web/modules/custom/le_akteure/le_akteure.info.yml +++ b/web/modules/custom/le_akteure/le_akteure.info.yml @@ -36,5 +36,5 @@ dependencies: - text - user - views -version: 8.x-0.1.95 +version: 8.x-0.1.96 core_incompatible: false diff --git a/web/modules/custom/le_event/config/install/core.entity_view_display.node.le_event.default.yml b/web/modules/custom/le_event/config/install/core.entity_view_display.node.le_event.default.yml index 7797036aa..6ede28529 100644 --- a/web/modules/custom/le_event/config/install/core.entity_view_display.node.le_event.default.yml +++ b/web/modules/custom/le_event/config/install/core.entity_view_display.node.le_event.default.yml @@ -51,7 +51,7 @@ content: multiple_map: '0' popup: '1' popup_content: "[node:title]
\r\n[node:field_adresse:address_line1]\r\n[node:field_adresse:address_line2]\r\n[node:field_adresse:postal_code] [node:field_adresse:locality]" - leaflet_map: 'OSM Mapnik' + leaflet_map: osm-neighbourhood height: '400' height_unit: px hide_empty_map: '1' @@ -63,21 +63,21 @@ content: center: lat: '0' lon: '0' - zoom: '12' + zoom: '14' minZoom: '1' maxZoom: '18' zoomFiner: '0' force: 0 icon: iconType: marker - iconUrl: '' + iconUrl: themes/custom/swinger/icons/marker_le_event.svg shadowUrl: '' html: '
' html_class: leaflet-map-divicon circle_marker_options: '{"radius":100,"color":"red","fillColor":"#f03","fillOpacity":0.5}' iconSize: - x: '' - 'y': '' + x: '25' + 'y': '40' iconAnchor: x: '' 'y': '' diff --git a/web/modules/custom/le_event/config/install/views.view.le_akteur_has_events.yml b/web/modules/custom/le_event/config/install/views.view.le_akteur_has_events.yml index bdf7cc185..66f534520 100644 --- a/web/modules/custom/le_event/config/install/views.view.le_akteur_has_events.yml +++ b/web/modules/custom/le_event/config/install/views.view.le_akteur_has_events.yml @@ -163,7 +163,12 @@ display: label: '' granularity: second title: Events - header: { } + header: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + plugin_id: text_custom footer: { } empty: area_text_custom: @@ -233,6 +238,30 @@ display: - url.query_args - 'user.node_grants:view' tags: { } + feed_1: + display_plugin: feed + id: feed_1 + display_title: Feed + position: 2 + display_options: + display_extenders: { } + row: + type: node_rss + options: { } + path: node/%node/events.rss + pager: + type: some + options: + items_per_page: 0 + offset: 0 + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + tags: { } page_1: display_plugin: page id: page_1 @@ -250,6 +279,22 @@ display: weight: 2 context: '0' menu_name: main + header: + area: + id: area + table: views + field: area + relationship: none + group_type: group + admin_label: '' + empty: true + tokenize: false + content: + value: 'Veranstaltungen dieses Akteurs als RSS-Feed abonnieren' + format: basic_html + plugin_id: text + defaults: + header: false cache_metadata: max-age: -1 contexts: diff --git a/web/modules/custom/le_event/config/install/views.view.le_view_events.yml b/web/modules/custom/le_event/config/install/views.view.le_view_events.yml index daef08815..0c98ec2e1 100644 --- a/web/modules/custom/le_event/config/install/views.view.le_view_events.yml +++ b/web/modules/custom/le_event/config/install/views.view.le_view_events.yml @@ -711,7 +711,7 @@ display: operator: field_le_event_kategorie_typ_target_id_op operator_limit_selection: false operator_list: { } - identifier: field_le_event_kategorie_typ_target_id + identifier: kategorie_id required: false remember: false multiple: false @@ -813,7 +813,7 @@ display: name_field: title description_field: field_le_event_occurrences_value_1 view_mode: full - leaflet_map: 'OSM Mapnik' + leaflet_map: osm-neighbourhood height: '400' height_unit: px hide_empty_map: 0 @@ -1292,6 +1292,7 @@ display: displays: page_1: page_1 display_description: 'Leaflet Map - erhält Filter aus Seite, aber OHNE Paginierung' + inherit_arguments: false cache_metadata: max-age: -1 contexts: diff --git a/web/modules/custom/le_event/le_event.info.yml b/web/modules/custom/le_event/le_event.info.yml index 67e21888b..bc3b6c149 100755 --- a/web/modules/custom/le_event/le_event.info.yml +++ b/web/modules/custom/le_event/le_event.info.yml @@ -33,5 +33,5 @@ dependencies: - text - user - views -version: 8.x-0.1.92 +version: 8.x-0.1.93 core_incompatible: false diff --git a/web/modules/custom/le_remote_content_depot_social/config/install/views.view.marktplatz.yml b/web/modules/custom/le_remote_content_depot_social/config/install/views.view.marktplatz.yml index a0c26e5c3..54dd755ff 100644 --- a/web/modules/custom/le_remote_content_depot_social/config/install/views.view.marktplatz.yml +++ b/web/modules/custom/le_remote_content_depot_social/config/install/views.view.marktplatz.yml @@ -69,7 +69,7 @@ display: name_field: title description_field: body view_mode: full - leaflet_map: 'OSM Mapnik' + leaflet_map: osm-neighbourhood height: '600' height_unit: px hide_empty_map: 0 diff --git a/web/modules/custom/le_remote_content_depot_social/le_remote_content_depot_social.info.yml b/web/modules/custom/le_remote_content_depot_social/le_remote_content_depot_social.info.yml index 93438577b..4e207b6c5 100755 --- a/web/modules/custom/le_remote_content_depot_social/le_remote_content_depot_social.info.yml +++ b/web/modules/custom/le_remote_content_depot_social/le_remote_content_depot_social.info.yml @@ -21,4 +21,4 @@ dependencies: - text - user - views -version: 8.x-0.12 +version: 8.x-0.13 diff --git a/web/modules/custom/le_website/config/optional/views.view.frontpage.yml b/web/modules/custom/le_website/config/optional/views.view.frontpage.yml index b98282bf8..00ab00af8 100644 --- a/web/modules/custom/le_website/config/optional/views.view.frontpage.yml +++ b/web/modules/custom/le_website/config/optional/views.view.frontpage.yml @@ -248,7 +248,7 @@ display: name_field: title description_field: field_adresse view_mode: full - leaflet_map: 'OSM Mapnik' + leaflet_map: osm-neighbourhood height: '400' height_unit: px hide_empty_map: 0 diff --git a/web/modules/custom/le_website/le_website.info.yml b/web/modules/custom/le_website/le_website.info.yml index a5af0fd77..caa1df073 100644 --- a/web/modules/custom/le_website/le_website.info.yml +++ b/web/modules/custom/le_website/le_website.info.yml @@ -8,4 +8,4 @@ dependencies: - le_article - le_event - user -version: 8.x-1.0 +version: 8.x-1.01 diff --git a/web/profiles/leipziger_ecken/leipziger_ecken.info.yml b/web/profiles/leipziger_ecken/leipziger_ecken.info.yml index 61edbea75..8f78cc85f 100755 --- a/web/profiles/leipziger_ecken/leipziger_ecken.info.yml +++ b/web/profiles/leipziger_ecken/leipziger_ecken.info.yml @@ -54,6 +54,7 @@ dependencies: - features - features_ui - menu_ui + - leaflet_more_maps - leaflet_views - metatag_dc - schema_organization