From 08638f3ec88e86def618ff89bdedb9ae9696d218 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 10 Sep 2014 16:09:01 -0700
Subject: Revert "Merge pull request #583 from git-marijus/master" autoload
 broken - even after clearing cache and retrying.

This reverts commit 13e7a8f123b283a096af302b0366255355ba8439, reversing
changes made to 4712b78e520ca10b34e3e9b99c2752b10d811b42.
---
 view/js/main.js            | 31 +++++--------------------------
 view/php/theme_init.php    |  3 ---
 view/tpl/photo_album.tpl   | 10 +++++++---
 view/tpl/photo_top.tpl     |  9 ++++++---
 view/tpl/photos_recent.tpl |  2 +-
 5 files changed, 19 insertions(+), 36 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index ae90bb272..8c4fcdc13 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -700,30 +700,10 @@ 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) {
 
@@ -1070,6 +1050,7 @@ function previewTheme(elm) {
 }
 
 $(document).ready(function() {
+
 	jQuery.timeago.settings.strings = {
 		prefixAgo     : aStr['t01'],
 		prefixFromNow : aStr['t02'],
@@ -1093,8 +1074,6 @@ $(document).ready(function() {
 
 	$(".autotime").timeago();
 
-	justifyPhotos();
-
 });
 
 	function zFormError(elm,x) {
@@ -1110,7 +1089,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();                 
@@ -1120,8 +1099,8 @@ $(window).scroll(function () {
 			$('#more').css("top","400");
 			$('#more').show();
 		}
-
-		if($(window).scrollTop() + $(window).height() == $(document).height()) {
+	
+		if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
 			if((pageHasMoreContent) && (! loadingPage)) {
 				$('#more').hide();
 				$('#no-more').hide();
@@ -1141,7 +1120,7 @@ $(window).scroll(function () {
 			$('#more').show();
 		}
 	
-		if($(window).scrollTop() + $(window).height() == $(document).height()) {
+		if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
 			if((pageHasMoreContent) && (! loadingPage)) {
 				$('#more').hide();
 				$('#no-more').hide();
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 36504ec54..45eb2fc1d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,13 +10,10 @@ 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 b5ea14c14..a63bff78c 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,3 +1,7 @@
-<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>
+<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>
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 4a106c30d..944928f85 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,4 +1,7 @@
-<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>
+<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>
 
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 8eaa208b1..386979de5 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">
+<div id="photo-album-contents" class="photos">
 {{foreach $photos as $photo}}
 	{{include file="photo_top.tpl"}}
 {{/foreach}}
-- 
cgit v1.2.3