Update search
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 28 Jul 2014 19:45:25 +0000 (15:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 28 Jul 2014 19:45:51 +0000 (15:45 -0400)
setup filters so they are tied in to the results

Toolkit/Members/SearchList.php
Toolkit/Members/UserSearchForm.php
Toolkit/Members/templates/userSearchForm.html

index c23c6b8..df25a6e 100644 (file)
@@ -684,6 +684,7 @@ class Toolkit_Members_SearchList extends Toolkit_FlexyDataGridBuilder
                 true
             );
             $res = $form->setCatId($_GET['catid']);
+            $form->setMemberIds($this->sql);
 
             if (PEAR::isError($res)) {
                 return Toolkit_Common::handleError($res);
index a5a314b..e20388e 100644 (file)
@@ -112,6 +112,7 @@ class Toolkit_Members_UserSearchForm
      * @var PDO
      */
     protected $dbh;
+    protected $memberIds = array();
 
     const PARENT_CATEGORY_ACTIVITIES   = 7;
     const PARENT_CATEGORY_PARKS        = 8;
@@ -124,6 +125,19 @@ class Toolkit_Members_UserSearchForm
         $this->dbh = Toolkit_Database::getInstance();
     }
 
+    /**
+     * Sql from generator
+     *
+     * @param string $sql Main sql from the generator
+     */
+    public function setMemberIds($sql)
+    {
+        $stmt = $this->dbh->query($sql);
+        while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+            $this->memberIds[] = $row['member_id'];
+        }
+    }
+
        //      {{{ configureFilters()
 
        /**
@@ -360,16 +374,19 @@ class Toolkit_Members_UserSearchForm
        //      {{{     getMemberAmenities()
 
     /**
-     * Get all the amenities for the member
+     * Get all the amenities for members
      *
         * @param PDO $dbh Database handler
         *
      * @return array member amenities
      * @access protected
      */
