From b7ffadfc01d478bd46941e1f35b4d0fd7ea398c0 Mon Sep 17 00:00:00 2001
From: Leif Hanson <leif@gaslightmedia.com>
Date: Tue, 9 Jul 2013 12:53:16 +0000
Subject: [PATCH] Rearranged member detail fields and removed a couple fields
 from the member lists.

---
 Toolkit/Members/templates/memberDetail.tpl | 118 ++++++++-------------
 Toolkit/Members/templates/membersList.tpl  |  84 ++++++---------
 2 files changed, 81 insertions(+), 121 deletions(-)

diff --git a/Toolkit/Members/templates/memberDetail.tpl b/Toolkit/Members/templates/memberDetail.tpl
index a71c779..f491514 100644
--- a/Toolkit/Members/templates/memberDetail.tpl
+++ b/Toolkit/Members/templates/memberDetail.tpl
@@ -1,14 +1,12 @@
 <flexy:toJavascript
-    flexy:prefix="glm_"
-    base_url="base_url"
-    trip_planner_id="trip_planner_id"
-    catid="catid"
-    >
+	flexy:prefix="glm_"
+	base_url="base_url"
+	trip_planner_id="trip_planner_id"
+	catid="catid"
+	>
 </flexy:toJavascript>
 <div id="member-detail">
-
 	<div id="top_wrapper">
-
 		<div id="image-box" style="height: 1%; overflow: hidden;">
 			{if:addToLink}
 			<a id="add-{member_id}" class="list-add-link" rel="{member_id}" flexy:if="plink" href="{plink:h}">
@@ -21,15 +19,9 @@
 			{end:}
 			<div flexy:if="paypal"><a class="buy-map-link" href="{paypal:h}">Buy Map</a></div>
 			<div flexy:if="logo" id="logo-spot">
-                <a
-                    class="thickbox"
-                    title="{member_name}"
-                    id="member-logo1"
-                    href="{full_image:h}{logo:h}">
-				<img id="member-img-1"
-					 alt="Member Logo Image"
-					 src="{image_path:h}{logo:h}">
-                </a>
+				<a class="thickbox" title="{member_name}" id="member-logo1" href="{full_image:h}{logo:h}">
+					<img id="member-img-1" alt="Member Logo Image" src="{image_path:h}{logo:h}">
+				</a>
 			</div>
 			<div id="amenities_box" flexy:if="amenities">
 				<h2>Amenities</h2>
@@ -45,47 +37,21 @@
 					<a flexy:foreach="files,k,v" class="file-download pdf external" href="{v[href]:h}">{v[name]:h}</a>
 				</div>
 			</div>
-		</div>
-
+		</div><!--/#image-box-->
 		<div class="vcard">
 			<h1 class="fn org">{member_name:h}</h1>
 			<div class="adr">
 				<div flexy:if="hasMailingAddy" class="type">Street Address</div>
 				<div class="street-address">{street:h}</div>
-				<div>
-                    <div flexy:if="lat">Lat: {lat:h}</div>
-                    <div flexy:if="lon">Lon: {lon:h}</div>
-                    <!--
-					<span class="locality" flexy:if="city">{city:h},</span>
-					<span class="region" title="{state_name:h}">
-						{state_abbr:h}
-					</span>
-					<span class="postal-code">{zip:h}</span>
-                    -->
-				</div>
-				<div>
-					<span class="county" flexy:if="county_name">{county_name:h} County</span>
-				</div>
 			</div><!-- /.adr -->
-			<div>
-				<div flexy:if="distance"><b>Distance:</b> {distance:h}</div>
-				<div flexy:if="trailtype"><b>TrailType:</b> {trailtype:h}</div>
-				<div flexy:if="terrain"><b>Terrain:</b> {terrain:h}</div>
-				<div flexy:if="difficulty"><b>Difficulty:</b> {difficulty:h}</div>
-
-			</div>
 			<div flexy:if="phone" class="tel">
-				<span class="type">Phone</span>:
+				<span class="type"><b>Phone</b></span>:
 				<span class="value">{phone:h}</span>
 			</div>
 			<div flexy:if="toll_free" class="tel">
 				<span class="type">Toll Free</span>:
 				<span class="value">{toll_free:h}</span>
 			</div>
-			<div flexy:if="fax" class="tel">
-				<span class="type">Fax</span>:
-				<span class="value">{fax:h}</span>
-			</div>
 			<a flexy:if="email" class="email member-button" title="Email" href="mailto:{email:h}">Email</a>
 			<a flexy:if="url" title="Website" href="{url:h}" class="external member-button member-website" rel="{member_id}">Website</a>
 			<div id="google-div">
@@ -100,27 +66,39 @@
 					</form>
 				</div><!--/.customDialog -->
 			</div><!-- /#google-div -->
