RT-943284: match pop-up address display to previous version, including missing...

RT-943284: match pop-up address display to previous version, including missing field, minus lat/long (for now?)

uw_ct_event.features.field_instance.inc

@@ -704,8 +704,8 @@ function uw_ct_event_field_default_field_instances() {
             'iconType' => 'marker',
             'iconUrl' => '/profiles/uw_base_profile/libraries/gmap_markers/university.png',
             'popupAnchor' => array(
-              'x' => 20,
-              'y' => 20,
+              'x' => 16,
+              'y' => 0,
             ),
             'shadowAnchor' => array(
               'x' => '',
@@ -716,7 +716,18 @@ function uw_ct_event_field_default_field_instances() {
           'leaflet_map' => 'OSM Mapnik',
           'popup' => array(
             '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',