-       protected function getMemberAmenities(PDO $dbh)
+       protected function getMemberAmenities(PDO $dbh, $memberIds = null)
        {
                try {
+            $memIds = ($memberIds)
+                ? " AND member_id IN (".implode(',', $memberIds).")"
+                : '';
                        $amenities = array();
             $sql = "
             SELECT accommodations
@@ -385,6 +402,7 @@ class Toolkit_Members_UserSearchForm
              WHERE m.new_member <> CAST(1 AS BOOLEAN)
                AND m.active = CAST(1 AS BOOLEAN)
                AND a.display_form = CAST(1 AS BOOLEAN)
+               $memIds
              ORDER BY amenity_name";
 
                        $stmt = $dbh->prepare($sql);
@@ -577,43 +595,54 @@ class Toolkit_Members_UserSearchForm
         $tpl = new HTML_Template_Flexy($flexyOpts);
         $tpl->compile($this->formTemplate);
 
-        $activity     = $this->getActivities();
-        $amenities    = $this->getMemberAmenities($this->dbh);
-        $parks        = $this->getParks();
-        $destinations = $this->getDestinations();
-        $regions      = $this->getAvailableRegions($this->dbh);
-        $counties     = $this->getCounties();
-        $cities       = $this->getCities();
+        $search = filter_var($_REQUEST['search'], FILTER_VALIDATE_BOOLEAN);
 
         $page         = new stdClass();
+        $page->search = $search;
         $page->formURL
             = BASE_URL
             . 'index.php?_qf__SearchForm=&catid=' . $this->_catid
             . '&search=1';
+
+        $activity = $this->getActivities();
         $page->activities
             = (!empty($activity) && count($activity) > 1)
             ? $activity
             : null;
+        $page->filterActivities
+            = ($search)
+            ? $this->getActivities($this->memberIds)
+            : '';
+        $parks = $this->getParks();
         $page->parks
             = (!empty($parks) && count($parks) > 1)
             ? $parks
             : null;
+        $page->filterParks
+            = ($search)
+            ? $this->getParks($this->memberIds)
+            : '';
+        $destinations = $this->getDestinations();
         $page->destinations
             = (!empty($destinations) && count($destinations) > 1)
             ? $destinations
             : null;
+        $regions = $this->getAvailableRegions($this->dbh);
         $page->regions
             = (!empty($regions) && count($regions) >= 1)
             ? $regions
             : null;
+        $counties = $this->getCounties();
         $page->counties
             = (!empty($counties) && count($counties) > 1)
             ? $counties
             : null;
+        $cities = $this->getCities();
         $page->cities
             = (!empty($cities) && count($cities) > 1)
             ? $cities
             : null;
+        $amenities = $this->getMemberAmenities($this->dbh, $this->memberIds);
         $page->amenities = $amenities;
 
         return $tpl->bufferedOutputObject($page);
@@ -621,7 +650,7 @@ class Toolkit_Members_UserSearchForm
 
        //      }}}
 
-    protected function getActivities()
+    protected function getActivities($memberIds = null)
     {
         $activities = array();
         try {
@@ -631,12 +660,19 @@ class Toolkit_Members_UserSearchForm
                     .implode(',', $this->memberCatsAssignedToPage).")
                     OR parent_id IN (".implode(',', $this->memberCatsAssignedToPage)."))"
                 : '';
+            $memIds = ($memberIds)
+                ? " AND "
+                    . "(category_id IN "
+                    . "(SELECT category_id "
+                    . "FROM member_category "
+                    . "WHERE member_id IN (".implode(',', $memberIds).")))"
+                : '';
             $sql = "
             SELECT *
               FROM category
              WHERE parent_id = "
                 . self::PARENT_CATEGORY_ACTIVITIES
-                . $cats
+                . $cats . $memIds
                 . " AND category_id IN (
                     SELECT category_id
                       FROM member_category)"
@@ -651,7 +687,7 @@ class Toolkit_Members_UserSearchForm
         return $activities;
     }
 
-    protected function getParks()
+    protected function getParks($memberIds = null)
     {
         $parks = array();
         try {
@@ -661,12 +697,19 @@ class Toolkit_Members_UserSearchForm
                     .implode(',', $this->memberCatsAssignedToPage).")
                     OR parent_id IN (".implode(',', $this->memberCatsAssignedToPage)."))"
                 : '';
+            $memIds = ($memberIds)
+                ? " AND "
+                    . "(category_id IN "
+                    . "(SELECT category_id "
+                    . "FROM member_category "
+                    . "WHERE member_id IN (".implode(',', $memberIds).")))"
+                : '';
             $sql = "
             SELECT *
               FROM category
              WHERE parent_id = "
                 . self::PARENT_CATEGORY_PARKS
-                . $cats
+                . $cats .$memIds
                 . " AND category_id IN (
                     SELECT category_id
                       FROM member_category)"
index a295720..d6980e6 100644 (file)
@@ -1,9 +1,9 @@
 <style>
     .ui-accordion-content {height:260px;width: 100}
     #accordion, #category-search {width: 100%;}
-       #category-search {
-               margin-top: 20px;
-       }
+    #category-search {
+        margin-top: 20px;
+    }
     fieldset #glm-member-search label {width:25%;text-align: right;}
     .fieldcontain {display:block;width:100%;clear:right; margin:2px 0;padding: 0;}
     .fieldcontain input[type=submit] {
@@ -36,7 +36,7 @@
         padding: 3px;
     }
     #col1, #col2 {
-               position: relative;
+        position: relative;
         font-family: Arial, Helvetica, sans-serif;
         float: left;
         width: 32.33333333%;
         overflow: hidden;
     }
     #col3 {
-               position: relative;
+        position: relative;
         font-family: Arial, Helvetica, sans-serif;
         float: left;
         width: 32.33333333%;
         padding: 10px 1%;
         height: 160px;
         background: url(<?php echo BASE_URL ?>assets/bg_3.jpg) 0 0 repeat;
-               background-size: cover;
+        background-size: cover;
         border: 1px solid #B0A487;
         border-radius: 8px 8px 8px 8px;
         box-shadow: 0 0 10px rgba(176, 164, 135, 0.7) inset;
@@ -75,7 +75,7 @@
         display: block;
     }
     #lowerbox {
-               position: relative;
+        position: relative;
         font-family: Arial, Helvetica, sans-serif;
         float: left;
         clear: left;
@@ -87,7 +87,7 @@
         border: 1px solid #B0A487;
         border-radius: 8px 8px 8px 8px;
         box-shadow: 0 0 10px rgba(176, 164, 135, 0.7) inset;*/
