From: Laury GvR Date: Tue, 10 Mar 2015 20:40:36 +0000 (-0400) Subject: Added fancybox. Video & Gallery styles and config set up X-Git-Tag: v1.1.5^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f547ec95718c2d67d6651154b4bac8ec6ab6a94f;p=web%2FGaylordGolfMecca.git Added fancybox. Video & Gallery styles and config set up --- diff --git a/Toolkit/Page.php b/Toolkit/Page.php index c5395b1..3555573 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -158,6 +158,8 @@ class Toolkit_Page $GLOBALS['bottomScripts'][] = JQUERY_CDN_JS; $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'js/app.js'; $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'js/dollarsign.js'; + $GLOBALS['styleSheets'][] = $this->mediaBaseURL . 'fancybox/jquery.fancybox.css'; + $GLOBALS['bottomScripts'][] = $this->mediaBaseURL . "fancybox/jquery.fancybox.js"; $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/external.js'; if ($this->_catid == EVENT_PAGE) { $GLOBALS['styleSheets'][] = JQUERY_UI_CDN_CSS; @@ -273,13 +275,6 @@ class Toolkit_Page private function _video() { - return false; - //$GLOBALS['styleSheets'][] - // = GLM_APP_BASE_URL . 'gallery/colorbox/colorbox.css'; - //$GLOBALS['bottomScripts'][] - // = GLM_APP_BASE_URL . 'libjs/plugins/colorbox/1.3.15/jquery.colorbox-min.js'; - //$GLOBALS['bottomScripts'][] - // = BASE_URL . 'Toolkit/Videos/libjs/thickbox.js'; $GLOBALS['bottomScripts'][] = BASE_URL . 'Toolkit/Videos/libjs/videos.js'; $dbh = Toolkit_Database::getInstance(); @@ -601,7 +596,6 @@ class Toolkit_Page if ( defined("VIDEOS") && VIDEOS - && $this->_catid == HOME_ID ) { $this->_video(); } diff --git a/Toolkit/Photos/application.ini b/Toolkit/Photos/application.ini index 778c54a..d576e1c 100644 --- a/Toolkit/Photos/application.ini +++ b/Toolkit/Photos/application.ini @@ -9,7 +9,7 @@ application.application = "Photos/Controllers" ; This option also may need other new fields not added yet to the contact table settings.mediaExclusive = Off settings.photoNameSearch = Off -settings.slideShowOption = On +settings.slideShowOption = Off ; default Flexy Options for this application flexyOptions.templateDir = BASE "Toolkit/Photos/templates" diff --git a/Toolkit/Photos/templates/photoGalleryWrapper.html b/Toolkit/Photos/templates/photoGalleryWrapper.html index e48bb57..51fa167 100644 --- a/Toolkit/Photos/templates/photoGalleryWrapper.html +++ b/Toolkit/Photos/templates/photoGalleryWrapper.html @@ -1,198 +1,3 @@ - -