diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rw-r--r-- | view/tpl/photo_view.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/smarty3/photo_view.tpl | 8 |
4 files changed, 18 insertions, 5 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 538e834d0..3ed85ccf1 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -8,6 +8,7 @@ head_add_css('library/fancybox/jquery.fancybox-1.3.4.css'); head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); +head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_js('js/jquery.js'); head_add_js('js/jquery.textinputs.js'); @@ -24,3 +25,4 @@ head_add_js('js/webtoolkit.base64.js'); head_add_js('js/main.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); +head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 03a956a0e..26d296216 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1090,8 +1090,7 @@ footer { } .wall-item-content img { - max-height: 95% !important; - max-width: 95% !important; + max-width: 95% !important; /* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */ } @@ -3754,4 +3753,4 @@ ul.menu-popup { .profile-match-connect { margin-top: 5px; } .reshared-content { margin-left: 30px; } -.shared_header img { margin-right: 10px; }
\ No newline at end of file +.shared_header img { margin-right: 10px; } diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 732caf690..f724b419b 100644 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,3 +1,9 @@ +<script type="text/javascript" charset="utf-8"> + $(document).ready(function(){ + $("a[rel^='prettyPhoto']").prettyPhoto(); + }); +</script> + <div id="live-display"></div> <h3><a href="$album.0">$album.1</a></h3> @@ -11,7 +17,7 @@ </div> {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} -<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div> +<div id="photo-photo"><a href="$photo.href" title="$photo.title" rel="prettyPhoto"><img src="$photo.src" /></a></div> {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} <div id="photo-photo-end"></div> <div id="photo-caption">$desc</div> diff --git a/view/tpl/smarty3/photo_view.tpl b/view/tpl/smarty3/photo_view.tpl index 94f71bdd8..fe090409a 100644 --- a/view/tpl/smarty3/photo_view.tpl +++ b/view/tpl/smarty3/photo_view.tpl @@ -3,6 +3,12 @@ * 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 id="live-display"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> @@ -16,7 +22,7 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}} -<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div> {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}} <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> |