-               border-bottom: 1px solid #D4D4D4;
+        border-bottom: 1px solid #D4D4D4;
     }
     #submitSearch {
         float: right;
         margin-top: 10px;
         margin-bottom: 2px;
     }
-       #filter_header {
-               /*border-bottom: 1px solid #D4D4D4;*/
+    #filter_header {
+        /*border-bottom: 1px solid #D4D4D4;*/
+        font-family: Arial, Helvetica, sans-serif;
+        background: #B8C728;
+        width: auto;
+        bottom: 10px;
+        right: 2%;
+        height: 29px;
+        cursor: pointer;
+        background: #8A1E03;
+        border: 2px solid #FFF;
+        border-radius: 6px;
+        color: #FFF;
+        font-weight: bold;
+        text-transform: uppercase;
+        padding: 3px 8px;
+    }
+    #trail-form-name input[type=search] {
+        display: block;
+        width: 100%;
+        height: 26px;
+        margin-bottom: 4px;
+        padding: 3px;
+        background: #736357;
+        border: 1px solid #736357;
+        border-radius: 4px;
+        color: #FFF;
+        cursor: pointer;
+    }
+    #trail-form-name input[type=submit], #trail-form-ap input[type=submit], #trail-form-rc input[type=submit], #trail-form-am input[type=submit] {
         font-family: Arial, Helvetica, sans-serif;
-               background: #B8C728;
-               width: auto;
-               bottom: 10px;
-               right: 2%;
-               height: 29px;
-               cursor: pointer;
-               background: #8A1E03;
-               border: 2px solid #FFF;
-               border-radius: 6px;
-               color: #FFF;
-               font-weight: bold;
-               text-transform: uppercase;
-               padding: 3px 8px;
-       }
-       #trail-form-name input[type=search] {
-               display: block;
-               width: 100%;
-               height: 26px;
-               margin-bottom: 4px;
-               padding: 3px;
-               background: #736357;
-               border: 1px solid #736357;
-               border-radius: 4px;
-               color: #FFF;
-               cursor: pointer;
-       }
-       #trail-form-name input[type=submit], #trail-form-ap input[type=submit], #trail-form-rc input[type=submit], #trail-form-am input[type=submit] {
-               font-family: Arial, Helvetica, sans-serif;
-               position: absolute;
-               z-index: 25;
-               background: #B8C728;
-               width: auto;
-               bottom: 10px;
-               right: 2%;
-               height: 29px;
-               cursor: pointer;
-               background: #8A1E03;
-               border: 2px solid #FFF;
-               border-radius: 6px;
-               color: #FFF;
-               font-weight: bold;
-               text-transform: uppercase;
-               padding: 3px 8px;
-       }
-       #trail-form-am input[type=submit] {
-               right: 6px;
-               bottom: 10px;
-       }
-       #trail-form-ap select, #trail-form-rc select {
-               display: block;
-               width: 100%;
-               height: 26px;
-               margin-bottom: 4px;
-               padding: 3px;
-               background: #736357;
-               border: 1px solid #736357;
-               border-radius: 4px;
-               color: #FFF;
-               cursor: pointer;
-       }
-       #search_terms {
-               width: 100%;
-               float: left;
-               clear: right;
-               display: block;
-               margin-top: 16px;
-               margin-bottom: 4px;
-               color: #8A1E03;
-       }
+        position: absolute;
+        z-index: 25;
+        background: #B8C728;
+        width: auto;
+        bottom: 10px;
+        right: 2%;
+        height: 29px;
+        cursor: pointer;
+        background: #8A1E03;
+        border: 2px solid #FFF;
+        border-radius: 6px;
+        color: #FFF;
+        font-weight: bold;
+        text-transform: uppercase;
+        padding: 3px 8px;
+    }
+    #trail-form-am input[type=submit] {
+        right: 6px;
+        bottom: 10px;
+    }
+    #trail-form-ap select, #trail-form-rc select {
+        display: block;
+        width: 100%;
+        height: 26px;
+        margin-bottom: 4px;
+        padding: 3px;
+        background: #736357;
+        border: 1px solid #736357;
+        border-radius: 4px;
+        color: #FFF;
+        cursor: pointer;
+    }
+    #search_terms {
+        width: 100%;
+        float: left;
+        clear: right;
+        display: block;
+        margin-top: 16px;
+        margin-bottom: 4px;
+        color: #8A1E03;
+    }
 </style>
