member maps

update so markup can be placed in templates/toolbox.html

diff --git a/Toolkit/Members/Map.php b/Toolkit/Members/Map.php
index 64653ac..029b6ff 100644 (file)
--- a/Toolkit/Members/Map.php
+++ b/Toolkit/Members/Map.php
@@ -28,6 +28,7 @@
  */
 class Toolkit_Members_Map
 {
+    protected $hasSearchForm;
     //    {{{    __construct()
 
     /**
@@ -35,8 +36,9 @@ class Toolkit_Members_Map
      *
      * @access public
      */
-    public function __construct()
+    public function __construct($hasSearchForm)
     {
+        $this->hasSearchForm = $hasSearchForm;
     }
 
     //    }}}
@@ -86,6 +88,11 @@ class Toolkit_Members_Map
      */
     public function toHtml($class="small-12 medium-6 large-6 columns", $id = "map-canvas", $h = "500px", $w = "100%")
     {
+        if (!$this->hasSearchForm) {
+            $class = "small-12 medium-6 medium-offset-1 large-6 large-offset-3 columns left";
+        } else {
+            $class .= " right";
+        }
         $GLOBALS['bottomScripts'][]
             = MEDIA_BASE_URL . 'Toolkit/Members/libjs/google-map.js';
         $GLOBALS['bottomScripts'][]

diff --git a/Toolkit/Members/SearchList.php b/Toolkit/Members/SearchList.php
index 1070925..e73874c 100644 (file)
--- a/Toolkit/Members/SearchList.php
+++ b/Toolkit/Members/SearchList.php
@@ -679,30 +679,30 @@ class Toolkit_Members_SearchList extends Toolkit_FlexyDataGridBuilder
         $this->ctrlObj['letters']             = $this->getAlphaList();
         $this->ctrlObj['searchMapIconActive'] = $searchMapIconActive;
 
-        if ($this->showSearchBox) {
-            $action = MEDIA_BASE_URL . "index.php?{$_SERVER['QUERY_STRING']}";
-            $form = new Toolkit_Members_UserSearchForm(
-                'SearchForm',
-                'get',
-                $action,
-                null,
-                null,
-                true
-            );
-            $res = $form->setCatId($_GET['catid']);
-
-            if (PEAR::isError($res)) {
-                return Toolkit_Common::handleError($res);
-            } else {
-                $form->setPageMemberCategories($this->_pageGateway);
-                $form->setPageMemberRegions($this->_pageGateway);
-                $form->configureForm($this->dbh, $this->config);
-                $this->ctrlObj['member_search_form'] = $form->toHtml(
-                    Toolkit_Members::getFlexyOptions(),
-                    $this->_pageGateway
-                );
-            }
-        }
+//        if ($this->showSearchBox) {
+//            $action = MEDIA_BASE_URL . "index.php?{$_SERVER['QUERY_STRING']}";
+//            $form = new Toolkit_Members_UserSearchForm(
+//                'SearchForm',
+//                'get',
+//                $action,
+//                null,
+//                null,
+//                true
+//            );
+//            $res = $form->setCatId($_GET['catid']);
+//
+//            if (PEAR::isError($res)) {
+//                return Toolkit_Common::handleError($res);
+//            } else {
+//                $form->setPageMemberCategories($this->_pageGateway);
+//                $form->setPageMemberRegions($this->_pageGateway);
+//                $form->configureForm($this->dbh, $this->config);
+//                $this->ctrlObj['member_search_form'] = $form->toHtml(
+//                    Toolkit_Members::getFlexyOptions(),
+//                    $this->_pageGateway
+//                );
+//            }
+//        }
     }
 
     //    }}}

diff --git a/Toolkit/Members/memberDBGoogleMap.php b/Toolkit/Members/memberDBGoogleMap.php
index dab973f..ff1bfcc 100644 (file)
--- a/Toolkit/Members/memberDBGoogleMap.php
+++ b/Toolkit/Members/memberDBGoogleMap.php
@@ -45,7 +45,7 @@ $root =& $conf->parseConfig(
     'IniFile'
 );
 
-$xmlEncoder  = new Toolkit_Members_Map();
+$xmlEncoder  = new Toolkit_Members_Map(false);
 $searchQuery = new Toolkit_Members_SearchQueryGenerator(true, $root);
 
 $sql = $searchQuery->getQuery($dbh);

diff --git a/Toolkit/Template/Page/Member.php b/Toolkit/Template/Page/Member.php
index 36ec762..ebf40a4 100644 (file)
--- a/Toolkit/Template/Page/Member.php
+++ b/Toolkit/Template/Page/Member.php
@@ -119,11 +119,11 @@ 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;
+//            $googleMap = new Toolkit_Members_Map();
+//            $html      = $googleMap->toHtml();
+//        }
 
         $dbh = Toolkit_Database::getInstance();
 
@@ -185,10 +185,10 @@ class Toolkit_Template_Page_Member
     {
         $page = $this->pageGateway->find($id);
         $html = '';
-        if ($page['include_member_map']) {
-            $googleMap = new Toolkit_Members_Map();
-            $html      = $googleMap->toHtml();
-        }
+//        if ($page['include_member_map']) {
+//            $googleMap = new Toolkit_Members_Map();
+//            $html      = $googleMap->toHtml();
+//        }
         $pageUrl = ($_REQUEST['page_id'])
             ? MEDIA_BASE_URL . "members-only-area/?page_id={$_REQUEST['page_id']}"
             : MEDIA_BASE_URL . "index.php?catid={$_GET['catid']}";
@@ -336,10 +336,15 @@ class Toolkit_Template_Page_Member
         if (defined('PHOTO_GALLERY') && PHOTO_GALLERY) {
             $photoGalleryContent = $this->photoGallery->getPageGallery($this->id);
         }
-
+        $memberMap = null;
+        if ($page['include_member_map']) {
+            $googleMap = new Toolkit_Members_Map((bool)$page['search_form']);
+            $memberMap = $googleMap->toHtml();
+        }
         $tpl                        = new HTML_Template_Flexy($GLOBALS['flexyOptions']);
         $tPage                      = new stdClass();
         $tPage->photos              = $photoGalleryContent;
+        $tPage->memberMaps          = $memberMap;
         $tPage->pods                = '';
         $tPage->isMainLevel         = false;
         $tPage->title               = $page['title'];
@@ -353,13 +358,12 @@ class Toolkit_Template_Page_Member
 
         if (filter_input(INPUT_GET, 'member_id', FILTER_VALIDATE_INT)) {
             $tPage->profile = $this->_getMemberProfilePage($this->id);
-        } elseif ($page['search_form']) {
-            $tPage->searchResults = $this->_getMemberSearchResults($this->id);
-        } elseif (isset($_GET['search'])) {
-            $tPage->searchResults = $this->_getMemberSearchResults($this->id);
         } else {
             $tPage->searchResults = $this->_getMemberSearchResults($this->id);
         }
+        if ($page['search_form']) {
+            $tPage->searchForm = $this->_getMemberSearchForm($this->id);
+        }
         return $tPage;
     }
 

diff --git a/templates/toolbox.html b/templates/toolbox.html
index b2b3889..678d0b7 100644 (file)
--- a/templates/toolbox.html
+++ b/templates/toolbox.html
@@ -36,6 +36,9 @@
     </div>
     {end:}
     <div class="row">
+    {if:toolboxContent.memberMaps}
+        {toolboxContent.memberMaps:h}
+    {end:}
     {if:toolboxContent.searchForm}
       {toolboxContent.searchForm:h}
     {end:}