From: Laury GvR Date: Tue, 27 Nov 2018 21:00:50 +0000 (-0500) Subject: Add itinerary breadcrumbs, list styles, links & data X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=d648878db1b6426e6270e785e1c839f4a00ca00d;p=WP-Plugins%2Fglm-member-db-itinerary.git Add itinerary breadcrumbs, list styles, links & data --- diff --git a/css/front.css b/css/front.css index 369311e..a503682 100644 --- a/css/front.css +++ b/css/front.css @@ -1,4 +1,4 @@ -#tpAccountBox { +#glm-itinerary-account-container { background: #eee; float: left; width: 98%; @@ -10,17 +10,17 @@ border-radius: 8px; padding: 10px 20px; } -#tpLoggedInAs { +#glm-itinerary-logged-in-as { display: block; position: relative; min-height: 73px; background: url("../assets/hiker.png") 0 100% no-repeat; } -#tpLoggedInAs #tpLoggedInAsLabel { +#glm-itinerary-logged-in-as .glm-itinerary-label { float: left; margin: 0 0 0 16%; } -#tpLoggedInAs #tpLoggedInAsUser { +#glm-itinerary-logged-in-as .glm-itinerary-email { float: left; clear: left; margin: 8px 0 0 16%; @@ -28,36 +28,78 @@ color: #790000; word-wrap: break-word; } -#tpLogOutLink { +#glm-itinerary-account-container .glm-itinerary-logout-link { display: block; position: absolute; bottom: 4px; right: 0; } -#tpPlannerNav ul { +@media only screen and (max-width: 640px) { + #glm-itinerary-account-container .glm-itinerary-logout-link { + position: relative; + float: right; + clear: left; + } +} +#glm-itinerary-planner-nav ul { list-style-type: none; margin: 0; padding: 10px; } -#tpPlannerNav ul li { +#glm-itinerary-planner-nav ul li { list-style-type: none; margin: 0; padding: 0; } -#tpPlannerNav ul li a { +#glm-itinerary-planner-nav ul li a { display: block; padding: 5px 0 5px 26px; background-position: 4px center; background-repeat: no-repeat; - margin-bottom: 3px; border: 1px solid #eee; } -#tpPlannerNav #tpMoreInfo a { +#glm-itinerary-planner-nav .more-info a { background-image: url("../assets/email_edit.png"); } -#tpPlannerNav #tpPrintList a { +#glm-itinerary-planner-nav .print-list a { background-image: url("../assets/printer.png"); } -#tpPlannerNav #tpHelp a { +#glm-itinerary-planner-nav .help a { background-image: url("../assets/help.png"); +} + +.glm-itinerary-list { + max-width: 1000px; + margin: 20px auto; +} +.glm-itinerary-list .glm-itinerary-list-item { + display: block; + width: 98%; + margin: 3px 1% 14px 1%; + border: 0; + border-radius: 8px; + -webkit-box-shadow: 0px 0px 5px rgba(0,0,0,0.3); + -moz-box-shadow: 0px 0px 5px rgba(0,0,0,0.3); + box-shadow: 0px 0px 5px rgba(0,0,0,0.3); + background: #F5F5F5; + padding: 10px; + position: relative; + clear: both; + height: 1%; + overflow: hidden; +} +.glm-itinerary-list .glm-itinerary-list-item .glm-itinerary-breadcrumbs { + width: 85%; +} +.glm-itinerary-list .glm-itinerary-list-item .glm-itinerary-item-title { + font-size: 18px; + margin: 0; + width:90%; + clear: none; +} +.glm-itinerary-delete { + display: block; + position: absolute; + top: 6px; + right: 6px; } \ No newline at end of file diff --git a/models/front/itinerary/list.php b/models/front/itinerary/list.php index 2cc457e..77d9c3c 100755 --- a/models/front/itinerary/list.php +++ b/models/front/itinerary/list.php @@ -71,21 +71,28 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio $formContents = ''; $userLoggedIn = false; $createSuccess = false; - $members = - $membersWithEmails = - $memberEmails = - $states = - $membersNoEmails = + $members = array(); + $membersWithEmails = array(); + $memberEmails = array(); + $states = array(); + $membersNoEmails = array(); $formErrors = array(); $userInfo = array(); if ( isset( $_SESSION['travel-list'] ) ) { foreach ( $_SESSION['travel-list'] as $item ) { - $members[] = apply_filters( 'glm-member-get-memberinfo-data', '', $item['ref_dest'] ); + $members[$item['ref_dest']] = apply_filters( 'glm-member-get-memberinfo-data', '', $item['ref_dest'] ); + + // Page slug is the page the itinerary was saved from + $itineraryPageSlug = $item['page_slug']; + $members[$item['ref_dest']]['page_slug'] = $itineraryPageSlug; + // Page slug components are used to compose breadcrumb trails back to the page + $members[$item['ref_dest']]['page_slug_components'] = explode( '/' , $itineraryPageSlug ); } } - + // echo '
$_SESSION: ' . print_r( $_SESSION, true ) . '
'; + // echo '
$_SESSION: ' . print_r( $members, true ) . '
'; if ( isset( $_REQUEST['option'] ) ) { $option = filter_var( $_REQUEST['option'], FILTER_SANITIZE_STRING ); diff --git a/views/front/itinerary/list.html b/views/front/itinerary/list.html index 2248310..5a13f74 100644 --- a/views/front/itinerary/list.html +++ b/views/front/itinerary/list.html @@ -11,10 +11,10 @@

