From 82d89f2dbbfd93d89f6e01ad52fe7b7be17fc0f5 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 10 Dec 2018 16:28:18 -0500
Subject: [PATCH] Update the appearance of the view add planner buttons.

Match what was on uptravel.com old site
---
 assets/trip_add.png             | Bin 0 -> 989 bytes
 assets/trip_view.png            | Bin 0 -> 995 bytes
 css/front.css                   |  75 +++++++++++++++++++++++++++++++-
 js/front.js                     |   9 +++-
 models/front/itinerary/list.php |   6 +--
 setup/frontHooks.php            |  21 ++++++---
 views/front/itinerary/list.html |   6 +--
 7 files changed, 102 insertions(+), 15 deletions(-)
 create mode 100755 assets/trip_add.png
 create mode 100755 assets/trip_view.png

diff --git a/assets/trip_add.png b/assets/trip_add.png
new file mode 100755
index 0000000000000000000000000000000000000000..f517595fdc1da801b6c24aadb97401800d0ccefd
GIT binary patch
literal 989
zcmV<310wv1P)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|7IZ~ebVG7wVRUJ4ZXi@?ZDjy4FfTAO
zFEKMf&?xHw0010xMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK<zwc|Db00T8i
zL_t(Ijir=bNRv?*$NziFY0cHFEX`W&BhB_v6s2ZM%4T9}DScg-g&-6yb|EAb*rW(c
zx)5z$jJmKQB0?~OQbcpv2Mcw&bme@f)$+|+Sr%p4o-X8FPDzV?aBj}|^FI&gdCp%z
zMBph_F986=<>VQ?y{y60(Wdw|G$i29L&Rc=(yZ#4yHsBB_{ya+e*c7{4*($G&5G4a
zpvyNT_B?2+@%FKjMcUO^k&*`Gh9u02Scstk4&6-+aNN0tSN2wf%awzQ^&8WzmWpQH
z3?`KnCY2PmrKfh6BxrmWbF#_X%hF_c9CkAANTHH=wXe4H)NYeX3L=8Qq>@6HZ%DLV
zzif@!q!*+X79nKTY*g0Oqr9pb?X27X3|hGiN3t@Jt53$r@HgBjIE)u9Hd?!9pU!Hj
zXcm}MQY=(yKTHz}CHpU4!_fC1&>uY(U@{)9T!y-{rx7&#6;}@(0D!^%&W<o9E+^0E
z?Q=^qOeL5m6izT2zEkaAJngI-`lH7nnmZ4vg++MBx+HNqc}9kFb{0xkuSK|G87k}Q
zC#`5K?W`M>b@h<0S%)aiO7wR*3Ymd!XT+-QI{^UYRn=2i1j6eTiAi|tdLDsdjf}p$
z_Yx72aBBt$w`NS*NuIIVSN0Yv*2st<@?mD!oPVllJYkDRhn)d{Pu%POGW*!?0RT)7
z2^CYX?U6v6kqxa}hIZDC;M7dNaBLUH?gOJE0s!6CMudpP#LSOg&b8dU4)XbMBr8xn
z6};YMZ9up(nqwlDtIob`eS(4RXUNqj`)`{Htz3p&eKKCO*wEkQKxC}?jQ<A+MIy<r
zb7p)G3jXUKAPE)0ynPFTX3QLX?XZV20HEBEw2gCi((RMSA)3y>W-f!Jz&N2wty~66
zfe|)y8SwEvt{&WvPj5I<B<Rus07UdVHR9Di%ic`#bhQ0(zI;DN$aTMw&Sxf5NrEOY
zHHgR`in@G5V$VZs4cGNlvLGfF(Mg-JA|(yt`4RZ=vJbB2COGTwf^&8vGFCOXY~!Z1
zdl$+cP6$UJFlpbhE`!HmR}6ptowUKBVv16)?3pK5`jgfli~xQCf@03^{9(`p00000
LNkvXXu0mjfHB7vO

literal 0
HcmV?d00001

diff --git a/assets/trip_view.png b/assets/trip_view.png
new file mode 100755
index 0000000000000000000000000000000000000000..26e8d4cb5f38b3a0f3c89f2e569b57b7bda83af6
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|7IZ~ebVG7wVRUJ4ZXi@?ZDjy4FfTAO
zFEKMf&?xHw0010xMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK<zwc|Db00TQo
zL_t(IjiuDxPm^~T#_{h{8y?h7I-t^0hx7%y)ulLfP-);`tjff7BTHln3F8mY6r$10
zWfrr<M2<!@W{Fv1P#5<Ww~hl{hfxU%qID7-XlZFW><dL~wI(zqJUiH)#+Pld>^lA3
zzt4RiU4kS@$m#Ob0ARPbxMyY}JMZ7WW6EYTg8VLuDoL+j7c4F=J32J<bx-c!!C?Rd
z8SC=YP*>mX2u=+5J$MjNuUYdt)^%@THgBe&poB+{k^};S+`0V=Q&YDoE-p`*%r)Bw
zE}t08VV(ok0Mt5Kcii-Q&uBD8;l1}irKso?{wdMu7(f2-8R_)2v|*#`!z+WQzv((S
z{3ljd-|o0R^8J9tQZH<6>}2`!m+1BNbL6a-(a>ZLu^A2QYIf1)Y+!yq%Xi;?LL~C5
zwCT+c>IN>K7!*7Qswpjf?V(bcr*8Y`D4Dr=oO|~_gFGLb(SWb}5K6Lqb-EKE6^)L+
ztgzc#+_SU4tKW5fj8d7mC<HJXn#8$xKPpurTN^t`Cc|pGy~VAF#{>Jy%Bs+44D|Z?
z7lob%dwu<^UArE=-byTXcb_7Wn9x?OZvx=RS?`h{Ir6;OY-f5pq*Z3K8Np!KnA--B
zJ-0Y2Ho9{2<%UgMxbTIbkR*u}E7bq#qUTdss0Tm+kWMH57nVxJ0Z@vfN(zVlLRHl}
z*o+27Lz9S&t|cKhqXB@4z!gMMB`HcuO!1q3FOsytuI8m7a^(3y;3}(E8{-PC&e9!;
z+#-<((&lW)ZClD!ZO#TFkz2%K<LGpj!^_O3)R0d1YDYMHBfqlJLF?OF`1!h@#KY9T
zLcZ=p<mcsa>SPB61tqDmv5U<L0CUCWrg;3G)c4b2R*K6QIo8AR-R>8zv>6Q?-|c4P
zSP#;Cno}n`c>Fji8BNvO;jaqn^3+i4Xx-tz;XPASR3>a|+Jjzi{oAV+78VGFu5td{
z=VUT7(i<C|Y7H3!sH<;xgo4-lVzIkwt+s-SN(WYJ1FKePn4O&>I5EWd_$A`;duX+m
zR7GX&wo4bky!t{p!m~}AOon$xqraKv=APu5Ha~x*R9b2cYBc4!rj;RpKLEd!UW0}_
R@wxy2002ovPDHLkV1fb6(FFhi

literal 0
HcmV?d00001

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 '<pre>$_SESSION: ' . print_r( $_SESSION, true ) . '</pre>';
-        // echo '<pre>$_SESSION: ' . print_r( $members, true ) . '</pre>';
+        // echo '<pre>$members: ' . print_r( $members, true ) . '</pre>';
 
         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(
-            '<button class="glm-planner-button" data-id="%d" data-alt="%s" data-baseurl="%s" data-refpage="%s" data-view="%s" data-loadpage="%s">%s</button>',
+        return $content . sprintf(
+            '<div class="memberSR">
+                <a class="glm-planner-button %s" data-id="%d" data-alt="%s" data-baseurl="%s" data-refpage="%s" data-view="%s" data-loadpage="%s">
+                    <span class="%s trip-alt-text">%s</span>
+                    <span class="trip2">Trip Planner</span>
+                </a>
+            </div>',
+            $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}
         <div id="map_info_{$data.id}" class="glm-hidden">
-            {if $settings.list_show_detail_link && !$data.has_no_profile.value}
+            {if $settings.list_show_detail_link && !$data.has_no_profile}
                 <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$data.member_slug}/{if $settings.enable_multiple_profiles}{$data.id}/{/if}">{$data.member_name}</a>
             {else}
                 <strong>{$data.member_name}</strong>
@@ -102,9 +102,9 @@
                     {/foreach}
                 </div>
                 <a href="#" class="dashicons dashicons-trash glm-itinerary-delete" data-id="{$data.member}" data-baseurl="{$baseurl}" style="float:right;" alt="Remove"></a>
-                
+
                 <h4 class="glm-itinerary-item-title">
-                {if $settings.list_show_detail_link && !$data.has_no_profile.value}
+                {if $settings.list_show_detail_link && !$data.has_no_profile}
                     <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$data.member_slug}/{if $settings.enable_multiple_profiles}{$data.id}/{/if}">
                         {$data.member_name}
                     </a>
-- 
2.17.1