-
+			<div flexy:if="fax" class="tel">
+				<span class="type">Fax</span>:
+				<span class="value">{fax:h}</span>
+			</div>
+			<div style="padding-top:16px;clear:left;">
+				<span class="county" flexy:if="county_name">{county_name:h} County</span>
+			</div>
+			<div>
+				<div flexy:if="lat"><b>Lat:</b> {lat:h}</div>
+				<div flexy:if="lon"><b>Lon:</b> {lon:h}</div>
+			</div>
+			<div style="padding-top:16px;clear:left;">
+				<div flexy:if="distance"><b>Distance:</b> {distance:h}</div>
+				<div flexy:if="trailtype"><b>TrailType:</b> {trailtype:h}</div>
+				<div flexy:if="terrain"><b>Terrain:</b> {terrain:h}</div>
+				<div flexy:if="difficulty"><b>Difficulty:</b> {difficulty:h}</div>
+			</div>
 		</div><!-- /.vcard -->
-
-
 		<div id="trail_desc" flexy:if="description"><h1 style="font-size: 18px;">Trail Description</h1>{description:h}</div>
 	</div><!--/#top_wrapper-->
-
 	<div id="trail_guide_btn" flexy:if="guide" class="current">Guide</div>
 	<div id="trail_facilities_btn" flexy:if="facilities" class="">Facilities</div>
 	<div id="trail_directions_btn" flexy:if="directions" class="">Directions</div>
-    <div id="trail_hours_btn" flexy:if="hours" class="">Hours &amp; fees</div>
+	<div id="trail_hours_btn" flexy:if="hours" class="">Hours &amp; fees</div>
 	<div id="trail_information_btn" flexy:if="information" class="">Information</div>
-
 	<div id="trail_guide" flexy:if="guide">
 		<h2>Trail Guide: </h2>{guide:h}
 	</div>
 	<div id="trail_facilities" flexy:if="facilities">
 		<h2>Facilities: </h2>{facilities:h}
 	</div>
-    <div id="trail_hours" flexy:if="hours">
-        <h2>Hours &amp; Fees: </h2>{hours:h}
+	<div id="trail_hours" flexy:if="hours">
+		<h2>Hours &amp; Fees: </h2>{hours:h}
 	</div>
 	<div id="trail_directions" flexy:if="directions">
 		<h2>Directions: </h2>{directions:h}
@@ -128,28 +106,26 @@
 	<div id="trail_information" flexy:if="information">
 		<h2>Information: </h2>{information:h}
 	</div>
-
-
 	<div flexy:if="photos" id="photo-gallery">
-	<ul id="Gallery" class="gallery">
-		{foreach:photos,photo}
-		<li>
-			<a class="photoimg" href="{photo[id]:h}" title="{photo[alt]}" rel="{photo[description]}"></a>
-			<img src="{photo[src]}" alt="{photo[alt]}">
-			{if:photo[alt]}<p>{photo[alt]}</p>{end:}
-		</li>
-		{end:}
-	</ul>
+		<ul id="Gallery" class="gallery">
+			{foreach:photos,photo}
+			<li>
+				<a class="photoimg" href="{photo[id]:h}" title="{photo[alt]}" rel="{photo[description]}"></a>
+				<img src="{photo[src]}" alt="{photo[alt]}">
+				{if:photo[alt]}<p>{photo[alt]}</p>{end:}
+			</li>
+			{end:}
+		</ul>
 	</div>
 </div>
 <script type="text/javascript">
