Map marker search results.

It had been disabled due to our changes in getMemberSearchResults.
$memberMap = true in Member.php fixed it. Also formatting.

diff --git a/Toolkit/Members/css/member.css b/Toolkit/Members/css/member.css
index 9e64d7d..a414954 100755 (executable)
--- a/Toolkit/Members/css/member.css
+++ b/Toolkit/Members/css/member.css
@@ -138,7 +138,11 @@ background-color: #ffffff;
     margin-bottom: 0px;
 }
 .search-result-item-container {
-    padding: 8px;
+    padding: 8px !important;
+}
+.search-result-map-marker {
+    margin-top: 15px;
+    padding: 0px !important;
 }
 .search-result-distance {
   clear: left;

diff --git a/Toolkit/Members/templates/membersList.tpl b/Toolkit/Members/templates/membersList.tpl
index 5bd38d0..360bb2f 100644 (file)
--- a/Toolkit/Members/templates/membersList.tpl
+++ b/Toolkit/Members/templates/membersList.tpl
@@ -1,4 +1,3 @@
-
 {if:member_search_form}
     {member_search_form:h}
 {end:}
@@ -30,6 +29,13 @@ searchMapIconActive="searchMapIconActive"
                 </h3>   
             </div>
             <div class="row">
+                <div class="search-result-map-marker small-1 columns left">
+                    {if:row[map_icon]}
+                    <div class="map-link left" rel="{row[map_icon][id]}">
+                        <img class="search-result-map-img" src="{row[map_icon][icon]:h}">
+                    </div>
+                    {end:}
+                </div>
                 <div class="memberSR right small-4 columns">
                     {if:row[addToLink]}
                         <a id="add-{row[member_id]}" class="list-add-link" rel="{row[member_id]}" flexy:if="row[plink]" title="Add to Your Travel List" href="{row[plink]:h}">
@@ -46,12 +52,7 @@ searchMapIconActive="searchMapIconActive"
                         <p> </p>
                     {end:}
                 </div><!-- /.memberSR -->
-                <div class="search-result-item-info small-8 columns">
-                    {if:row[map_icon]}
-                        <div class="map-link left" rel="{row[map_icon][id]}">
-                            <img class="search-result-map-img" src="{row[map_icon][icon]:h}">
-                        </div>
-                    {end:}
+                <div class="search-result-item-info small-7 columns">
                     <div class="search-result-location adr small-12 columns">
                         <div class="street-address">{row[street]:h}</div>
                         <span class="locality">{row[city]:h}</span>,

diff --git a/Toolkit/Template/Page/Member.php b/Toolkit/Template/Page/Member.php
index ebf40a4..5df0cf0 100644 (file)
--- a/Toolkit/Template/Page/Member.php
+++ b/Toolkit/Template/Page/Member.php
@@ -119,11 +119,9 @@ class Toolkit_Template_Page_Member
         $memberMap = false;
         $page      = $this->pageGateway->find($id);
         $html      = '';
-//        if ($page['include_member_map']) {
-//            $memberMap = true;
-//            $googleMap = new Toolkit_Members_Map();
-//            $html      = $googleMap->toHtml();
-//        }
+        if ($page['include_member_map']) {
+            $memberMap = true;
+        }
 
         $dbh = Toolkit_Database::getInstance();