-<div
-    id="category-search">
-    <form
-        flexy:ignore="yes"
-        action="{formURL:h}"
-        id="trail-form-name"
-        method="get">
-        <input type="hidden" value="" name="_qf__SearchForm">
-        <input type="hidden" name="search" value="1">
-        <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
-        <div id="col1">
-            <div>Search by Name:</div>
-            <div class="fieldcontain">
-                <input
-                    type="search"
-                    name="member_name"
-                    value="{_REQUEST[member_name]}"
-                    placeholder="Name">
-                            <input
-                type="submit"
-                id="trail-search-form-name"
-                value="Search">
-            </div>
-        </div>
-    </form>
-    <form
-        flexy:ignore="yes"
-        action="{formURL:h}"
-        id="trail-form-rc"
-        method="get">
-        <input type="hidden" value="" name="_qf__SearchForm">
-        <input type="hidden" name="search" value="1">
-        <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
-        <div id="col2">
-            <div>Search by Regions &amp; Counties:</div>
-            <div flexy:if="regions" class="fieldcontain">
-                <select name="regionId" id="advSearchRegions">
-                    <option value="">Regions</option>
-                    {foreach:regions,id,name}
-                    <?php
-                    echo '<option value="'.$id.'"
-                    '.(($id == $_REQUEST['regionId'])?'selected':'')
-                    .'>'.$name.'</option>';
-                    ?>
-                    {end:}
-                </select>
-            </div>
-            <div flexy:if="counties" class="fieldcontain">
-                <select name="countyId" id="advSearchCounties">
-                    <option value="">Counties</option>
-                    {foreach:counties,id,name}
-                    <?php
-                    echo '<option value="'.$id.'"
-                    '.(($id == $_REQUEST['countyId'])?'selected':'')
-                    .'>'.$name.'</option>';
-                    ?>
-                    {end:}
-                </select>
-            </div>
-            <div flexy:if="cities" class="fieldcontain">
-                <select name="cityId" id="advSearchCities">
-                    <option value="">Cities</option>
-                    {foreach:cities,id,name}
-                    <?php
-                    echo '<option value="'.$id.'"
-                    '.(($id == $_REQUEST['cityId'])?'selected':'')
-                    .'>'.$name.'</option>';
-                    ?>
-                    {end:}
-                </select>
-                <input
-                type="submit"
-                id="trail-search-form-rc"
-                value="Search">
-            </div>
-        </div>
-    </form>
-    <form
-    flexy:ignore="yes"
-    action="{formURL:h}"
-    id="trail-form-ap"
-    method="get">
-        <input type="hidden" value="" name="_qf__SearchForm">
-        <input type="hidden" name="search" value="1">
-        <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
-        <div id="col3">
-            <div>Search by:</div>
-            <div flexy:if="destinations" class="fieldcontain">
-                <select name="destinationId" id="advSearchDest">
-                    <option value="">Destination</option>
-                    {foreach:destinations,id,name}
-                    <?php
-                    echo '<option value="'.$id.'"
-                    '.(($id == $_REQUEST['destinationId'])?'selected':'')
-                    .'>'.$name.'</option>';
-                    ?>
-                    {end:}
-                </select>
+<div id="accordian">
+    <h2>Search:</h2>
+    <div>
+        <form
+            flexy:ignore="yes"
+            action="{formURL:h}"
+            id="trail-form-name"
+            method="get">
+            <input type="hidden" value="" name="_qf__SearchForm">
+            <input type="hidden" name="search" value="1">
+            <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
+            <div id="col1">
+                <div>Search for Trail</div>
+                <div class="fieldcontain">
+                    <input
+                        type="search"
+                        name="member_name"
+                        value="{_REQUEST[member_name]}"
+                        placeholder="Name">
+                    <input
+                        type="submit"
+                        id="trail-search-form-name"
+                        value="Search">
+                </div>
             </div>
