From 19cc83a948aa550d155619834ecaa7f85de011f8 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 12 Jun 2013 18:13:39 +0000 Subject: [PATCH] Add fields to the member templates Adding the fields to the search result template. Correction on the detail variable for distance so it now shows. Output the extra fields and comment out the address part. --- Toolkit/Members/ProfilePage.php | 3 +- Toolkit/Members/SearchList.php | 142 ++++++++++----------- Toolkit/Members/templates/memberDetail.tpl | 4 +- Toolkit/Members/templates/membersList.tpl | 33 ++--- 4 files changed, 82 insertions(+), 100 deletions(-) diff --git a/Toolkit/Members/ProfilePage.php b/Toolkit/Members/ProfilePage.php index 75a5a57..5984a21 100644 --- a/Toolkit/Members/ProfilePage.php +++ b/Toolkit/Members/ProfilePage.php @@ -506,9 +506,10 @@ class Toolkit_Members_ProfilePage $page->email = $row['member_contact_email']; $page->paypal = $row['paypal']; $page->reviewed = $row['reviewed']; - $page->distance = $row['discance']; + $page->distance = $row['distance']; $page->trailtype = $row['trailtype']; $page->terrain = $row['terrain']; + $page->difficulty = $row['difficulty']; $page->dogs = $row['dogs']; $page->guide = $row['guide']; $page->facilities = $row['facilities']; diff --git a/Toolkit/Members/SearchList.php b/Toolkit/Members/SearchList.php index 70724a5..5c38e45 100644 --- a/Toolkit/Members/SearchList.php +++ b/Toolkit/Members/SearchList.php @@ -181,131 +181,122 @@ class Toolkit_Members_SearchList extends Toolkit_FlexyDataGridBuilder */ protected function configureColumns() { - $logo = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Logo', 'logo', 'logo', null, null, array(&$this, 'logo') - ); - $this->addColumn($logo); - - $name = new Structures_DataGrid_Column( + )); + + $this->addColumn(new Structures_DataGrid_Column( + 'Reviewed', + 'reviewed', + 'reviewed' + )); + + $this->addColumn(new Structures_DataGrid_Column( + 'Distance', + 'distance', + 'distance' + )); + + $this->addColumn(new Structures_DataGrid_Column( + 'Type', + 'trailtype', + 'trailtype' + )); + + $this->addColumn(new Structures_DataGrid_Column( + 'Terrain', + 'terrain', + 'terrain' + )); + + $this->addColumn(new Structures_DataGrid_Column( + 'Difficulty', + 'difficulty', + 'difficulty' + )); + + $this->addColumn(new Structures_DataGrid_Column( + 'Dogs', + 'dogs', + 'dogs' + )); + + $this->addColumn(new Structures_DataGrid_Column( 'Member Name', 'member_name', 'member_name' - ); - $this->addColumn($name); + )); - $memberContactEmail = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Email', 'member_contact_email', 'member_contact_email' - ); - $this->addColumn($memberContactEmail); + )); - $drivingDirections = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Address', 'address', 'address', null, null, array(&$this, 'drivingDirections') - ); - $this->addColumn($drivingDirections); + )); - $street = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Street', 'street', 'street' - ); - $this->addColumn($street); + )); - $city = new Structures_DataGrid_Column( + $this->addColumn( new Structures_DataGrid_Column( 'City', 'city', 'city', null, null, array(&$this, 'city') - ); - $this->addColumn($city); + )); - $state = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'State', 'state', 'state' - ); - $this->addColumn($state); + )); - $stateAbbr = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'State Abbr', 'state_abbr', 'state_abbr' - ); - $this->addColumn($stateAbbr); + )); - $zip = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Zip', 'zip', 'zip' - ); - $this->addColumn($zip); + )); - $phone = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Phone', 'phone', 'phone', null, null, array(&$this, 'phone') - ); - $this->addColumn($phone); + )); - $url = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'URL', 'url', 'url', null, null, array(&$this, 'url') - ); - $this->addColumn($url); - - $reservationId = new Structures_DataGrid_Column( - 'Reservation Id', - 'reservation_id', - 'reservation_id' - ); - $this->addColumn($reservationId); - - $numRooms = new Structures_DataGrid_Column( - 'Number of Rooms', - 'num_rooms', - 'num_rooms' - ); - $this->addColumn($numRooms); - - $yearRound = new Structures_DataGrid_Column( - 'Year Round', - 'year_round', - 'year_round', - null, - null, - array(&$this, 'yearRound') - ); - $this->addColumn($yearRound); - - $hasHotelInfo = new Structures_DataGrid_Column( - null, - 'has_hotel_info', - 'has_hotel_info', - null, - null, - array(&$this, 'hasHotelInfo') - ); - $this->addColumn($hasHotelInfo); + )); if (defined("MEMBER_SESSION_LIST") && MEMBER_SESSION_LIST) { $this->addColumn( @@ -331,32 +322,29 @@ class Toolkit_Members_SearchList extends Toolkit_FlexyDataGridBuilder ) ); - $member_id = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'member_id', 'member_id', 'member_id' - ); - $this->addColumn($member_id); + )); - $website = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'Website', 'website', 'website', null, null, array(&$this, 'website') - ); - $this->addColumn($website); + )); - $mapIcon = new Structures_DataGrid_Column( + $this->addColumn(new Structures_DataGrid_Column( 'map_icon', 'map_icon', 'map_icon', null, null, array(&$this, 'mapIcon') - ); - $this->addColumn($mapIcon); + )); } diff --git a/Toolkit/Members/templates/memberDetail.tpl b/Toolkit/Members/templates/memberDetail.tpl index fa1b034..89ec2c1 100644 --- a/Toolkit/Members/templates/memberDetail.tpl +++ b/Toolkit/Members/templates/memberDetail.tpl @@ -37,7 +37,7 @@
Terrain: {terrain:h}
Dogs: {dogs:h}
Difficulty: {difficulty:h}
-
{paypal:h}
+
Phone: @@ -65,7 +65,9 @@
+ +
Buy Map
{if:addToLink} Add to Trip Planner diff --git a/Toolkit/Members/templates/membersList.tpl b/Toolkit/Members/templates/membersList.tpl index 256274e..a1f40a7 100644 --- a/Toolkit/Members/templates/membersList.tpl +++ b/Toolkit/Members/templates/membersList.tpl @@ -26,20 +26,20 @@
-{if:row[logo]} + {if:row[logo]} {row[logo]} -{end:} -{if:row[addToLink]} + {end:} + {if:row[addToLink]} Add To Trip Planner -{else:} + {else:} View Trip Planner -{end:} + {end:}

{row[member_name]:h}

@@ -49,10 +49,17 @@
{end:}
+
Distance: {row[distance]}
+
Trail Type: {row[trailtype]}
+
Terrain: {row[terrain]}
+
Difficulty: {row[difficulty]}
+
Dogs Allowed: {row[dogs]}
+
Phone: {row[phone]:h}
@@ -68,22 +75,6 @@
- - - - -
- - Online Reservations - - {if:row[num_rooms]} - Number of Rooms: {row[num_rooms]:h} - {end:} -
- Open Year Round: {row[year_round]:h} -
-- 2.17.1