From: Steve Sutton Date: Mon, 10 Dec 2018 21:28:18 +0000 (-0500) Subject: Update the appearance of the view add planner buttons. X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=82d89f2dbbfd93d89f6e01ad52fe7b7be17fc0f5;p=WP-Plugins%2Fglm-member-db-itinerary.git Update the appearance of the view add planner buttons. Match what was on uptravel.com old site --- diff --git a/assets/trip_add.png b/assets/trip_add.png new file mode 100755 index 0000000..f517595 Binary files /dev/null and b/assets/trip_add.png differ diff --git a/assets/trip_view.png b/assets/trip_view.png new file mode 100755 index 0000000..26e8d4c Binary files /dev/null and b/assets/trip_view.png differ diff --git a/css/front.css b/css/front.css index 893d370..69bd7f5 100644 --- a/css/front.css +++ b/css/front.css @@ -38,7 +38,7 @@ } #glm-itinerary-login form label { font-size: 14px; -} +} #glm-itinerary-login .glm-error { color: red; display: block; @@ -157,8 +157,79 @@ top: 6px; right: 6px; } +.glm-member-list-container { + display: inline-block; +} /* .glm-member-list-container .glm-planner-button { position: absolute; top: 10px; right: 10px; -} */ \ No newline at end of file +} */ + +div.memberSR { + position: relative; + float: right; + width: 100%; + margin-left: 3%; + margin-bottom: 14px; +} +div.memberSR a.list-add-link { + float: right; + clear: right; + width: 100%; + margin-top: 6px; + margin-left: 25px; + padding-left: 25px; + background: url("../assets/trip_add.png") 0 0 no-repeat; +} +div.memberSR a.list-add-link span.add_trip1 { + display: block; + float: left; + width: 100%; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + text-transform: uppercase; + text-decoration: underline; + line-height: 12px; + color: #790000; + margin: 0; + padding: 0; +} +div.memberSR a.list-add-link span.trip2 { + display: block; + float: left; + width: 100%; + font-family: "Times New Roman", Times, serif; + font-size: 22px; + line-height: 22px; + color: #065A6C; + margin: 0; + padding: 0; +} +div.memberSR a.list-add-link:hover span.trip2 { + color: #790000; +} +div.memberSR a.list-view-link { + float: right; + clear: right; + width: 100%; + margin-top: 6px; + margin-left: 0%; + margin-bottom: 10px; + padding-left: 25px; + min-height: 19px; + background: url("../assets/trip_view.png") 0 0 no-repeat; +} +div.memberSR a.list-view-link span.view_trip1 { + display: block; + float: left; + width: 100%; + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + text-transform: uppercase; + text-decoration: underline; + line-height: 12px; + color: #7C7B4E; + margin: 0; + padding: 0; +} diff --git a/js/front.js b/js/front.js index cca2642..6c2e403 100644 --- a/js/front.js +++ b/js/front.js @@ -1,6 +1,7 @@ /* Js file for Itinerary */ -jQuery('.glm-planner-button').on('click', function(){ +jQuery('.glm-planner-button').on('click', function(e){ + e.preventDefault(); var member_id = jQuery(this).data('id'); var alt_text = jQuery(this).data('alt'); var base_url = jQuery(this).data('baseurl'); @@ -22,7 +23,11 @@ jQuery('.glm-planner-button').on('click', function(){ dataType: 'html', success: function(){ button.data('view', '1'); - button.text( alt_text ); + button.find('.trip-alt-text').removeClass('add_trip1'); + button.find('.trip-alt-text').addClass('view_trip1'); + button.removeClass('list-add-link'); + button.addClass('list-view-link'); + button.find('.trip-alt-text').html( alt_text ); } }); } else { diff --git a/models/front/itinerary/list.php b/models/front/itinerary/list.php index d947c16..2af3458 100755 --- a/models/front/itinerary/list.php +++ b/models/front/itinerary/list.php @@ -91,14 +91,14 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio $members[$item['ref_dest']]['page_slug_components'] = explode( '/' , $itineraryPageSlug ); } } - + // echo '
$_SESSION: ' . print_r( $_SESSION, true ) . '
'; - // echo '
$_SESSION: ' . print_r( $members, true ) . '
'; + // echo '
$members: ' . print_r( $members, true ) . '
'; if ( isset( $_REQUEST['option'] ) ) { $option = filter_var( $_REQUEST['option'], FILTER_SANITIZE_STRING ); } - + if ( isset( $_SESSION['itinerary-auth'] ) && filter_var( $_SESSION['itinerary-auth'], FILTER_VALIDATE_INT ) ) { $userLoggedIn = true; } diff --git a/setup/frontHooks.php b/setup/frontHooks.php index 7bd5f2f..de2ac60 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -26,28 +26,39 @@ * *** Also note that parameters will be in the context of the main front controller constructor. *** */ add_filter( - 'glm-member-db-front-members-list-memberDataBelow', + 'glm-member-db-front-members-list-memberImageTop', function( $content, $member_id ){ global $wp, $config; if ( isset( $_SESSION['travel-list'][$member_id] ) && $_SESSION['travel-list'][$member_id] ) { + $class = 'list-view-link'; + $span1 = 'view_trip1'; $label = $config['settings']['view_label']; $alt_label = $config['settings']['add_label']; - $is_view = '1'; + $is_view = '1'; } else { + $class = 'list-add-link'; + $span1 = 'add_trip1'; $label = $config['settings']['add_label']; $alt_label = $config['settings']['view_label']; - $is_view = ''; + $is_view = ''; } $load_page = get_the_permalink( $config['settings']['itinerary_page'] ); $current_slug = add_query_arg( array(), $wp->request ); - return sprintf( - '', + return $content . sprintf( + '
+ + %s + Trip Planner + +
', + $class, $member_id, htmlspecialchars( $alt_label, ENT_QUOTES, 'UTF-8' ), get_bloginfo( 'url' ), $current_slug, $is_view, $load_page, + $span1, $label ); }, diff --git a/views/front/itinerary/list.html b/views/front/itinerary/list.html index ae0def9..19bfa0b 100644 --- a/views/front/itinerary/list.html +++ b/views/front/itinerary/list.html @@ -71,7 +71,7 @@ {foreach $members as $data}
- {if $settings.list_show_detail_link && !$data.has_no_profile.value} + {if $settings.list_show_detail_link && !$data.has_no_profile} {$data.member_name} {else} {$data.member_name} @@ -102,9 +102,9 @@ {/foreach}
- +

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