From 990186b9d395e998284a7a651dbf10ebe5aec701 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Mon, 8 Jul 2013 15:49:36 +0000 Subject: [PATCH] update member profile pages Adding fancybox to the logo. Adding lat lon to profile page. Removing uneeded js files --- Toolkit/Members.php | 8 ++-- Toolkit/Members/ProfilePage.php | 9 ++++ Toolkit/Members/ProfileWriter.php | 4 -- Toolkit/Members/templates/memberDetail.tpl | 49 +++++++++------------- Toolkit/Membersonly.php | 8 ++-- Toolkit/Page.php | 2 +- 6 files changed, 38 insertions(+), 42 deletions(-) diff --git a/Toolkit/Members.php b/Toolkit/Members.php index 65591eb..3a91e93 100644 --- a/Toolkit/Members.php +++ b/Toolkit/Members.php @@ -342,16 +342,16 @@ class Toolkit_Members . 'libjs/jqueryui/1.8.13/js/jquery-ui-1.8.13.custom.min.js'; $GLOBALS['bottomScripts'][] = BASE_URL . 'Toolkit/Members/libjs/edit-member.js'; - $GLOBALS['bottomScripts'][] - = GLM_APP_BASE_URL . 'gallery/thickbox-3.1.1.js'; +// $GLOBALS['bottomScripts'][] +// = GLM_APP_BASE_URL . 'gallery/thickbox-3.1.1.js'; $GLOBALS['bottomScripts'][] = GLM_APP_BASE_URL . 'libjs/cluetip/jquery.cluetip.js'; $GLOBALS['bottomScripts'][] = GLM_APP_BASE_URL . 'libjs/cluetip/lib/jquery.hoverIntent.js'; $GLOBALS['bottomScripts'][] = GLM_APP_BASE_URL . 'libjs/cluetip/lib/jquery.bgiframe.min.js'; - $GLOBALS['styleSheets'][] - = GLM_APP_BASE_URL . 'gallery/thickbox.css'; +// $GLOBALS['styleSheets'][] +// = GLM_APP_BASE_URL . 'gallery/thickbox.css'; $GLOBALS['styleSheets'][] = GLM_APP_BASE_URL . 'libjs/cluetip/jquery.cluetip.css'; $GLOBALS['topScripts'][] diff --git a/Toolkit/Members/ProfilePage.php b/Toolkit/Members/ProfilePage.php index 5984a21..18b4d66 100644 --- a/Toolkit/Members/ProfilePage.php +++ b/Toolkit/Members/ProfilePage.php @@ -383,6 +383,7 @@ class Toolkit_Members_ProfilePage $this->profile =& $page; $page->image_path = $this->imagePath; + $page->full_image = ORIGINAL; $page->base_url = BASE_URL; $page->glm_base_url = GLM_APP_BASE_URL; @@ -496,6 +497,14 @@ class Toolkit_Members_ProfilePage } else { $page->city = $row['city']; } + if ($row['lat']) { + $latitude = Toolkit_Common::f2LatLon($row['lat'], 'Lat', 'DMS', 2); + $page->lat = $latitude['text']; + } + if ($row['lon']) { + $longitude = Toolkit_Common::f2LatLon($row['lon'], 'Lat', 'DMS', 2); + $page->lon = $longitude['text']; + } $page->county_name = $row['county_name']; $page->state_name = $row['state_name']; $page->state_abbr = $row['state_abbr']; diff --git a/Toolkit/Members/ProfileWriter.php b/Toolkit/Members/ProfileWriter.php index 32d84ca..d7b2fa1 100644 --- a/Toolkit/Members/ProfileWriter.php +++ b/Toolkit/Members/ProfileWriter.php @@ -199,14 +199,10 @@ class Toolkit_Members_ProfileWriter implements SplSubject */ public function toHtml(Toolkit_Members_ProfilePage $profile) { - $GLOBALS['bottomScripts'][] - = GLM_APP_BASE_URL . 'gallery/thickbox-3.1.1.js'; $GLOBALS['bottomScripts'][] = BASE_URL . 'Toolkit/Members/libjs/business-detail.js'; $GLOBALS['styleSheets'][] = BASE_URL . 'Toolkit/Members/css/member.css'; - $GLOBALS['styleSheets'][] = GLM_APP_BASE_URL . 'gallery/gallery.css'; - $GLOBALS['styleSheets'][] = GLM_APP_BASE_URL . 'gallery/thickbox.css'; $profileCache = "Member-{$profile->getMemberId()}"; $out = $this->_cache->get($profileCache, 'Profile'); diff --git a/Toolkit/Members/templates/memberDetail.tpl b/Toolkit/Members/templates/memberDetail.tpl index be1b5f2..d655cb3 100644 --- a/Toolkit/Members/templates/memberDetail.tpl +++ b/Toolkit/Members/templates/memberDetail.tpl @@ -9,9 +9,15 @@
+ Member Logo Image +
@@ -21,6 +27,8 @@
Street Address
{street:h}
+
Lat: {lat:h}
+
Lon: {lon:h}
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/Toolkit/Membersonly.php b/Toolkit/Membersonly.php index 01cb174..ecb5541 100644 --- a/Toolkit/Membersonly.php +++ b/Toolkit/Membersonly.php @@ -262,10 +262,10 @@ class Toolkit_Membersonly = GLM_APP_BASE_URL . 'ckeditor/current/ckeditor.js'; $GLOBALS['bottomScripts'][] = BASE_URL . 'Toolkit/Members/libjs/edit-member.js'; - $GLOBALS['bottomScripts'][] - = GLM_APP_BASE_URL . 'gallery/thickbox-3.1.1.js'; - $GLOBALS['styleSheets'][] - = GLM_APP_BASE_URL . 'gallery/thickbox.css'; +// $GLOBALS['bottomScripts'][] +// = GLM_APP_BASE_URL . 'gallery/thickbox-3.1.1.js'; +// $GLOBALS['styleSheets'][] +// = GLM_APP_BASE_URL . 'gallery/thickbox.css'; $mr = new Toolkit_Members_EditMemberOnlyInfo( $dbh, diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 64830bc..dab6f3a 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -146,7 +146,7 @@ class Toolkit_Page $GLOBALS['styleSheets'][] = $this->baseURL . 'fancybox/jquery.fancybox.css'; // Resources needed for every page. //$GLOBALS['topScripts'][] = JQUERY_CDN_JS; - $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/jquery/jquery-1.7.2.min.js'; + $GLOBALS['topScripts'][] = $this->glmAppBaseURL . 'libjs/jquery/jquery-1.7.2.min.js'; $GLOBALS['bottomScripts'][] = $this->baseURL . 'photoswipe/lib/klass.min.js'; $GLOBALS['bottomScripts'][] = $this->baseURL . 'photoswipe/code.photoswipe.jquery-3.0.5.js'; $GLOBALS['bottomScripts'][] = $this->baseURL . "fancybox/jquery.fancybox.js"; -- 2.17.1