From: Laury GvR Date: Thu, 5 Mar 2015 21:55:13 +0000 (-0500) Subject: Slideshow has arrow navigation, dollarsign.js X-Git-Tag: v1.0.2^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=fb619539b1b5dc81c719bc544ec417a854c55251;p=web%2FGaylordGolfMecca.git Slideshow has arrow navigation, dollarsign.js --- diff --git a/Toolkit/Page.php b/Toolkit/Page.php index f88e3f8..c25bb2c 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -151,6 +151,7 @@ class Toolkit_Page $GLOBALS['topScripts'][] = MEDIA_BASE_URL . 'js/modernizr/modernizr.js'; $GLOBALS['bottomScripts'][] = JQUERY_CDN_JS; $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'js/app.js'; + $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'js/dollarsign.js'; $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/external.js'; if ($this->_catid == EVENT_PAGE) { $GLOBALS['styleSheets'][] = JQUERY_UI_CDN_CSS; diff --git a/Toolkit/RotatingImages/config.ini b/Toolkit/RotatingImages/config.ini index 6eb99bc..8860b63 100644 --- a/Toolkit/RotatingImages/config.ini +++ b/Toolkit/RotatingImages/config.ini @@ -2,7 +2,7 @@ ; Application Name applicationName = "Homepage Slideshow" useTitles = On -hasPrevNextLinks = Off +hasPrevNextLinks = On width = 720 height = 480 diff --git a/js/dollarsign.js b/js/dollarsign.js new file mode 100644 index 0000000..2d7a2e9 --- /dev/null +++ b/js/dollarsign.js @@ -0,0 +1,6 @@ +/* + * To avoid conflicts, Wordpress tends to prefer jQuery being used over $. + * As long as this file is included, no such conflicts should arise. Ensure it + * is called before other .js files using $. + */ +var $=jQuery.noConflict(); \ No newline at end of file