From 55a70ae2445be2cb6c6694e8b6e1a064ad4829bb Mon Sep 17 00:00:00 2001 From: Leif Hanson Date: Fri, 7 Jun 2013 19:14:04 +0000 Subject: [PATCH] Fix for Add/View Trip Planner Toggle JS. --- Toolkit/Members/css/member.css | 2 +- Toolkit/Members/libjs/travel-list.js | 4 ++-- Toolkit/Page.php | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Toolkit/Members/css/member.css b/Toolkit/Members/css/member.css index 3fd9ede..274aa9f 100755 --- a/Toolkit/Members/css/member.css +++ b/Toolkit/Members/css/member.css @@ -771,7 +771,7 @@ ul#plannerNav a:hover { text-decoration: none; } .pages a:hover, .business-first-letter a:hover { - border-color: #2E6AB1; + border-color: #F60; } .business-first-letter { float: left; diff --git a/Toolkit/Members/libjs/travel-list.js b/Toolkit/Members/libjs/travel-list.js index 98e50d8..6ae5add 100644 --- a/Toolkit/Members/libjs/travel-list.js +++ b/Toolkit/Members/libjs/travel-list.js @@ -23,8 +23,8 @@ var TravelList = type: "GET", url: glm_base_url + "trip-planner-list/" + member_id + "/" + glm_catid + "/", success: function(msg) { - var viewLink = ''; - viewLink += ''; + var viewLink = 'View Trip Planner'; + //viewLink += ''; viewLink += ''; $("#add-"+member_id).replaceWith(viewLink); TravelList.updateList(msg); diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 6b8bd86..3201fad 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -145,7 +145,8 @@ class Toolkit_Page $GLOBALS['styleSheets'][] = $this->glmAppBaseURL . 'libjs/plugins/photoswipe/photoswipe.css'; $GLOBALS['styleSheets'][] = $this->baseURL . 'fancybox/jquery.fancybox.css'; // Resources needed for every page. - $GLOBALS['topScripts'][] = JQUERY_CDN_JS; + //$GLOBALS['topScripts'][] = JQUERY_CDN_JS; + $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/jquery/jquery-1.7.2.min.js'; $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/plugins/photoswipe/lib/klass.min.js'; $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/plugins/photoswipe/code.photoswipe.jquery-3.0.5.js'; $GLOBALS['bottomScripts'][] = $this->baseURL . "fancybox/jquery.fancybox.js"; -- 2.17.1