Commit d6adc3ca authored by Liam Morland's avatar Liam Morland
Browse files

Merge tag '7.x-2.30' into 7.x-2.x

parents d0504052 cb376495
...@@ -678,7 +678,18 @@ function uw_ct_event_field_default_field_instances() { ...@@ -678,7 +678,18 @@ function uw_ct_event_field_default_field_instances() {
'settings' => array( 'settings' => array(
'address' => array( 'address' => array(
'show' => 1, 'show' => 1,
'text' => '<div class="address-content">[node:field_event_location:name:0]<div class="steet-address">[node:field_event_location:street:0]</div><span class="locality">[node:field_event_location:city:0] [node:field_event_location:province:0] [node:field_event_location:postal_code:0]</span><div class="country-name">[node:field_event_location:country_name:0]</div></div>', 'text' => '<div class="location vcard">
<div class="adr">
<span class="fn">[node:field_event_location:name:0]</span>
<div class="additional">[node:field_event_location:additional:0]</div>
<div class="address-content">
<div class="steet-address">[node:field_event_location:street:0]</div>
<span class="locality">[node:field_event_location:city:0]</span>, <span class="region">[node:field_event_location:province:0]</span>
<span class="postal-code">[node:field_event_location:postal_code:0]</span>
<div class="country-name">[node:field_event_location:country_name:0]</div>
</div>
</div>
</div>',
), ),
'height' => 300, 'height' => 300,
'icon' => array( 'icon' => array(
...@@ -696,8 +707,8 @@ function uw_ct_event_field_default_field_instances() { ...@@ -696,8 +707,8 @@ function uw_ct_event_field_default_field_instances() {
'iconType' => 'marker', 'iconType' => 'marker',
'iconUrl' => '/profiles/uw_base_profile/libraries/gmap_markers/university.png', 'iconUrl' => '/profiles/uw_base_profile/libraries/gmap_markers/university.png',
'popupAnchor' => array( 'popupAnchor' => array(
'x' => 20, 'x' => 16,
'y' => 20, 'y' => 0,
), ),
'shadowAnchor' => array( 'shadowAnchor' => array(
'x' => '', 'x' => '',
...@@ -708,7 +719,18 @@ function uw_ct_event_field_default_field_instances() { ...@@ -708,7 +719,18 @@ function uw_ct_event_field_default_field_instances() {
'leaflet_map' => 'OSM Mapnik', 'leaflet_map' => 'OSM Mapnik',
'popup' => array( 'popup' => array(
'show' => 1, 'show' => 1,
'text' => '<div class="field-label">[node:field_event_location:name:0]</div><div class="address-content"><div class="steet-address">[node:field_event_location:street:0]</div><span class="locality">[node:field_event_location:city:0] [node:field_event_location:province:0] [node:field_event_location:postal_code:0]</span><div class="country-name">[node:field_event_location:country_name:0]</div></div>', 'text' => '<h4>[node:field_event_location:name:0]</h4>
<div class="location vcard">
<div class="adr">
<div class="additional">[node:field_event_location:additional:0]</div>
<div class="address-content">
<div class="steet-address">[node:field_event_location:street:0]</div>
<span class="locality">[node:field_event_location:city:0]</span>, <span class="region">[node:field_event_location:province:0]</span>
<span class="postal-code">[node:field_event_location:postal_code:0]</span>
<div class="country-name">[node:field_event_location:country_name:0]</div>
</div>
</div>
</div>',
), ),
), ),
'type' => 'location_cck_leaflet', 'type' => 'location_cck_leaflet',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment