diff options
| -rw-r--r-- | include/features.php | 4 | ||||
| -rw-r--r-- | mod/photos.php | 27 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/prettyphoto.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 4 |
6 files changed, 17 insertions, 27 deletions
diff --git a/include/features.php b/include/features.php index 978d7af8a..40adf1d41 100644 --- a/include/features.php +++ b/include/features.php @@ -24,7 +24,9 @@ function get_features() { 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('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders')), - array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), +// prettyphoto has licensing issues and will no longer be provided in core - +// in any event this setting should probably be a theme option or plugin +// array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), //FIXME - needs a description, but how the hell do we explain this to normals? array('sendzid', t('Extended Identity Sharing'), t(' ')), 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 3c724ddc2..85d3f50b0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -817,25 +817,24 @@ function photos_content(&$a) { $ext = $phototypes[$rr['type']]; - if($a->get_template_engine() === 'internal') { - $imgalt_e = template_escape($rr['filename']); - $desc_e = template_escape($rr['description']); - } - else { - $imgalt_e = $rr['filename']; - $desc_e = $rr['description']; - } + $imgalt_e = $rr['filename']; + $desc_e = $rr['description']; + +// prettyphoto has potential license issues, so we can no longer include it in core +// The following lines would need to be modified so that they are provided in theme specific files +// instead of core modules for themes that wish to make use of prettyphoto. I would suggest +// the feature as a per-theme display option and putting the rel line inside a template. - if(feature_enabled($a->data['channel']['channel_id'],'prettyphoto')){ - $imagelink = ($a->get_baseurl() . '/photo/' . $rr['resource_id'] . '.' . $ext ); - $rel=("prettyPhoto[pp_gal]"); - } - else { +// 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'], diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index c170d47a3..a63bff78c 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,4 +1,3 @@ -{{include file="prettyphoto.tpl"}} <div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}"> <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" id="photo-album-photo-{{$id}}" /> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index c3b697776..e56fd5b57 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,5 +1,3 @@ -{{include file="prettyphoto.tpl"}} - <div id="live-display"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> diff --git a/view/tpl/prettyphoto.tpl b/view/tpl/prettyphoto.tpl deleted file mode 100644 index 6d047e620..000000000 --- a/view/tpl/prettyphoto.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<script type="text/javascript" charset="utf-8"> - $(document).ready(function(){ - $("a[rel^='prettyPhoto']").prettyPhoto(); - }); -</script> - diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 437e93348..c19836a28 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,5 +1,3 @@ -{{include file="prettyphoto.tpl"}} - {{if $pages}} <div id="pagelist-content-wrapper" class="generic-content-wrapper"> @@ -8,7 +6,7 @@ <div class="page-list-item"> {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} - {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" rel="xprettyPhoto[iframesx]" title="{{$preview}}"><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} {{$item.title}} </div> {{/foreach}} |