aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-09-11 08:46:58 +1000
committerRedMatrix <info@friendica.com>2014-09-11 08:46:58 +1000
commit13e7a8f123b283a096af302b0366255355ba8439 (patch)
treef314843ebd23c95d2b1bc9509895822ba27f9cef /view
parent4712b78e520ca10b34e3e9b99c2752b10d811b42 (diff)
parentd825adf4230ac20d39829150e2e7b03942d9f9c6 (diff)
downloadvolse-hubzilla-13e7a8f123b283a096af302b0366255355ba8439.tar.gz
volse-hubzilla-13e7a8f123b283a096af302b0366255355ba8439.tar.bz2
volse-hubzilla-13e7a8f123b283a096af302b0366255355ba8439.zip
Merge pull request #583 from git-marijus/master
photo justification
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js31
-rw-r--r--view/php/theme_init.php3
-rwxr-xr-xview/tpl/photo_album.tpl10
-rwxr-xr-xview/tpl/photo_top.tpl9
-rwxr-xr-xview/tpl/photos_recent.tpl2
5 files changed, 36 insertions, 19 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 8c4fcdc13..ae90bb272 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -700,10 +700,30 @@ function updateConvItems(mode,data) {
updatePageItems(update_mode,data);
$("#page-spinner").spin(false);
in_progress = false;
+ justifyPhotos();
});
}
+ function justifyPhotos() {
+ if($('#photo-album-contents').length > 0) {
+ loadingPage = true;
+ $('#photo-album-contents').justifiedGallery({
+ lastRow : 'nojustify',
+ captions: true,
+ margins: 3,
+ rowHeight : 150,
+ sizeRangeSuffixes : {
+ 'lt100': '',
+ 'lt240': '',
+ 'lt320': '',
+ 'lt500': '',
+ 'lt640': '',
+ 'lt1024': ''
+ }
+ }).on('jg.complete', function(e){ loadingPage = false; });
+ }
+ }
function notify_popup_loader(notifyType) {
@@ -1050,7 +1070,6 @@ function previewTheme(elm) {
}
$(document).ready(function() {
-
jQuery.timeago.settings.strings = {
prefixAgo : aStr['t01'],
prefixFromNow : aStr['t02'],
@@ -1074,6 +1093,8 @@ $(document).ready(function() {
$(".autotime").timeago();
+ justifyPhotos();
+
});
function zFormError(elm,x) {
@@ -1089,7 +1110,7 @@ $(document).ready(function() {
-$(window).scroll(function () {
+$(window).scroll(function () {
if(typeof buildCmd == 'function') {
// This is a content page with items and/or conversations
$('#more').hide();
@@ -1099,8 +1120,8 @@ $(window).scroll(function () {
$('#more').css("top","400");
$('#more').show();
}
-
- if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
+
+ if($(window).scrollTop() + $(window).height() == $(document).height()) {
if((pageHasMoreContent) && (! loadingPage)) {
$('#more').hide();
$('#no-more').hide();
@@ -1120,7 +1141,7 @@ $(window).scroll(function () {
$('#more').show();
}
- if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
+ if($(window).scrollTop() + $(window).height() == $(document).height()) {
if((pageHasMoreContent) && (! loadingPage)) {
$('#more').hide();
$('#no-more').hide();
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 45eb2fc1d..36504ec54 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,10 +10,13 @@ head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/widgets.css');
+head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css');
head_add_js('jquery.js');
head_add_js('jquery-migrate-1.1.1.js');
+head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js');
+
//head_add_js('jquery-compat.js');
head_add_js('spin.js');
head_add_js('jquery.spin.js');
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index a63bff78c..b5ea14c14 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,7 +1,3 @@
-<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}}" />
- <p class='caption'>{{$desc}}</p>
- </a>
-</div>
-<div class="photo-album-image-wrapper-end"></div>
+<a href="{{$photolink}}" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}">
+ <img src="{{$imgsrc}}" alt="{{if $desc}}{{$desc}}{{else}}{{$imgalt}}{{/if}}" title="{{$phototitle}}" id="photo-album-photo-{{$id}}" />
+</a>
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 944928f85..4a106c30d 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,7 +1,4 @@
-<div class="photo-top-image-wrapper lframe {{$photo.twist}}" id="photo-top-image-wrapper-{{$photo.id}}">
- <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
- <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$photo.id}}" />
- </a>
- <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
-</div>
+<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+ <img src="{{$photo.src}}" alt="{{$photo.album.name}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
+</a>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 386979de5..8eaa208b1 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -3,7 +3,7 @@
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
{{/if}}
-<div id="photo-album-contents" class="photos">
+<div id="photo-album-contents">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}