{$settings.itinerary_page_content}

-
+
{if !$userLoggedIn} -
+
@@ -30,26 +30,26 @@
-
+

If you do not have an account

Create Account
By creating an account, you'll be able to save your list for later.
{else} -
- Logged in as - {$userInfo.email} - Log Out +
+ Logged in as + {$userInfo.email} + Log Out
{/if} {if $members} -
+ {/if} @@ -69,26 +69,61 @@ {foreach $members as $data}
- {$data.member_name} + {if $settings.list_show_detail_link && !$data.has_no_profile.value} + {$data.member_name} + {else} + {$data.member_name} + {/if}
- {$data.addr1}
- {$data.city}, {$data.state} {$data.zip}
+ {if $data.addr1}{$data.addr1}
{/if} + {if $data.city}{$data.city}{/if}{if $data.city && ($data.state || $data.zip)},{/if}{if $data.state} {$data.state}{/if}{if $data.zip} {$data.zip}{/if}
{if $data.phone}Phone: {apply_filters('glm_associate_phone_filter', $data.phone)}
{/if} {if $data.url}Website
{/if}
{/foreach} -
+
{foreach $members as $data} -
-
/breadcrumbs/../{$data.member_name}
+
+
+ {$breadcrumbTrail = ""} + {foreach $data.page_slug_components as $breadcrumb} + {$breadcrumbTrail = $breadcrumbTrail|cat:$breadcrumb|cat:"/"} + {$breadcrumbID = get_page_by_path( $breadcrumbTrail )} + {$breadcrumbTitle = get_the_title( $breadcrumbID )} + + / + + + {$breadcrumbTitle} + + {/foreach} +
-

{$data.member_name}

-
- {$data.addr1}
- {$data.city}, {$data.state} {$data.zip}
- {if $data.phone}Phone: {apply_filters('glm_associate_phone_filter', $data.phone)}
{/if} - {if $data.url}Website
{/if} + +

+ {if $settings.list_show_detail_link && !$data.has_no_profile.value} + + {$data.member_name} + + {else} + {$data.member_name} + {/if} +

+
+
+ {if $data.addr1} +
{$data.addr1}
+ {/if} + {if $data.city || $data.state || $data.zip} + {if $data.city}{$data.city}{/if}{if $data.city && ($data.state || $data.zip)},{/if}{if $data.state} {$data.state}{/if}{if $data.zip} {$data.zip}{/if} + {/if} +
+
+ {if $data.phone}Phone: {apply_filters('glm_associate_phone_filter', $data.phone)}
{/if} + {if $data.email}Email: {$data.email}
{/if} + {if $data.url}Website
{/if} +
{/foreach}