? location-340856.patch
Index: location.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.module,v
retrieving revision 1.222.2.20
diff -u -p -r1.222.2.20 location.module
--- location.module	3 Mar 2009 20:07:19 -0000	1.222.2.20
+++ location.module	14 Mar 2009 15:27:31 -0000
@@ -1455,12 +1455,6 @@ function template_preprocess_location(&$
     }
   }
 
-  // Location name.
-  $variables['name'] = '';
-  if (!empty($location['name'])) {
-    $variables['name'] = theme('placeholder', $location['name']);
-  }
-
   // Map link.
   $variables['map_link'] = '';
   if (!empty($location['map_link'])) {
Index: location.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/location/location.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 location.tpl.php
--- location.tpl.php	21 Aug 2008 16:46:37 -0000	1.2
+++ location.tpl.php	14 Mar 2009 15:27:31 -0000
@@ -1,5 +1,5 @@
 <div class="location vcard"><div class="adr">
-<?php echo $name; ?>
+<?php echo '<div class="location-name">'. $name .'</div>'; ?>
 <?php if ($street) {?>
 <div class="street-address"><?php
   echo $street;
@@ -9,20 +9,15 @@
 ?></div>
 <?php }?>
 <?php
-  if ($city || $province || $postal_code) {
-    $city_province_postal = array();
-
-    if ($city) {
-      $city_province_postal[] = '<span class="locality">'. $city .'</span>';
-    }
-    if ($province) {
-      $city_province_postal[] = '<span class="region">'. $province .'</span>';
-    }
-    if ($postal_code) {
-      $city_province_postal[] = '<span class="postal-code">'. $postal_code .'</span>';
-    }
-
-    echo implode(', ', $city_province_postal);
+  if ($city) {
+    echo '<span class="location-city">'. $city .'</span>';
+    if ($province) echo ', ';
+  }
+  if ($province) {
+    echo '<span class="location-state">'. $province .'</span> ';
+  }
+  if ($postal_code) {
+    echo ' <span class="postal-code">'. $postal_code .'</span>';
   }
 ?>
 <?php if ($country_name) { ?>
@@ -40,4 +35,10 @@
   }
 ?>
 </div></div>
-<?php echo $map_link; ?>
+<?php echo '<div class="map-links">'. $map_link .'</div>'; ?>
+<?php if ($phone): ?>
+<div class="location-phone"><strong>Phone: </strong><?php print $phone; ?></div>
+<?php endif; ?>
+<?php if ($fax): ?>
+<div class="location-fax"><strong>Fax: </strong><?php print $fax; ?></div>
+<?php endif; ?>