-            <div flexy:if="activities" class="fieldcontain">
-                <select name="activityId" id="advSearchActivities">
-                    <option value="">Activities</option>
-                    {foreach:activities,id,name}
-                    <?php
-                    echo '<option value="'.$id.'"
-                    '.(($id == $_REQUEST['activityId'])?'selected':'')
-                    .'>'.$name.'</option>';
-                    ?>
-                    {end:}
-                </select>
+        </form>
+        <form
+            flexy:ignore="yes"
+            action="{formURL:h}"
+            id="trail-form-rc"
+            method="get">
+            <input type="hidden" value="" name="_qf__SearchForm">
+            <input type="hidden" name="search" value="1">
+            <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
+            <div id="col2">
+                <div>Search by Location</div>
+                <div flexy:if="regions" class="fieldcontain">
+                    <select name="regionId" id="advSearchRegions">
+                        <option value="">Regions</option>
+                        {foreach:regions,id,name}
+                        <?php
+                        echo '<option value="'.$id.'"
+                        '.(($id == $_REQUEST['regionId'])?'selected':'')
+                        .'>'.$name.'</option>';
+                        ?>
+                        {end:}
+                    </select>
+                </div>
+                <div flexy:if="counties" class="fieldcontain">
+                    <select name="countyId" id="advSearchCounties">
+                        <option value="">Counties</option>
+                        {foreach:counties,id,name}
+                        <?php
+                        echo '<option value="'.$id.'"
+                        '.(($id == $_REQUEST['countyId'])?'selected':'')
+                        .'>'.$name.'</option>';
+                        ?>
+                        {end:}
+                    </select>
+                </div>
+                <div flexy:if="cities" class="fieldcontain">
+                    <select name="cityId" id="advSearchCities">
+                        <option value="">Cities</option>
+                        {foreach:cities,id,name}
+                        <?php
+                        echo '<option value="'.$id.'"
+                        '.(($id == $_REQUEST['cityId'])?'selected':'')
+                        .'>'.$name.'</option>';
+                        ?>
+                        {end:}
+                    </select>
+                    <input
+                        type="submit"
+                        id="trail-search-form-rc"
+                        value="Search">
+                </div>
             </div>
-            <div flexy:if="parks" class="fieldcontain">
-                <select name="parkId" id="advSearchParks">
-                    <option value="">Parks</option>
-                    {foreach:parks,id,name}
-                    <?php
-                    echo '<option value="'.$id.'"
-                    '.(($id == $_REQUEST['parkId'])?'selected':'')
-                    .'>'.$name.'</option>';
-                    ?>
-                    {end:}
-                </select>
-                <input
-                type="submit"
-                id="trail-search-form-rc"
-                value="Search">
+        </form>
+        <form
+            flexy:ignore="yes"
+            action="{formURL:h}"
+            id="trail-form-ap"
+            method="get">
+            <input type="hidden" value="" name="_qf__SearchForm">
+            <input type="hidden" name="search" value="1">
+            <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
+            <div id="col3">
+                <div>Search by:</div>
+                <div flexy:if="destinations" class="fieldcontain">
+                    <select name="destinationId" id="advSearchDest">
+                        <option value="">Destination</option>
+                        {foreach:destinations,id,name}
+                        <?php
+                        echo '<option value="'.$id.'"
+                        '.(($id == $_REQUEST['destinationId'])?'selected':'')
+                        .'>'.$name.'</option>';
+                        ?>
+                        {end:}
+                    </select>
+                </div>
+                <div flexy:if="activities" class="fieldcontain">
+                    <select name="activityId" id="advSearchActivities">
+                        <option value="">Activities</option>
+                        {foreach:activities,id,name}
+                        <?php
+                        echo '<option value="'.$id.'"
+                        '.(($id == $_REQUEST['activityId'])?'selected':'')
+                        .'>'.$name.'</option>';
+                        ?>
+                        {end:}
+                    </select>
+                </div>
+                <div flexy:if="parks" class="fieldcontain">
+                    <select name="parkId" id="advSearchParks">
+                        <option value="">Parks</option>
+                        {foreach:parks,id,name}
+                        <?php
+                        echo '<option value="'.$id.'"
+                        '.(($id == $_REQUEST['parkId'])?'selected':'')
+                        .'>'.$name.'</option>';
+                        ?>
+                        {end:}
+                    </select>
+                    <input
+                        type="submit"
+                        id="trail-search-form-rc"
+                        value="Search">
+                </div>
             </div>
