From f547ec95718c2d67d6651154b4bac8ec6ab6a94f Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 10 Mar 2015 16:40:36 -0400 Subject: [PATCH] Added fancybox. Video & Gallery styles and config set up --- Toolkit/Page.php | 10 +- Toolkit/Photos/application.ini | 2 +- .../Photos/templates/photoGalleryWrapper.html | 199 +- Toolkit/Photos/templates/photos.html | 2 + Toolkit/Videos/libjs/thickbox.js | 14 + css/app.css | 2 +- fancybox/blank.gif | Bin 0 -> 43 bytes fancybox/fancybox_loading.gif | Bin 0 -> 3866 bytes fancybox/fancybox_overlay.png | Bin 0 -> 1003 bytes fancybox/fancybox_sprite.png | Bin 0 -> 1362 bytes fancybox/helpers/fancybox_buttons.png | Bin 0 -> 1080 bytes fancybox/helpers/jquery.fancybox-buttons.css | 96 + fancybox/helpers/jquery.fancybox-buttons.js | 121 + fancybox/helpers/jquery.fancybox-media.js | 196 ++ fancybox/helpers/jquery.fancybox-thumbs.css | 54 + fancybox/helpers/jquery.fancybox-thumbs.js | 162 ++ fancybox/jquery.fancybox.css | 249 +++ fancybox/jquery.fancybox.js | 1983 +++++++++++++++++ fancybox/jquery.fancybox.pack.js | 45 + scss/_structure.scss | 360 +++ static/63.phtml | 6 + 21 files changed, 3294 insertions(+), 207 deletions(-) create mode 100644 Toolkit/Videos/libjs/thickbox.js create mode 100644 fancybox/blank.gif create mode 100644 fancybox/fancybox_loading.gif create mode 100644 fancybox/fancybox_overlay.png create mode 100644 fancybox/fancybox_sprite.png create mode 100644 fancybox/helpers/fancybox_buttons.png create mode 100644 fancybox/helpers/jquery.fancybox-buttons.css create mode 100644 fancybox/helpers/jquery.fancybox-buttons.js create mode 100644 fancybox/helpers/jquery.fancybox-media.js create mode 100644 fancybox/helpers/jquery.fancybox-thumbs.css create mode 100644 fancybox/helpers/jquery.fancybox-thumbs.js create mode 100644 fancybox/jquery.fancybox.css create mode 100644 fancybox/jquery.fancybox.js create mode 100644 fancybox/jquery.fancybox.pack.js create mode 100644 static/63.phtml 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 @@ - -