-	$(document).ready(function() {
-		$("#member-logo1").fancybox({
-            helpers: {
-                title: {
-                    type: 'float'
-                }
-            }
-        });
+$(document).ready(function() {
+	$("#member-logo1").fancybox({
+		helpers: {
+			title: {
+				type: 'float'
+			}
+		}
 	});
+});
 </script>
\ No newline at end of file
diff --git a/Toolkit/Members/templates/membersList.tpl b/Toolkit/Members/templates/membersList.tpl
index a3df725..a80d75b 100644
--- a/Toolkit/Members/templates/membersList.tpl
+++ b/Toolkit/Members/templates/membersList.tpl
@@ -4,81 +4,65 @@
 	base_url="base_url"
 	trip_planner_id="trip_planner_id"
 	catid="catid"
-    searchMapIconActive="searchMapIconActive"
+	searchMapIconActive="searchMapIconActive"
 	>
 </flexy:toJavascript>
-
-
 {if:numberedSet}
 <div class="results_output">{getResults(#Found %s Trails in %s page(s)#):h}</div>
 <div id="paging_wrapper">
 <div>Showing records {firstRecord} to {lastRecord}</div>
 {getPaging():h}
 </div>
-
 <div flexy:if="letters" class="business-first-letter">
 	<div>Narrow result by letter:</div>
 	<a flexy:foreach="letters,k,v" class="{v[class]:h}" href="{v[url]:h}">{k}</a>
 </div>
-
 <div flexy:foreach="recordSet,k,row" class="search-result-item vcard">
-
 	<div class="memberSR">
-
-
-        {if:row[logo]}
+		{if:row[logo]}
 		<img class="search-result-img" alt="{row[logo]}" src="{row[logo]}">
-        {end:}
-        {if:row[addToLink]}
+		{end:}
+		{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}">
 			Add To Trip Planner
-			<!--<img alt="Add to Your Travel List" src="baseurl/assets/addto.gif">-->
 		</a>
-        {else:}
+		{else:}
 		<a class="list-view-link" flexy:if="row[plink]" title="View Your Travel List" href="{row[plink]:h}">
 			View Trip Planner
-			<!--<img alt="View Your Travel List" src="baseurl/assets/viewTravelPlanner.gif">-->
 		</a>
-        {end:}
+		{end:}
 	</div><!-- /.memberSR -->
-		<h2 class="fn org"><a title="More Info" href="{row[url]:h}">{row[member_name]:h}</a></h2>
-		<div class="search-result-item-info">
-    {if:row[map_icon]}
-        <div class="map-link" rel="{row[map_icon][id]}">
-			<img class="search-result-map-img" src="{row[map_icon][icon]:h}">
-        </div>
-    {end:}
-			<div class="search-result-location adr">
-                <div flexy:if="row[distance]">Distance: {row[distance]}</div>
-                <div flexy:if="row[trailtype]">Trail Type: {row[trailtype]}</div>
-                <div flexy:if="row[terrain]">Terrain: {row[terrain]}</div>
-                <div flexy:if="row[difficulty]">Difficulty: {row[difficulty]}</div>
-                <div flexy:if="row[lat]">Lat: {row[lat]:h}</div>
-                <div flexy:if="row[lon]">Lon: {row[lon]:h}</div>
-                <!--
-				<div class="street-address">{row[street]:h}</div>
-				<span class="locality" flexy:if="city">{row[city]:h},</span>
-				<span class="region" title="{row[state]:h}">{row[state_abbr]:h}</span>
-				<span class="postal-code">{row[zip]:h}</span>
-                -->
-				<div flexy:if="row[phone]" class="search-result-phones">
-					<div class="tel">Phone: {row[phone]:h}</div>
+	<h2 class="fn org"><a title="More Info" href="{row[url]:h}">{row[member_name]:h}</a></h2>
+	<div class="search-result-item-info">
+		{if:row[map_icon]}
+			<div class="map-link" rel="{row[map_icon][id]}">
+				<img class="search-result-map-img" src="{row[map_icon][icon]:h}">
+			</div>
+		{end:}
+		<div class="search-result-location adr">
+			<div flexy:if="row[distance]">Distance: {row[distance]}</div>
+			<div flexy:if="row[trailtype]">Trail Type: {row[trailtype]}</div>
+			<div flexy:if="row[terrain]">Terrain: {row[terrain]}</div>
+			<div flexy:if="row[difficulty]">Difficulty: {row[difficulty]}</div>
+			<!--<div flexy:if="row[lat]">Lat: {row[lat]:h}</div>
+			<div flexy:if="row[lon]">Lon: {row[lon]:h}</div>
+			<div flexy:if="row[phone]" class="search-result-phones">
+				<div class="tel">Phone: {row[phone]:h}</div>
+			</div>-->
+			<div style="height: 1%; overflow: hidden; margin-top: 0.5em;">
+				<div flexy:if="row[member_contact_email]" class="search-result-email" style="float: left; margin-right: 15px;">
+					<a title="Email" href="mailto:{row[member_contact_email]:h}">Email</a>
+				</div>
+				<div flexy:if="row[website]" class="search-result-website" style="float: left; margin-right: 15px;">
+					<a target="_blank" title="Website" href="{row[website]:h}" rel="{row[member_id]}" class="member-website">Website</a>
 				</div>
-				<div style="height: 1%; overflow: hidden; margin-top: 0.5em;">
-					<div flexy:if="row[member_contact_email]" class="search-result-email" style="float: left; margin-right: 15px;">
-						<a title="Email" href="mailto:{row[member_contact_email]:h}">Email</a>
-					</div>
-					<div flexy:if="row[website]" class="search-result-website" style="float: left; margin-right: 15px;">
-						<a target="_blank" title="Website" href="{row[website]:h}" rel="{row[member_id]}" class="member-website">Website</a>
-					</div>
-					<div flexy:if="row[address]" class="search-result-directions" style="float: left; margin-right: 15px;">
-						<a target="_blank" title="Driving Directions" href="{row[address]:h}">Driving Directions</a>
-					</div>
+				<div flexy:if="row[address]" class="search-result-directions" style="float: left; margin-right: 15px;">
+					<a target="_blank" title="Driving Directions" href="{row[address]:h}">Driving Directions</a>
 				</div>
 			</div>
-		</div>
-	</div>
-
+		</div><!--/.search-result-location-->
+	</div><!--/.search-result-item-info-->
+</div><!--/.search-result-item-->
 {getPaging():h}
 <!--<div flexy:if="letters" class="business-first-letter">
 	<div>Narrow result by letter:</div>
-- 
2.17.1