From dad440b2065857811c415a3bd4aba2a76ce7fefb Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 27 Nov 2018 11:40:08 -0500 Subject: [PATCH] Front list account box and email display added --- assets/email_edit.png | Bin 0 -> 756 bytes assets/help.png | Bin 0 -> 786 bytes assets/hiker.png | Bin 0 -> 2422 bytes assets/map.png | Bin 0 -> 804 bytes assets/printer.png | Bin 0 -> 731 bytes css/front.css | 63 ++++++++++++++++++++++++++++++++ models/front/itinerary/list.php | 17 ++++++++- views/front/itinerary/list.html | 51 ++++++++++++++------------ 8 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 assets/email_edit.png create mode 100644 assets/help.png create mode 100644 assets/hiker.png create mode 100644 assets/map.png create mode 100644 assets/printer.png create mode 100644 css/front.css diff --git a/assets/email_edit.png b/assets/email_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..244f04ae15277e4b20ca9c99f627beadecf23c18 GIT binary patch literal 756 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 literal 0 HcmV?d00001 diff --git a/assets/map.png b/assets/map.png new file mode 100644 index 0000000000000000000000000000000000000000..f90ef25ec7f1cb0fdae38d9fe2d9edeee9928ef1 GIT binary patch literal 804 zcmV+<1Ka$GP)mbpQb1@7I~O+ue5CWtZi#AZox@gcwb{Xkx^Rf;Ty8yn6DWhJV4kC*wg94<7Vt zlteKm5+jKLV^qM1yt2HO4YZw^&a^Wfzb_m+@y40e_0^+M6ajz$03Zl}fU=sqfA9W} z@#^~O(a%3QB{YI^J_A4y)M^1_vjjn1H`Mc5t@6>y50A!C6seTL>`UqQ7p$DgY@K|> zQm^as;HM{#Qwj<3}(>R-AM4&+cd0t49%y2X`UaCBJg8YmB)K#uA{Z>9n zOp8>WCg#&r06`o8oz6gaIn`fY2FR)ssCr@3rc|5f%`bIJO$zbt__PK3gH51Sff`H}0ZWac9&q~*( zO@qNscV0VSU%X#sYO9)Qx4M=(eR(m}UFhondELHSnO2hr&mMO3 zv6gmw!P2y#u0c!?LPO88NyxOTj>XWm>*77F&55fo9Z?)iynObdfA;SdwVRl$W~G3* zEGt!2+1T-%ja32&!XdoMS_mM#IQK#{6D_nvjYu`GlvO3XdE)qYJJ;7^msfbTI z9jQ^EwMRD5xNEm*sJPjH^k)@gXT@kl5ii6#6jNXX`Yb0kVgq(zut?ZfbRr+DS= z>q{33dTpWN$tl6c7nxE)4Qur1GCxuUnp5Y z5HK(>u&W4&EXz<>UtfnPivJ`O3Zb4K8yl-}7K;Uh5XR!-B2uXo6E#Dr&Ck!D<$0b5 zXEK?PNF*3;w;Rc15`MqGDN4rSaGd2kJ3GNmOiaM%^D*ppJL2&;mX?;95{t!PwOY^e z?d|R0=pOKTy$qMj1$rk8qtS@b(NQ*LUtb@(y1JlNtJzsS-`3U!Ze(Pn>hXBkfzr6} z{3Vv(2AlG1;RQN6I#_mYZVs)jt>6p>!_3go(6&ye1Mdo>SRyz&A^1T#%t=UROW6Bf zz^9CeqErU&3`3<-Da~6HQ^UW&yCT)$Cu literal 0 HcmV?d00001 diff --git a/css/front.css b/css/front.css new file mode 100644 index 0000000..369311e --- /dev/null +++ b/css/front.css @@ -0,0 +1,63 @@ +#tpAccountBox { + background: #eee; + float: left; + width: 98%; + margin-top: 20px; + margin-bottom: 20px; + margin-left: 1%; + margin-right: 1%; + border: 1px solid #CCC; + border-radius: 8px; + padding: 10px 20px; +} +#tpLoggedInAs { + display: block; + position: relative; + min-height: 73px; + background: url("../assets/hiker.png") 0 100% no-repeat; +} +#tpLoggedInAs #tpLoggedInAsLabel { + float: left; + margin: 0 0 0 16%; +} +#tpLoggedInAs #tpLoggedInAsUser { + float: left; + clear: left; + margin: 8px 0 0 16%; + font-weight: bold; + color: #790000; + word-wrap: break-word; +} +#tpLogOutLink { + display: block; + position: absolute; + bottom: 4px; + right: 0; +} +#tpPlannerNav ul { + list-style-type: none; + margin: 0; + padding: 10px; +} +#tpPlannerNav ul li { + list-style-type: none; + margin: 0; + padding: 0; +} +#tpPlannerNav 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 { + background-image: url("../assets/email_edit.png"); +} +#tpPlannerNav #tpPrintList a { + background-image: url("../assets/printer.png"); +} +#tpPlannerNav #tpHelp a { + background-image: url("../assets/help.png"); +} \ No newline at end of file diff --git a/models/front/itinerary/list.php b/models/front/itinerary/list.php index e4f11f9..2cc457e 100755 --- a/models/front/itinerary/list.php +++ b/models/front/itinerary/list.php @@ -77,6 +77,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio $states = $membersNoEmails = $formErrors = array(); + $userInfo = array(); if ( isset( $_SESSION['travel-list'] ) ) { foreach ( $_SESSION['travel-list'] as $item ) { @@ -93,6 +94,11 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio if ( isset( $_SESSION['itinerary-auth'] ) && filter_var( $_SESSION['itinerary-auth'], FILTER_VALIDATE_INT ) ) { $userLoggedIn = true; } + + if ( isset( $_SESSION['username'])) { + + + } switch ( $option ) { case 'addAccount': @@ -208,7 +214,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio ); } } - } + } global $wp; $tripPlannerPage = get_permalink( $this->config['settings']['itinerary_page'] ); // Redirect to trip planner page @@ -270,6 +276,14 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio } break; case 'list': + $userInfo['email'] = $this->wpdb->get_var( + $this->wpdb->prepare( + "SELECT email + FROM " . GLM_MEMBERS_ITINERARY_PLUGIN_DB_PREFIX . "user + WHERE id = %s", + filter_var( $_SESSION['itinerary-auth'], FILTER_VALIDATE_INT ) + ) + ); $view = 'list.html'; default: break; @@ -285,6 +299,7 @@ class GlmMembersFront_itinerary_list // extends GlmMembersFront_events_baseActio 'userLoggedIn' => $userLoggedIn, 'formErrors' => $formErrors, 'createSuccess' => $createSuccess, + 'userInfo' => $userInfo, ); error_reporting(E_ALL ^ E_NOTICE); diff --git a/views/front/itinerary/list.html b/views/front/itinerary/list.html index de7b24b..2248310 100644 --- a/views/front/itinerary/list.html +++ b/views/front/itinerary/list.html @@ -11,46 +11,50 @@

{$settings.itinerary_page_content}

-
+
{if !$userLoggedIn} -
- -
-

Sign In:

- - - - - - - Forgot your Password? -
-
+
+
+ +
+

Sign In:

+ + + + + + + Forgot your Password? +
+
+
-
+

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 ...

-
+
+ Logged in as + {$userInfo.email} + Log Out +
{/if} {if $members} -
+ {/if} -
+
@@ -77,6 +81,7 @@
{foreach $members as $data}
+
/breadcrumbs/../{$data.member_name}

{$data.member_name}

-- 2.17.1