diff options
| -rw-r--r-- | include/features.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 18 | ||||
| -rw-r--r-- | view/tpl/photo_album.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/smarty3/page_display.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/photo_album.tpl | 8 |
5 files changed, 30 insertions, 7 deletions
diff --git a/include/features.php b/include/features.php index 23e5485e9..14cf891b3 100644 --- a/include/features.php +++ b/include/features.php @@ -22,6 +22,7 @@ function get_features() { array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')), array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel')), + array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')), diff --git a/mod/photos.php b/mod/photos.php index c562fc139..f5d2bed97 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -835,7 +835,6 @@ function photos_content(&$a) { $o .= '<div class="photos-upload-link" ><a href="' . $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album) . '" >' . t('Upload New Photos') . '</a></div>'; } - $tpl = get_markup_template('photo_album.tpl'); if(count($r)) $twist = 'rotright'; @@ -856,15 +855,26 @@ function photos_content(&$a) { $desc_e = $rr['desc']; } + + if(feature_enabled($a->data['channel']['channel_id'],'prettyphoto')){ + $imagelink = ($a->get_baseurl() . '/photo/' . $rr['resource_id'] . '.' . $ext ); + $rel=("prettyPhoto[pp_gal]"); + } + else { + $imagelink = ($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id'] + . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '')); + $rel=("photo"); + } + $o .= replace_macros($tpl,array( '$id' => $rr['id'], '$twist' => ' ' . $twist . rand(2,4), - '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id'] - . (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''), + '$photolink' => $imagelink, + '$rel' => $rel, '$phototitle' => t('View Photo'), '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext, '$imgalt' => $imgalt_e, - '$desc'=> $desc_e + '$desc'=> $desc_e, )); } diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index cc3dcfb9c..53392e709 100644 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,5 +1,11 @@ +<script type="text/javascript" charset="utf-8"> + $(document).ready(function(){ + $("a[rel^='prettyPhoto']").prettyPhoto(); + }); +</script> + <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id"> - <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle"> + <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle" rel="$rel"> <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" /> <p class='caption'>$desc</p> </a> diff --git a/view/tpl/smarty3/page_display.tpl b/view/tpl/smarty3/page_display.tpl index e61a86fc9..0f02086f2 100644 --- a/view/tpl/smarty3/page_display.tpl +++ b/view/tpl/smarty3/page_display.tpl @@ -8,5 +8,5 @@ <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> - <div class="page-body">{{$body}}</div> + <div class="page-body">body</div> </div> diff --git a/view/tpl/smarty3/photo_album.tpl b/view/tpl/smarty3/photo_album.tpl index 56ee6b61c..33ab84df7 100644 --- a/view/tpl/smarty3/photo_album.tpl +++ b/view/tpl/smarty3/photo_album.tpl @@ -3,8 +3,14 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} +<script type="text/javascript" charset="utf-8"> + $(document).ready(function(){ + $("a[rel^='prettyPhoto']").prettyPhoto(); + }); +</script> + <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}"> - <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}"> + <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" /> <p class='caption'>{{$desc}}</p> </a> |