-        </div>
-    </form>
-    <form
-        flexy:ignore="yes"
-        action="{formURL:h}"
-        id="trail-form-am"
-        method="get">
-        <input type="hidden" value="" name="_qf__SearchForm">
-        <input type="hidden" name="search" value="1">
-        <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
-        <?php
-        if ($dest = filter_var($_REQUEST['destinationId'], FILTER_VALIDATE_INT)) {
+        </form>
+    </div>
+    {if:search}
+    <h2>Filter Results:</h2>
+    <div>
+        <form
+            flexy:ignore="yes"
+            action="{formURL:h}"
+            id="trail-form-am"
+            method="get">
+            <input type="hidden" value="" name="_qf__SearchForm">
+            <input type="hidden" name="search" value="1">
+            <input type="hidden" name="catid" value="<?php echo $_REQUEST['catid'];?>">
+            <?php
+            if ($dest = filter_var($_REQUEST['destinationId'], FILTER_VALIDATE_INT)) {
             echo '<input type="hidden" name="destinationId" value="'.$dest.'">';
-        }
-        if ($activity = filter_var($_REQUEST['activityId'], FILTER_VALIDATE_INT)) {
+            }
+            if ($activity = filter_var($_REQUEST['activityId'], FILTER_VALIDATE_INT)) {
             echo '<input type="hidden" name="activityId" value="'.$activity.'">';
-        }
-        if ($park = filter_var($_REQUEST['parkId'], FILTER_VALIDATE_INT)) {
+            }
+            if ($park = filter_var($_REQUEST['parkId'], FILTER_VALIDATE_INT)) {
             echo '<input type="hidden" name="parkId" value="'.$park.'">';
-        }
-        if ($region = filter_var($_REQUEST['regionId'], FILTER_VALIDATE_INT)) {
+            }
+            if ($region = filter_var($_REQUEST['regionId'], FILTER_VALIDATE_INT)) {
             echo '<input type="hidden" name="regionId" value="'.$region.'">';
-        }
-        if ($county = filter_var($_REQUEST['countyId'], FILTER_VALIDATE_INT)) {
+            }
+            if ($county = filter_var($_REQUEST['countyId'], FILTER_VALIDATE_INT)) {
             echo '<input type="hidden" name="countyId" value="'.$county.'">';
-        }
-        if ($city = filter_var($_REQUEST['cityId'], FILTER_VALIDATE_INT)) {
+            }
+            if ($city = filter_var($_REQUEST['cityId'], FILTER_VALIDATE_INT)) {
             echo '<input type="hidden" name="cityId" value="'.$city.'">';
-        }
-        ?>
-        <div id="lowerbox">
-                <div id="filter_header">Filter Results:</div>
-                <div class="fieldcontain" id="filterContainer" style="display:none;">
+            }
+            ?>
+            <div id="lowerbox">
+                <div class="fieldcontain" id="filterContainer">
                     <div class="glm-chbx filterCol">
                         <h3>Activities</h3>
-                        {foreach:activities,id,name}
+                        {foreach:filterActivities,id,name}
                         <label for="acchbx-{id:h}">
                             <?php
                             echo '<input
                     </div>
                     <div class="glm-chbx filterCol">
                         <h3>Parks</h3>
-                        {foreach:parks,id,name}
+                        {foreach:filterParks,id,name}
                         <label for="pchbx-{id:h}">
                             <?php
                             echo '<input
                         {end:}
                     </div>
                     <input
-                type="submit"
-                id="trail-search-form-amenities"
-                value="Update">
+                        type="submit"
+                        id="trail-search-form-amenities"
+                        value="Update">
                 </div>
