From d68ab44a82399e82be6c60514be20567d3474720 Mon Sep 17 00:00:00 2001 From: Leif Hanson Date: Fri, 14 Jun 2013 13:12:34 +0000 Subject: [PATCH] Update to new photo gallery and member photo gallery. --- .htaccess | 10 +- Toolkit/Members/templates/memberDetail.tpl | 13 +- Toolkit/Page.php | 4 +- Toolkit/Photos/templates/photos.html | 10 +- photoswipe/MIT-license.txt | 21 + photoswipe/code.photoswipe-3.0.5.js | 6690 +++++++++++++++++ photoswipe/code.photoswipe-3.0.5.min.js | 172 + photoswipe/code.photoswipe.jquery-3.0.5.js | 6425 ++++++++++++++++ .../code.photoswipe.jquery-3.0.5.min.js | 164 + .../code.photoswipe.jquery-3.0.5_bak.js | 6425 ++++++++++++++++ photoswipe/error.gif | Bin 0 -> 3431 bytes photoswipe/icons.png | Bin 0 -> 3346 bytes photoswipe/icons@2x.png | Bin 0 -> 5445 bytes photoswipe/lib/klass.min.js | 8 + photoswipe/loader.gif | Bin 0 -> 3208 bytes .../noutil/code.photoswipe.noutil-3.0.5.js | 4344 +++++++++++ .../code.photoswipe.noutil-3.0.5.min.js | 119 + .../code.photoswipe.noutil.jquery-3.0.5.js | 4344 +++++++++++ ...code.photoswipe.noutil.jquery-3.0.5.min.js | 119 + photoswipe/photoswipe.css | 172 + photoswipe/photoswipe.js | 273 + styles.css | 48 +- 22 files changed, 29319 insertions(+), 42 deletions(-) create mode 100755 photoswipe/MIT-license.txt create mode 100755 photoswipe/code.photoswipe-3.0.5.js create mode 100755 photoswipe/code.photoswipe-3.0.5.min.js create mode 100755 photoswipe/code.photoswipe.jquery-3.0.5.js create mode 100755 photoswipe/code.photoswipe.jquery-3.0.5.min.js create mode 100755 photoswipe/code.photoswipe.jquery-3.0.5_bak.js create mode 100755 photoswipe/error.gif create mode 100755 photoswipe/icons.png create mode 100755 photoswipe/icons@2x.png create mode 100755 photoswipe/lib/klass.min.js create mode 100755 photoswipe/loader.gif create mode 100755 photoswipe/noutil/code.photoswipe.noutil-3.0.5.js create mode 100755 photoswipe/noutil/code.photoswipe.noutil-3.0.5.min.js create mode 100755 photoswipe/noutil/code.photoswipe.noutil.jquery-3.0.5.js create mode 100755 photoswipe/noutil/code.photoswipe.noutil.jquery-3.0.5.min.js create mode 100755 photoswipe/photoswipe.css create mode 100755 photoswipe/photoswipe.js diff --git a/.htaccess b/.htaccess index 8fccc5c..acd7267 100644 --- a/.htaccess +++ b/.htaccess @@ -14,13 +14,13 @@ ErrorDocument 404 /404.html RewriteEngine On AddDefaultCharset utf-8 -RewriteBase /www.michigantrailmaps.com/ +RewriteBase /~leif/www.michigantrailmaps.com/ # Redirect non-www to www -RewriteCond %{ENV:GLM_HOST_ID} PRODUCTION -RewriteCond %{HTTP_HOST} !^www\. [NC] -RewriteCond %{HTTP_HOST} !^demo\. [NC] -RewriteRule ^(.*)$ http://www.%{HTTP_HOST}/$1 [R=301,L] +#RewriteCond %{ENV:GLM_HOST_ID} PRODUCTION +#RewriteCond %{HTTP_HOST} !^www\. [NC] +#RewriteCond %{HTTP_HOST} !^demo\. [NC] +#RewriteRule ^(.*)$ http://www.%{HTTP_HOST}/$1 [R=301,L] # CacheBusting RewriteCond %{REQUEST_URI} v/[0-9\.]+/ diff --git a/Toolkit/Members/templates/memberDetail.tpl b/Toolkit/Members/templates/memberDetail.tpl index 6af6a9c..be1b5f2 100644 --- a/Toolkit/Members/templates/memberDetail.tpl +++ b/Toolkit/Members/templates/memberDetail.tpl @@ -108,7 +108,7 @@ {v[name]:h} - \ No newline at end of file diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 3201fad..401360e 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -147,8 +147,8 @@ class Toolkit_Page // Resources needed for every page. //$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 . '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"; $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/external.js'; $GLOBALS['bottomScripts'][] = $this->baseURL . "libjs/pagefunctions.js"; diff --git a/Toolkit/Photos/templates/photos.html b/Toolkit/Photos/templates/photos.html index 64e41ec..803662c 100755 --- a/Toolkit/Photos/templates/photos.html +++ b/Toolkit/Photos/templates/photos.html @@ -1,10 +1,10 @@ +

{album}