From 842b5f12ab8f33f7f0012cca3a4deab102a3b5fc Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 15 Jul 2013 18:03:00 +0000
Subject: [PATCH] update form output

Take the top section out of the accordian.
Put submit button and use jqueryui button on it.
---
 Toolkit/Members/libjs/userSearchForm.js       |  3 +-
 Toolkit/Members/templates/userSearchForm.html | 79 ++++++++++---------
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/Toolkit/Members/libjs/userSearchForm.js b/Toolkit/Members/libjs/userSearchForm.js
index 9d9e601..bbd7456 100644
--- a/Toolkit/Members/libjs/userSearchForm.js
+++ b/Toolkit/Members/libjs/userSearchForm.js
@@ -1,3 +1,4 @@
 $(function() {
-    $( "#accordion" ).accordion();
+    $("#accordion").accordion();
+    $("#trail-search-form").button();
 });
\ No newline at end of file
diff --git a/Toolkit/Members/templates/userSearchForm.html b/Toolkit/Members/templates/userSearchForm.html
index ff3a111..3810d8e 100644
--- a/Toolkit/Members/templates/userSearchForm.html
+++ b/Toolkit/Members/templates/userSearchForm.html
@@ -17,46 +17,44 @@
     <form
         flexy:ignore="yes"
         action="{formURL:h}"
+        id="trail-form"
         method="post">
         <input type="hidden" name="search" value="1">
+        <div class="fieldcontain">
+            <label class="fieldHdr">Trail Name</label>
+            <input
+                type="search"
+                name="member_name"
+                placeholder="trail name"
+                value="{_POST[member_name]}">
+        </div>
+        <div flexy:if="regions" class="fieldcontain">
+            <label class="fieldHdr">Regions</label>
+            <select name="regionId">
+                <option value="">-- Select --</option>
+                {foreach:regions,id,name}
+                <?php
+                echo '<option value="'.$id.'"
+                '.(($id == $_POST['regionId'])?'selected':'')
+                .'>'.$name.'</option>';
+                ?>
+                {end:}
+            </select>
+        </div>
+        <div flexy:if="counties" class="fieldcontain">
+            <label class="fieldHdr">Counties</label>
+            <select name="countyId">
+                <option value="">-- Select --</option>
+                {foreach:counties,id,name}
+                <?php
+                echo '<option value="'.$id.'"
+                '.(($id == $_POST['countyId'])?'selected':'')
+                .'>'.$name.'</option>';
+                ?>
+                {end:}
+            </select>
+        </div>
         <div id="accordion">
-            <h3><a href="#">Search for Trails</a></h3>
-            <div>
-                <div class="fieldcontain">
-                    <label class="fieldHdr">Trail Name</label>
-                    <input
-                        type="search"
-                        name="member_name"
-                        placeholder="trail name"
-                        value="{_POST[member_name]}">
-                </div>
-                <div flexy:if="regions" class="fieldcontain">
-                    <label class="fieldHdr">Regions</label>
-                    <select name="regionId">
-                        <option value="">-- Select --</option>
-                        {foreach:regions,id,name}
-                        <?php
-                        echo '<option value="'.$id.'"
-                        '.(($id == $_POST['region'])?'selected':'')
-                        .'>'.$name.'</option>';
-                        ?>
-                        {end:}
-                    </select>
-                </div>
-                <div flexy:if="counties" class="fieldcontain">
-                    <label class="fieldHdr">Counties</label>
-                    <select name="countyId">
-                        <option value="">-- Select --</option>
-                        {foreach:counties,id,name}
-                        <?php
-                        echo '<option value="'.$id.'"
-                        '.(($id == $_POST['county'])?'selected':'')
-                        .'>'.$name.'</option>';
-                        ?>
-                        {end:}
-                    </select>
-                </div>
-            </div>
 
             <h3><a href="#">Activities</a></h3>
             <div>
@@ -130,10 +128,13 @@
                     </div>
                 </div>
             </div>
-
         </div>
         <div class="fieldcontain">
-            <input class="submit" type="submit" value="Search">
+            <input
+                style="float:left;margin-bottom: 15px;"
+                type="submit"
+                id="trail-search-form"
+                value="search">
         </div>
     </form>
 </div>
\ No newline at end of file
-- 
2.17.1