-
-        </div>
-    </form>
+            </div>
+        </form>
+    </div>
+    {end:}
 </div>
 <script>
     jQuery(document).ready(function() {
-        $("#filter_header").click(function(){
-            $("#filterContainer").slideToggle("slow", function(){
-                console.log('filter toggled');
-            });
+        $('#accordian').accordion({
+            header: "h2",
+            heightStyle: "auto"
         });
-        $("#advSearchRegions").change(function(){
+        $("#advSearchRegions").change(function() {
             updateCountySelect();
         });
         if ($("#advSearchRegions").val()) {
             updateCountySelect();
         }
         // update when activities changes
-        $("#advSearchActivities").change(function(){
+        $("#advSearchActivities").change(function() {
             updateParksSelect();
 //            updateDestinationSelect();
         });
 //            updateDestinationSelect();
         }
         //update when parks changes
-        $("#advSearchParks").change(function(){
+        $("#advSearchParks").change(function() {
             updateActivitySelect();
 //            updateDestinationSelect();
         });
 //            updateDestinationSelect();
         }
         // update when destination changes
-        $("#advSearchDest").change(function(){
+        $("#advSearchDest").change(function() {
             updateParksSelect();
             updateActivitySelect();
         });
             updateActivitySelect();
         }
         // Update city when the county changes
-        $("#advSearchCounties").change(function(){
+        $("#advSearchCounties").change(function() {
             updateCitySelect();
         });
         if ($("#advSearchCounties").val()) {
                 $("#advSearchParks").html('<option value="">Parks</option>');
                 $.each(data, function(index, park) {
                     var sel
-                        = (currentVal == park.category_id)
-                        ? ' selected'
-                        : '';
+                            = (currentVal == park.category_id)
+                            ? ' selected'
+                            : '';
                     $("#advSearchParks").append('<option value="' + park.category_id
-                            + '" '+sel+'>'
+                            + '" ' + sel + '>'
                             + park.name + '</option>');
                 });
             }
                 $("#advSearchActivities").html('<option value="">Activities</option>');
                 $.each(data, function(index, activity) {
                     var sel
-                        = (currentVal == activity.category_id)
-                        ? ' selected'
-                        : '';
+                            = (currentVal == activity.category_id)
+                            ? ' selected'
+                            : '';
                     $("#advSearchActivities").append('<option value="' + activity.category_id
-                            + '" '+sel+'>'
+                            + '" ' + sel + '>'
                             + activity.name + '</option>');
                 });
             }
                 if (data != null) {
                     $.each(data, function(index, destination) {
                         var sel
-                            = (currentVal == destination.category_id)
-                            ? ' selected'
-                            : '';
+                                = (currentVal == destination.category_id)
+                                ? ' selected'
+                                : '';
                         $("#advSearchDest").append('<option value="' + destination.category_id
-                                + '" '+sel+'>'
+                                + '" ' + sel + '>'
                                 + destination.name + '</option>');
                     });
                 }
         $.ajax({
             dataType: 'json',
             url: 'ajax/form.json',
-            data: {'search': 'counties','regionId': $("#advSearchRegions").val()},
+            data: {'search': 'counties', 'regionId': $("#advSearchRegions").val()},
             success: function(data) {
                 var currentVal = $("#advSearchCounties").val();
                 $("#advSearchCounties").html('<option value="">Counties</option>');
                 console.log('clear county select');
                 $.each(data, function(index, county) {
                     var sel
-                        = (currentVal == county.county_id)
-                        ? ' selected'
-                        : '';
+                            = (currentVal == county.county_id)
+                            ? ' selected'
+                            : '';
                     $("#advSearchCounties").append('<option value="' + county.county_id
-                            + '" '+sel+'>'
+                            + '" ' + sel + '>'
                             + county.county_name + '</option>');
                     console.log('add county ' + county.county_name + ' to list');
                 });
         $.ajax({
             dataType: 'json',
             url: 'ajax/form.json',
-            data: {'search': 'cities','countyId': $("#advSearchCounties").val()},
+            data: {'search': 'cities', 'countyId': $("#advSearchCounties").val()},
             success: function(data) {
                 var currentVal = $("#advSearchCities").val();
                 $("#advSearchCities").html('<option value="">Cities</option>');
                 console.log('clear city select');
                 $.each(data, function(index, city) {
                     var sel
-                        = (currentVal == city.city_id)
-                        ? ' selected'
-                        : '';
+                            = (currentVal == city.city_id)
+                            ? ' selected'
+                            : '';
                     $("#advSearchCities").append('<option value="' + city.city_id
-                            + '" '+sel+'>'
+                            + '" ' + sel + '>'
                             + city.city_name + '</option>');
                     console.log('add city ' + city.city_name + ' to list');
                 });