Merge https://github.com/friendica/red into pending_merge

10 files changed, 709 insertions, 613 deletions

diff --git a/include/chat.php b/include/chat.php
index b8fb185df..5c3d0c9d9 100644
--- a/include/chat.php
+++ b/include/chat.php
@@ -189,6 +189,17 @@ function chatroom_list($uid) {
 	return $r;
 }
 
+function chatroom_list_count($uid) {
+	require_once('include/security.php');
+	$sql_extra = permissions_sql($uid);
+
+	$r = q("select count(*) as total from chatroom where cr_uid = %d $sql_extra",
+		intval($uid)
+	);
+
+	return $r[0]['total'];
+}
+
 /**
  * create a chat message via API.
  * It is the caller's responsibility to enter the room.
diff --git a/include/conversation.php b/include/conversation.php
index a4d94f946..4c030662c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1552,8 +1552,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 	}
 
 	require_once('include/chat.php');
-	$chats = chatroom_list($uid);
-	if (count($chats)) {
+	$has_chats = chatroom_list_count($uid);
+	if ($has_chats) {
 		$tabs[] = array(
 			'label' => t('Chatrooms'),
 			'url'	=> $a->get_baseurl() . '/chat/' . $nickname,
@@ -1563,7 +1563,9 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		);
 	}
 
-	if($is_owner) {
+	require_once('include/menu.php');
+	$has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);
+	if($is_owner && $has_bookmarks) {
 		$tabs[] = array(
 			'label' => t('Bookmarks'),
 			'url'	=> $a->get_baseurl() . '/bookmarks',
diff --git a/include/menu.php b/include/menu.php
index 4b0a11f10..8997d2e39 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -124,7 +124,17 @@ function menu_list($channel_id, $name = '', $flags = 0) {
 	return $r;
 }
 
+function menu_list_count($channel_id, $name = '', $flags = 0) {
 
+	$sel_options = '';
+	$sel_options .= (($name) ? " and menu_name = '" . protect_sprintf(dbesc($name)) . "' " : '');
+	$sel_options .= (($flags) ? " and menu_flags = " . intval($flags) . " " : '');
+
+	$r = q("select count(*) as total from menu where menu_channel_id = %d $sel_options",
+		intval($channel_id)
+	);
+	return $r[0]['total'];
+}
 
 function menu_edit($arr) {
 
diff --git a/include/nav.php b/include/nav.php
index 799faf5ce..714f4b63d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -105,14 +105,19 @@ EOT;
 		$nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files'));
 
 		require_once('include/chat.php');
-		$chats = chatroom_list(local_user());
-		if (count($chats)) {
+		$has_chats = chatroom_list_count(local_user());
+		if($has_chats) {
 			$nav['usermenu'][] = Array('chat/' . $channel['channel_address'],t('Chat'),"",t('Your chatrooms'));
 		}
 
-		$nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks'));
+		require_once('include/menu.php');
+		$has_bookmarks = menu_list_count(local_user(),'',MENU_BOOKMARK) + menu_list_count(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);
+		if($has_bookmarks) {
+			$nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks'));
+		}
+
 		if(feature_enabled($channel['channel_id'],'webpages'))
-			$nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'));	
+			$nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'));
 	}
 	else {
 		if(! get_account_id()) 
diff --git a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js
index 9b5c66081..7754ae437 100644
--- a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js
+++ b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js
@@ -1,587 +1,661 @@
-/*!
- * Justified Gallery - v3.2.0
+/*
+ * Justified Gallery - v3.4.0
  * http://miromannino.com/projects/justified-gallery/
  * Copyright (c) 2014 Miro Mannino
  * Licensed under the MIT license.
  */
 (function($) {
 
-	/* Events
-		jg.complete : called when all the gallery has been created
-		jg.resize : called when the gallery has been resized
-	*/
-
-	$.fn.justifiedGallery = function (arg) {
-
-		// Default options
-		var defaults = {
-			sizeRangeSuffixes : {
-				'lt100': '_t', 
-				'lt240': '_m', 
-				'lt320': '_n', 
-				'lt500': '', 
-				'lt640': '_z', 
-				'lt1024': '_b'
-			},
-			rowHeight : 120,
-			maxRowHeight : 0, //negative value = no limits, 0 = 1.5 * rowHeight
-			margins : 1,
-			lastRow : 'nojustify', // or can be 'justify' or 'hide'
-			justifyThreshold: 0.75, /* if row width / available space > 0.75 it will be always justified 
-										(i.e. lastRow setting is not considered) */
-			fixedHeight : false,
-			captions : true,
-			cssAnimation: false,
-			imagesAnimationDuration : 300, //ignored with css animations
-			captionSettings : { //ignored with css animations
-				animationDuration : 500,
-				visibleOpacity : 0.7, 
-				nonVisibleOpacity : 0.0 
-			},
-			rel : null, //rewrite the rel of each analyzed links
-			target : null, //rewrite the target of all links
-			extension : /\.[^.]+$/,
-			refreshTime : 250,
-			randomize : false
-		};
-
-		function getSuffix(width, height, context) {
-			var longestSide;
-			longestSide = (width > height) ? width : height;
-			if (longestSide <= 100) {
-				return context.settings.sizeRangeSuffixes.lt100;
-			} else if (longestSide <= 240) {
-				return context.settings.sizeRangeSuffixes.lt240;
-			} else if (longestSide <= 320) {
-				return context.settings.sizeRangeSuffixes.lt320;
-			} else if (longestSide <= 500) {
-				return context.settings.sizeRangeSuffixes.lt500;
-			} else if (longestSide <= 640) {
-				return context.settings.sizeRangeSuffixes.lt640;
-			} else {
-				return context.settings.sizeRangeSuffixes.lt1024;
-			}
-		}
-
-		function onEntryMouseEnterForCaption (ev) {
-			var $caption = $(ev.currentTarget).find('.caption');
-			if (ev.data.settings.cssAnimation) {
-				$caption.addClass('caption-visible').removeClass('caption-hidden');
-			} else {
-				$caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, ev.data.settings.captionSettings.visibleOpacity);
-			}
-		}
-
-		function onEntryMouseLeaveForCaption (ev) {
-			var $caption = $(ev.currentTarget).find('.caption');
-			if (ev.data.settings.cssAnimation) {
-				$caption.removeClass('caption-visible').removeClass('caption-hidden');
-			} else {
-				$caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, ev.data.settings.captionSettings.nonVisibleOpacity);
-			}
-		}
-
-		function displayEntry($entry, x, y, imgWidth, imgHeight, rowHeight, context) {
-			var $image = $entry.find('img');
-			$image.css('width', imgWidth);
-			$image.css('height', imgHeight);
-			$image.css('margin-left', - imgWidth / 2);
-			$image.css('margin-top', - imgHeight / 2);
-			$entry.width(imgWidth);
-			$entry.height(rowHeight);
-			$entry.css('top', y);
-			$entry.css('left', x);
-
-			//DEBUG// console.log('displayEntry: $image.width() = ' + $image.width() + ' $image.height() = ' + $image.height());
-
-			// Image reloading for an high quality of thumbnails
-			var imageSrc = $image.attr('src');
-			var newImageSrc = imageSrc.replace(context.settings.extension, '').replace(context.usedSizeRangeRegExp, '') + 
-								getSuffix(imgWidth, imgHeight, context) + 
-								imageSrc.match(context.settings.extension)[0];
-
-			$image.one('error', function () {
-				//DEBUG// console.log('revert the original image');
-				$image.attr('src', $image.data('jg.originalSrc')); //revert to the original thumbnail, we got it.
-			});
-
-			var loadNewImage = function () {
-				if (imageSrc !== newImageSrc) { //load the new image after the fadeIn
-					$image.attr('src', newImageSrc);
-				}
-			};
-
-			if (context.settings.cssAnimation) {
-				$entry.addClass('entry-visible');
-				loadNewImage();
-			} else {
-				$entry.stop().fadeTo(context.settings.imagesAnimationDuration, 1.0, loadNewImage);
-			}
-
-			// Captions ------------------------------
-			var captionMouseEvents = $entry.data('jg.captionMouseEvents');
-			if (context.settings.captions === true) {
-				var $imgCaption = $entry.find('.caption');
-				if ($imgCaption.length === 0) { // Create it if it doesn't exists
-					var caption = $image.attr('alt');
-					if (typeof caption === 'undefined') caption = $entry.attr('title');
-					if (typeof caption !== 'undefined') { // Create only we found something
-						$imgCaption = $('<div class="caption">' + caption + '</div>');
-						$entry.append($imgCaption);
-					}
-				}
-			
-				// Create events (we check again the $imgCaption because it can be still inexistent)
-				if ($imgCaption.length !== 0) {
-					if (!context.settings.cssAnimation) {
-						$imgCaption.stop().fadeTo(context.settings.imagesAnimationDuration, context.settings.captionSettings.nonVisibleOpacity); 
-					}
-					if (typeof captionMouseEvents === 'undefined') {
-						captionMouseEvents = {
-							mouseenter: onEntryMouseEnterForCaption,
-							mouseleave: onEntryMouseLeaveForCaption
-						};
-						$entry.on('mouseenter', undefined, context, captionMouseEvents.mouseenter);
-						$entry.on('mouseleave', undefined, context, captionMouseEvents.mouseleave);
-						$entry.data('jg.captionMouseEvents', captionMouseEvents);
-					}
-				}
-			} else {
-				if (typeof captionMouseEvents !== 'undefined') {
-					$entry.off('mouseenter', undefined, context, captionMouseEvents.mouseenter);
-					$entry.off('mouseleave', undefined, context, captionMouseEvents.mouseleave);
-					$entry.removeData('jg.captionMouseEvents');
-				}
-			}
-
-		}
-
-		function prepareBuildingRow(context, isLastRow) {
-			var i, $entry, $image, imgAspectRatio, newImgW, newImgH, justify = true;
-			var minHeight = 0;
-			var availableWidth = context.galleryWidth - ((context.buildingRow.entriesBuff.length - 1) * context.settings.margins);
-			var rowHeight = availableWidth / context.buildingRow.aspectRatio;
-			var justificable = context.buildingRow.width / availableWidth > context.settings.justifyThreshold;
-
-			//Skip the last row if we can't justify it and the lastRow == 'hide'
-			if (isLastRow && context.settings.lastRow === 'hide' && !justificable) {
-				for (i = 0; i < context.buildingRow.entriesBuff.length; i++) {
-					$entry = context.buildingRow.entriesBuff[i];
-					if (context.settings.cssAnimation) 
-						$entry.removeClass('entry-visible');						
-					else
-						$entry.stop().fadeTo(0, 0);
-				}
-				return -1;
-			}
-
-			// With lastRow = nojustify, justify if is justificable (the images will not become too big)
-			if (isLastRow && context.settings.lastRow === 'nojustify' && !justificable) justify = false;
-
-			for (i = 0; i < context.buildingRow.entriesBuff.length; i++) {
-				$image = context.buildingRow.entriesBuff[i].find('img');
-				imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh');
-
-				if (justify) {
-					newImgW = rowHeight * imgAspectRatio;
-					newImgH = rowHeight;
-
-					/* With fixedHeight the newImgH must be greater than rowHeight. 
-					In some cases here this is not satisfied (due to the justification).
-					But we comment it, because is better to have a shorter but justified row instead 
-					to have a cropped image at the end. */
-					/*if (context.settings.fixedHeight && newImgH < context.settings.rowHeight) {
-						newImgW = context.settings.rowHeight * imgAspectRatio;
-						newImgH = context.settings.rowHeight;
-					}*/
-				} else {
-					newImgW = context.settings.rowHeight * imgAspectRatio;
-					newImgH = context.settings.rowHeight;
-				}
-
-				$image.data('jg.imgw', Math.ceil(newImgW));
-				$image.data('jg.imgh', Math.ceil(newImgH));
-				if (i === 0 || minHeight > newImgH) minHeight = newImgH;
-			}
-
-			if (context.settings.fixedHeight && minHeight > context.settings.rowHeight) 
-				minHeight = context.settings.rowHeight;
-
-			return minHeight;
-		}
-
-		function rewind(context) {
-			context.lastAnalyzedIndex = -1;
-			context.buildingRow.entriesBuff = [];
-			context.buildingRow.aspectRatio = 0;
-			context.buildingRow.width = 0;
-			context.offY = 0;
-			context.firstRowFlushed = false;
-		}
-
-		function flushRow(context, isLastRow) {
-			var $entry, $image, minHeight, offX = 0;
-
-			//DEBUG// console.log('flush (width: ' + context.buildingRow.width + ', galleryWidth: ' + context.galleryWidth + ', ' + 'isLastRow: ' + isLastRow + ')');
-
-			minHeight = prepareBuildingRow(context, isLastRow);
-			if (isLastRow && context.settings.lastRow === 'hide' && minHeight === -1) {
-				context.buildingRow.entriesBuff = [];
-				context.buildingRow.aspectRatio = 0;
-				context.buildingRow.width = 0;
-				return;
-			}
-
-			if (context.settings.maxRowHeight > 0 && context.settings.maxRowHeight < minHeight)
-				minHeight = context.settings.maxRowHeight;
-			else if (context.settings.maxRowHeight === 0 && (1.5 * context.settings.rowHeight) < minHeight)
-				minHeight = 1.5 * context.settings.rowHeight;
-
-			for (var i = 0; i < context.buildingRow.entriesBuff.length; i++) {
-				$entry = context.buildingRow.entriesBuff[i];
-				$image = $entry.find('img');
-				displayEntry($entry, offX, context.offY, $image.data('jg.imgw'), $image.data('jg.imgh'), minHeight, context);
-				offX += $image.data('jg.imgw') + context.settings.margins;
-			}
-
-			//Gallery Height
-			context.$gallery.height(context.offY + minHeight +
-				(context.spinner.active ? context.spinner.$el.innerHeight() : 0)
-			);
-
-			if(!isLastRow) {
-				//Ready for a new row
-				context.offY += minHeight + context.settings.margins;
-
-				//DEBUG// console.log('minHeight: ' + minHeight + ' offY: ' + context.offY);
-
-				context.buildingRow.entriesBuff = []; //clear the array creating a new one
-				context.buildingRow.aspectRatio = 0;
-				context.buildingRow.width = 0;
-				context.firstRowFlushed = true;
-				context.$gallery.trigger('jg.rowflush');
-			}
-		}
-
-		function checkWidth(context) {
-			context.checkWidthIntervalId = setInterval(function () {
-				var galleryWidth = parseInt(context.$gallery.width(), 10);
-				if (context.galleryWidth !== galleryWidth) {
-					//DEBUG// console.log("resize. old: " + context.galleryWidth + " new: " + galleryWidth);
-					
-					context.galleryWidth = galleryWidth;
-					rewind(context);
-
-					// Restart to analyze
-					startImgAnalyzer(context, true);
-				}
-			}, context.settings.refreshTime);
-		}	
-
-		function startLoadingSpinnerAnimation(spinnerContext) {
-			clearInterval(spinnerContext.intervalId);
-			spinnerContext.intervalId = setInterval(function () {
-				if (spinnerContext.phase < spinnerContext.$points.length) 
-					spinnerContext.$points.eq(spinnerContext.phase).fadeTo(spinnerContext.timeslot, 1);
-				else
-					spinnerContext.$points.eq(spinnerContext.phase - spinnerContext.$points.length).fadeTo(spinnerContext.timeslot, 0);
-				spinnerContext.phase = (spinnerContext.phase + 1) % (spinnerContext.$points.length * 2);
-			}, spinnerContext.timeslot);
-		}
-
-		function stopLoadingSpinnerAnimation(spinnerContext) {
-			clearInterval(spinnerContext.intervalId);
-			spinnerContext.intervalId = null;
-		}
-
-		function stopImgAnalyzerStarter(context) {
-			context.yield.flushed = 0;
-			if (context.imgAnalyzerTimeout !== null) clearTimeout(context.imgAnalyzerTimeout);
-		}
-
-		function startImgAnalyzer(context, isForResize) {
-			stopImgAnalyzerStarter(context);
-			context.imgAnalyzerTimeout = setTimeout(function () { analyzeImages(context, isForResize); }, 0.001);
-			analyzeImages(context, isForResize);
-		}
-
-		function analyzeImages(context, isForResize) {
-			
-			//DEBUG// 
-			/*var rnd = parseInt(Math.random() * 10000, 10);
-			//DEBUG// console.log('analyzeImages ' + rnd + ' start');
-			//DEBUG// console.log('images status: ');
-			for (var i = 0; i < context.entries.length; i++) {
-				var $entry = $(context.entries[i]);
-				var $image = $entry.find('img');
-				//DEBUG// console.log(i + ' (alt: ' + $image.attr('alt') + 'loaded: ' + $image.data('jg.loaded') + ')');
-			}*/
-
-			/* The first row */
-			var isLastRow;
-			
-			for (var i = context.lastAnalyzedIndex + 1; i < context.entries.length; i++) {
-				var $entry = $(context.entries[i]);
-				var $image = $entry.find('img');
-
-				if ($image.data('jg.loaded') === true) {
-					isLastRow = i >= context.entries.length - 1;
-
-					var availableWidth = context.galleryWidth - ((context.buildingRow.entriesBuff.length - 1) * context.settings.margins);
-					var imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh');
-					if (availableWidth / (context.buildingRow.aspectRatio + imgAspectRatio) < context.settings.rowHeight) {
-						flushRow(context, isLastRow);
-
-						if(++context.yield.flushed >= context.yield.every) {
-							//DEBUG// console.log("yield");
-							startImgAnalyzer(context, isForResize);
-							return;
-						}
-					}
-
-					context.buildingRow.entriesBuff.push($entry);
-					context.buildingRow.aspectRatio += imgAspectRatio;
-					context.buildingRow.width += imgAspectRatio * context.settings.rowHeight;
-					context.lastAnalyzedIndex = i;
-
-				} else if ($image.data('jg.loaded') !== 'error') {
-					return;
-				}
-			}
-
-			// Last row flush (the row is not full)
-			if (context.buildingRow.entriesBuff.length > 0) flushRow(context, isLastRow);
-
-			if (context.spinner.active) {
-				context.spinner.active = false;
-				context.$gallery.height(context.$gallery.height() - context.spinner.$el.innerHeight());
-				context.spinner.$el.detach();
-				stopLoadingSpinnerAnimation(context.spinner);
-			}
-
-			/* Stop, if there is, the timeout to start the analyzeImages.
-					This is because an image can be set loaded, and the timeout can be set,
-					but this image can be analyzed yet. 
-			*/
-			stopImgAnalyzerStarter(context);
-
-			//On complete callback
-			if (!isForResize) context.$gallery.trigger('jg.complete'); else context.$gallery.trigger('jg.resize');
-
-			//DEBUG// console.log('analyzeImages ' + rnd +  ' end');
-		}
-
-		function checkSettings (context) {
-
-			function checkSuffixesRange(range) {
-				if (typeof context.settings.sizeRangeSuffixes[range] !== 'string')
-					throw 'sizeRangeSuffixes.' + range + ' must be a string';
-			}
-
-			function checkOrConvertNumber(parent, settingName) {
-				if (typeof parent[settingName] === 'string') {
-					parent[settingName] = parseFloat(parent[settingName], 10);
-					if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName;
-				} else if (typeof parent[settingName] === 'number') {
-					if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName;
-				} else {
-					throw settingName + ' must be a number';
-				}
-			}
-
-			if (typeof context.settings.sizeRangeSuffixes !== 'object')
-				throw 'sizeRangeSuffixes must be defined and must be an object';
-
-			checkSuffixesRange('lt100');
-			checkSuffixesRange('lt240');
-			checkSuffixesRange('lt320');
-			checkSuffixesRange('lt500');
-			checkSuffixesRange('lt640');
-			checkSuffixesRange('lt1024');
-
-			checkOrConvertNumber(context.settings, 'rowHeight');
-			checkOrConvertNumber(context.settings, 'maxRowHeight');
-			checkOrConvertNumber(context.settings, 'margins');
-
-			if (context.settings.lastRow !== 'nojustify' &&
-					context.settings.lastRow !== 'justify' &&
-					context.settings.lastRow !== 'hide') {
-				throw 'lastRow must be "nojustify", "justify" or "hide"';
-			}
-
-			checkOrConvertNumber(context.settings, 'justifyThreshold');
-			if (context.settings.justifyThreshold < 0 || context.settings.justifyThreshold > 1)
-				throw 'justifyThreshold must be in the interval [0,1]';
-			if (typeof context.settings.cssAnimation !== 'boolean') {
-				throw 'cssAnimation must be a boolean';	
-			}
-			
-			checkOrConvertNumber(context.settings.captionSettings, 'animationDuration');
-			checkOrConvertNumber(context.settings, 'imagesAnimationDuration');
-
-			checkOrConvertNumber(context.settings.captionSettings, 'visibleOpacity');
-			if (context.settings.captionSettings.visibleOpacity < 0 || context.settings.captionSettings.visibleOpacity > 1)
-				throw 'captionSettings.visibleOpacity must be in the interval [0, 1]';
-
-			checkOrConvertNumber(context.settings.captionSettings, 'nonVisibleOpacity');
-			if (context.settings.captionSettings.visibleOpacity < 0 || context.settings.captionSettings.visibleOpacity > 1)
-				throw 'captionSettings.nonVisibleOpacity must be in the interval [0, 1]';
-
-			if (typeof context.settings.fixedHeight !== 'boolean') {
-				throw 'fixedHeight must be a boolean';	
-			}
-
-			if (typeof context.settings.captions !== 'boolean') {
-				throw 'captions must be a boolean';	
-			}
-
-			checkOrConvertNumber(context.settings, 'refreshTime');
-
-			if (typeof context.settings.randomize !== 'boolean') {
-				throw 'randomize must be a boolean';	
-			}
-
-		}
-
-		return this.each(function (index, gallery) {
-
-			var $gallery = $(gallery);
-			$gallery.addClass('justified-gallery');
-
-			var context = $gallery.data('jg.context');
-			if (typeof context === 'undefined') {
-
-				if (typeof arg !== 'undefined' && arg !== null && typeof arg !== 'object') 
-					throw 'The argument must be an object';
-
-				// Spinner init
-				var $spinner = $('<div class="spinner"><span></span><span></span><span></span></div>');
-
-				//Context init
-				context = {
-					settings : $.extend({}, defaults, arg),
-					imgAnalyzerTimeout : null,
-					entries : null,
-					buildingRow : {
-						entriesBuff : [],
-						width : 0,
-						aspectRatio : 0
-					},
-					lastAnalyzedIndex : -1,
-					firstRowFlushed : false,
-					yield : {
-						every : 2, /* do a flush every context.yield.every flushes (
-									* must be greater than 1, else the analyzeImages will loop */
-						flushed : 0 //flushed rows without a yield
-					},
-					offY : 0,
-					spinner : {
-						active : false,
-						phase : 0,
-						timeslot : 150,
-						$el : $spinner,
-						$points : $spinner.find('span'),
-						intervalId : null
-					},
-					checkWidthIntervalId : null,
-					galleryWidth : $gallery.width(),
-					$gallery : $gallery
-				};
-
-				$gallery.data('jg.context', context);
-
-			} else if (arg === 'norewind') {
-				// In this case we don't rewind, and analyze all the images
-			} else {
-				context.settings = $.extend({}, context.settings, arg);
-				rewind(context);
-			}
-			
-			checkSettings(context);
-
-			context.entries = $gallery.find('> a, > div').toArray();
-			if (context.entries.length === 0) return;
-
-			// Randomize
-			if (context.settings.randomize) {
-				context.entries.sort(function () { return Math.random() * 2 - 1; });
-				$.each(context.entries, function () {
-					$(this).appendTo($gallery);
-				});
-			}
-
-			context.usedSizeRangeRegExp = new RegExp("(" + 
-				context.settings.sizeRangeSuffixes.lt100 + "|" + 
-				context.settings.sizeRangeSuffixes.lt240 + "|" + 
-				context.settings.sizeRangeSuffixes.lt320 + "|" + 
-				context.settings.sizeRangeSuffixes.lt500 + "|" + 
-				context.settings.sizeRangeSuffixes.lt640 + "|" + 
-				context.settings.sizeRangeSuffixes.lt1024 + ")$"
-			);
-
-			if (context.settings.maxRowHeight > 0 && context.settings.maxRowHeight < context.settings.rowHeight)
-				context.settings.maxRowHeight = context.settings.rowHeight;
-
-			var imagesToLoad = false;
-			$.each(context.entries, function (index, entry) {
-				var $entry = $(entry);
-				var $image = $entry.find('img');
-
-				if ($image.data('jg.loaded') !== true) {
-					$image.data('jg.loaded', false);
-
-					//DEBUG// console.log('listed ' + $image.attr('alt'));
-
-					imagesToLoad = true;
-
-					// Spinner start
-					if (context.spinner.active === false) {
-						context.spinner.active = true;
-						$gallery.append(context.spinner.$el);
-						$gallery.height(context.offY + context.spinner.$el.innerHeight());
-						startLoadingSpinnerAnimation(context.spinner);
-					}
-
-					// Link Rel global overwrite
-					if (context.settings.rel !== null) $entry.attr('rel', context.settings.rel);
-
-					// Link Target global overwrite
-					if (context.settings.target !== null) $entry.attr('target', context.settings.target);
-
-					// Image src
-					var imageSrc = (typeof $image.data('safe-src') !== 'undefined') ? $image.data('safe-src') : $image.attr('src');
-					$image.data('jg.originalSrc', imageSrc);
-					$image.attr('src', imageSrc);
-
-					/* Check if the image is loaded or not using another image object.
-						We cannot use the 'complete' image property, because some browsers, 
-						with a 404 set complete = true */
-					var loadImg = new Image();
-					var $loadImg = $(loadImg);
-					$loadImg.one('load', function imgLoaded () {
-						//DEBUG// console.log('img load (alt: ' + $image.attr('alt') + ')');
-						$image.off('load error');
-						$image.data('jg.imgw', loadImg.width);
-						$image.data('jg.imgh', loadImg.height);
-						$image.data('jg.loaded', true);
-						startImgAnalyzer(context, false);
-					});
-					$loadImg.one('error', function imgLoadError () {
-						//DEBUG// console.log('img error (alt: ' + $image.attr('alt') + ')');
-						$image.off('load error');
-						$image.data('jg.loaded', 'error');
-						startImgAnalyzer(context, false);
-					});
-					loadImg.src = imageSrc;
-
-				}
-
-			});
-
-			if (!imagesToLoad) startImgAnalyzer(context, false);
-			checkWidth(context);
-		});
-
-	};
-	
+  /* Events
+    jg.complete : called when all the gallery has been created
+    jg.resize : called when the gallery has been resized
+  */
+
+  $.fn.justifiedGallery = function (arg) {
+
+    // Default options
+    var defaults = {
+      sizeRangeSuffixes : {
+        'lt100': '_t', 
+        'lt240': '_m', 
+        'lt320': '_n', 
+        'lt500': '', 
+        'lt640': '_z', 
+        'lt1024': '_b'
+      },
+      rowHeight : 120,
+      maxRowHeight : 0, //negative value = no limits, 0 = 1.5 * rowHeight
+      margins : 1,
+      lastRow : 'nojustify', // or can be 'justify' or 'hide'
+      justifyThreshold: 0.75, /* if row width / available space > 0.75 it will be always justified 
+                    (i.e. lastRow setting is not considered) */
+      fixedHeight : false,
+      waitThumbnailsLoad : true,
+      captions : true,
+      cssAnimation: false,
+      imagesAnimationDuration : 500, //ignored with css animations
+      captionSettings : { //ignored with css animations
+        animationDuration : 500,
+        visibleOpacity : 0.7, 
+        nonVisibleOpacity : 0.0 
+      },
+      rel : null, //rewrite the rel of each analyzed links
+      target : null, //rewrite the target of all links
+      extension : /\.[^.\\/]+$/,
+      refreshTime : 100,
+      randomize : false
+    };
+
+    function getSuffix(width, height, context) {
+      var longestSide;
+      longestSide = (width > height) ? width : height;
+      if (longestSide <= 100) {
+        return context.settings.sizeRangeSuffixes.lt100;
+      } else if (longestSide <= 240) {
+        return context.settings.sizeRangeSuffixes.lt240;
+      } else if (longestSide <= 320) {
+        return context.settings.sizeRangeSuffixes.lt320;
+      } else if (longestSide <= 500) {
+        return context.settings.sizeRangeSuffixes.lt500;
+      } else if (longestSide <= 640) {
+        return context.settings.sizeRangeSuffixes.lt640;
+      } else {
+        return context.settings.sizeRangeSuffixes.lt1024;
+      }
+    }
+
+    function endsWith(str, suffix) {
+      return str.indexOf(suffix, str.length - suffix.length) !== -1;
+    }
+
+    function removeSuffix(str, suffix) {
+      return str.substring(0, str.length - suffix.length);
+    }
+
+    function getUsedSuffix(str, context) {
+      var voidSuffix = false;
+      for (var si in context.settings.sizeRangeSuffixes) {
+        if (context.settings.sizeRangeSuffixes[si].length === 0) {
+          voidSuffix = true;
+          continue;
+        }
+        if (endsWith(str, context.settings.sizeRangeSuffixes[si])) {
+          return context.settings.sizeRangeSuffixes[si];
+        }
+      }
+
+      if (voidSuffix) return "";
+      else throw 'unknown suffix for ' + str;
+    }
+
+    /* Given an image src, with the width and the height, returns the new image src with the
+       best suffix to show the best quality thumbnail. */
+    function newSrc(imageSrc, imgWidth, imgHeight, context) {
+      var matchRes = imageSrc.match(context.settings.extension);
+      var ext = (matchRes != null) ? matchRes[0] : '';
+      var newImageSrc = imageSrc.replace(context.settings.extension, '');
+      newImageSrc = removeSuffix(newImageSrc, getUsedSuffix(newImageSrc, context));
+      newImageSrc += getSuffix(imgWidth, imgHeight, context) + ext;
+      return newImageSrc;
+    }
+
+    function onEntryMouseEnterForCaption (ev) {
+      var $caption = $(ev.currentTarget).find('.caption');
+      if (ev.data.settings.cssAnimation) {
+        $caption.addClass('caption-visible').removeClass('caption-hidden');
+      } else {
+        $caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, 
+                               ev.data.settings.captionSettings.visibleOpacity);
+      }
+    }
+
+    function onEntryMouseLeaveForCaption (ev) {
+      var $caption = $(ev.currentTarget).find('.caption');
+      if (ev.data.settings.cssAnimation) {
+        $caption.removeClass('caption-visible').removeClass('caption-hidden');
+      } else {
+        $caption.stop().fadeTo(ev.data.settings.captionSettings.animationDuration, 
+                               ev.data.settings.captionSettings.nonVisibleOpacity);
+      }
+    }
+
+    function showImg($entry, callback, context) {
+      if (context.settings.cssAnimation) {
+        $entry.addClass('entry-visible');
+        callback();
+      } else {
+        $entry.stop().fadeTo(context.settings.imagesAnimationDuration, 1.0, callback);
+      }
+    }
+
+    function hideImgImmediately($entry, context) {
+      if (context.settings.cssAnimation) {
+        $entry.removeClass('entry-visible');
+      } else {
+        $entry.stop().fadeTo(0, 0);
+      }
+    }
+
+    function displayEntry($entry, x, y, imgWidth, imgHeight, rowHeight, context) {
+      var $image = $entry.find('img');
+      $image.css('width', imgWidth);
+      $image.css('height', imgHeight);
+      $image.css('margin-left', - imgWidth / 2);
+      $image.css('margin-top', - imgHeight / 2);
+      $entry.width(imgWidth);
+      $entry.height(rowHeight);
+      $entry.css('top', y);
+      $entry.css('left', x);
+
+      //DEBUG// console.log('displayEntry (w: ' + $image.width() + ' h: ' + $image.height());
+
+      // Image reloading for an high quality of thumbnails
+      var imageSrc = $image.attr('src');
+      var newImageSrc = newSrc(imageSrc, imgWidth, imgHeight, context);
+
+      $image.one('error', function () {
+        //DEBUG// console.log('revert the original image');
+        $image.attr('src', $image.data('jg.originalSrc')); //revert to the original thumbnail, we got it.
+      });
+
+      function loadNewImage() {
+        if (imageSrc !== newImageSrc) { //load the new image after the fadeIn
+          $image.attr('src', newImageSrc);
+        }
+      }
+
+      if ($image.data('jg.loaded') === 'skipped') {
+        $image.one('load', function() {
+          showImg($entry, loadNewImage, context);
+          $image.data('jg.loaded', 'loaded');
+        });
+      } else {
+        showImg($entry, loadNewImage, context);
+      }
+
+      // Captions ------------------------------
+      var captionMouseEvents = $entry.data('jg.captionMouseEvents');
+      if (context.settings.captions === true) {
+        var $imgCaption = $entry.find('.caption');
+        if ($imgCaption.length === 0) { // Create it if it doesn't exists
+          var caption = $image.attr('alt');
+          if (typeof caption === 'undefined') caption = $entry.attr('title');
+          if (typeof caption !== 'undefined') { // Create only we found something
+            $imgCaption = $('<div class="caption">' + caption + '</div>');
+            $entry.append($imgCaption);
+          }
+        }
+      
+        // Create events (we check again the $imgCaption because it can be still inexistent)
+        if ($imgCaption.length !== 0) {
+          if (!context.settings.cssAnimation) {
+            $imgCaption.stop().fadeTo(context.settings.imagesAnimationDuration, 
+                                      context.settings.captionSettings.nonVisibleOpacity); 
+          }
+          if (typeof captionMouseEvents === 'undefined') {
+            captionMouseEvents = {
+              mouseenter: onEntryMouseEnterForCaption,
+              mouseleave: onEntryMouseLeaveForCaption
+            };
+            $entry.on('mouseenter', undefined, context, captionMouseEvents.mouseenter);
+            $entry.on('mouseleave', undefined, context, captionMouseEvents.mouseleave);
+            $entry.data('jg.captionMouseEvents', captionMouseEvents);
+          }
+        }
+      } else {
+        if (typeof captionMouseEvents !== 'undefined') {
+          $entry.off('mouseenter', undefined, context, captionMouseEvents.mouseenter);
+          $entry.off('mouseleave', undefined, context, captionMouseEvents.mouseleave);
+          $entry.removeData('jg.captionMouseEvents');
+        }
+      }
+
+    }
+
+    function prepareBuildingRow(context, isLastRow) {
+      var settings = context.settings;
+      var i, $entry, $image, imgAspectRatio, newImgW, newImgH, justify = true;
+      var minHeight = 0;
+      var availableWidth = context.galleryWidth - (
+                          (context.buildingRow.entriesBuff.length - 1) * settings.margins);
+      var rowHeight = availableWidth / context.buildingRow.aspectRatio;
+      var justificable = context.buildingRow.width / availableWidth > settings.justifyThreshold;
+
+      //Skip the last row if we can't justify it and the lastRow == 'hide'
+      if (isLastRow && settings.lastRow === 'hide' && !justificable) {
+        for (i = 0; i < context.buildingRow.entriesBuff.length; i++) {
+          $entry = context.buildingRow.entriesBuff[i];
+          if (settings.cssAnimation) 
+            $entry.removeClass('entry-visible');            
+          else
+            $entry.stop().fadeTo(0, 0);
+        }
+        return -1;
+      }
+
+      // With lastRow = nojustify, justify if is justificable (the images will not become too big)
+      if (isLastRow && !justificable && settings.lastRow === 'nojustify') justify = false;
+
+      for (i = 0; i < context.buildingRow.entriesBuff.length; i++) {
+        $image = context.buildingRow.entriesBuff[i].find('img');
+        imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh');
+
+        if (justify) {
+          newImgW = rowHeight * imgAspectRatio;
+          newImgH = rowHeight;
+
+          /* With fixedHeight the newImgH must be greater than rowHeight. 
+          In some cases here this is not satisfied (due to the justification).
+          But we comment it, because is better to have a shorter but justified row instead 
+          to have a cropped image at the end. */
+          /*if (settings.fixedHeight && newImgH < settings.rowHeight) {
+            newImgW = settings.rowHeight * imgAspectRatio;
+            newImgH = settings.rowHeight;
+          }*/
+        } else {
+          newImgW = settings.rowHeight * imgAspectRatio;
+          newImgH = settings.rowHeight;
+        }
+
+        $image.data('jg.imgw', Math.ceil(newImgW));
+        $image.data('jg.imgh', Math.ceil(newImgH));
+        if (i === 0 || minHeight > newImgH) minHeight = newImgH;
+      }
+
+      if (settings.fixedHeight && minHeight > settings.rowHeight) 
+        minHeight = settings.rowHeight;
+
+      return {minHeight: minHeight, justify: justify};
+    }
+
+    function rewind(context) {
+      context.lastAnalyzedIndex = -1;
+      context.buildingRow.entriesBuff = [];
+      context.buildingRow.aspectRatio = 0;
+      context.buildingRow.width = 0;
+      context.offY = 0;
+    }
+
+    function flushRow(context, isLastRow) {
+      var settings = context.settings;
+      var $entry, $image, minHeight, buildingRowRes, offX = 0;
+
+      //DEBUG// console.log('flush (isLastRow: ' + isLastRow + ')');
+
+      buildingRowRes = prepareBuildingRow(context, isLastRow);
+      minHeight = buildingRowRes.minHeight;
+      if (isLastRow && settings.lastRow === 'hide' && minHeight === -1) {
+        context.buildingRow.entriesBuff = [];
+        context.buildingRow.aspectRatio = 0;
+        context.buildingRow.width = 0;
+        return;
+      }
+
+      if (settings.maxRowHeight > 0 && settings.maxRowHeight < minHeight)
+        minHeight = settings.maxRowHeight;
+      else if (settings.maxRowHeight === 0 && (1.5 * settings.rowHeight) < minHeight)
+        minHeight = 1.5 * settings.rowHeight;
+
+      for (var i = 0; i < context.buildingRow.entriesBuff.length; i++) {
+        $entry = context.buildingRow.entriesBuff[i];
+        $image = $entry.find('img');
+        displayEntry($entry, offX, context.offY, $image.data('jg.imgw'), 
+                     $image.data('jg.imgh'), minHeight, context);
+        offX += $image.data('jg.imgw') + settings.margins;
+      }
+
+      //Gallery Height
+      context.$gallery.height(context.offY + minHeight +
+        (context.spinner.active ? context.spinner.$el.innerHeight() : 0)
+      );
+
+      if (!isLastRow || (minHeight <= context.settings.rowHeight && buildingRowRes.justify)) {
+        //Ready for a new row
+        context.offY += minHeight + context.settings.margins;
+
+        //DEBUG// console.log('minHeight: ' + minHeight + ' offY: ' + context.offY);
+
+        context.buildingRow.entriesBuff = []; //clear the array creating a new one
+        context.buildingRow.aspectRatio = 0;
+        context.buildingRow.width = 0;
+        context.$gallery.trigger('jg.rowflush');
+      }
+    }
+
+    function checkWidth(context) {
+      context.checkWidthIntervalId = setInterval(function () {
+        var galleryWidth = parseInt(context.$gallery.width(), 10);
+        if (context.galleryWidth !== galleryWidth) {
+          //DEBUG// console.log("resize. old: " + context.galleryWidth + " new: " + galleryWidth);
+          
+          context.galleryWidth = galleryWidth;
+          rewind(context);
+
+          // Restart to analyze
+          startImgAnalyzer(context, true);
+        }
+      }, context.settings.refreshTime);
+    } 
+
+    function startLoadingSpinnerAnimation(spinnerContext) {
+      clearInterval(spinnerContext.intervalId);
+      spinnerContext.intervalId = setInterval(function () {
+        if (spinnerContext.phase < spinnerContext.$points.length) 
+          spinnerContext.$points.eq(spinnerContext.phase).fadeTo(spinnerContext.timeslot, 1);
+        else
+          spinnerContext.$points.eq(spinnerContext.phase - spinnerContext.$points.length)
+                        .fadeTo(spinnerContext.timeslot, 0);
+        spinnerContext.phase = (spinnerContext.phase + 1) % (spinnerContext.$points.length * 2);
+      }, spinnerContext.timeslot);
+    }
+
+    function stopLoadingSpinnerAnimation(spinnerContext) {
+      clearInterval(spinnerContext.intervalId);
+      spinnerContext.intervalId = null;
+    }
+
+    function stopImgAnalyzerStarter(context) {
+      context.yield.flushed = 0;
+      if (context.imgAnalyzerTimeout !== null) clearTimeout(context.imgAnalyzerTimeout);
+    }
+
+    function startImgAnalyzer(context, isForResize) {
+      stopImgAnalyzerStarter(context);
+      context.imgAnalyzerTimeout = setTimeout(function () { 
+        analyzeImages(context, isForResize); 
+      }, 0.001);
+      analyzeImages(context, isForResize);
+    }
+
+    function analyzeImages(context, isForResize) {
+      
+      /* //DEBUG// 
+      var rnd = parseInt(Math.random() * 10000, 10);
+      console.log('analyzeImages ' + rnd + ' start');
+      console.log('images status: ');
+      for (var i = 0; i < context.entries.length; i++) {
+        var $entry = $(context.entries[i]);
+        var $image = $entry.find('img');
+        console.log(i + ' (alt: ' + $image.attr('alt') + 'loaded: ' + $image.data('jg.loaded') + ')');
+      }*/
+
+      /* The first row */
+      var settings = context.settings;
+      var isLastRow;
+      
+      for (var i = context.lastAnalyzedIndex + 1; i < context.entries.length; i++) {
+        var $entry = $(context.entries[i]);
+        var $image = $entry.find('img');
+
+        if ($image.data('jg.loaded') === true || $image.data('jg.loaded') === 'skipped') {
+          isLastRow = i >= context.entries.length - 1;
+
+          var availableWidth = context.galleryWidth - (
+                               (context.buildingRow.entriesBuff.length - 1) * settings.margins);
+          var imgAspectRatio = $image.data('jg.imgw') / $image.data('jg.imgh');
+          if (availableWidth / (context.buildingRow.aspectRatio + imgAspectRatio) < settings.rowHeight) {
+            flushRow(context, isLastRow);
+            if(++context.yield.flushed >= context.yield.every) {
+              //DEBUG// console.log("yield");
+              startImgAnalyzer(context, isForResize);
+              return;
+            }
+          }
+
+          context.buildingRow.entriesBuff.push($entry);
+          context.buildingRow.aspectRatio += imgAspectRatio;
+          context.buildingRow.width += imgAspectRatio * settings.rowHeight;
+          context.lastAnalyzedIndex = i;
+
+        } else if ($image.data('jg.loaded') !== 'error') {
+          return;
+        }
+      }
+
+      // Last row flush (the row is not full)
+      if (context.buildingRow.entriesBuff.length > 0) flushRow(context, true);
+
+      if (context.spinner.active) {
+        context.spinner.active = false;
+        context.$gallery.height(context.$gallery.height() - context.spinner.$el.innerHeight());
+        context.spinner.$el.detach();
+        stopLoadingSpinnerAnimation(context.spinner);
+      }
+
+      /* Stop, if there is, the timeout to start the analyzeImages.
+          This is because an image can be set loaded, and the timeout can be set,
+          but this image can be analyzed yet. 
+      */
+      stopImgAnalyzerStarter(context);
+
+      //On complete callback
+      if (!isForResize) 
+        context.$gallery.trigger('jg.complete'); 
+      else 
+        context.$gallery.trigger('jg.resize');
+
+      //DEBUG// console.log('analyzeImages ' + rnd +  ' end');
+    }
+
+    function checkSettings (context) {
+      var settings = context.settings;
+
+      function checkSuffixesRange(range) {
+        if (typeof settings.sizeRangeSuffixes[range] !== 'string')
+          throw 'sizeRangeSuffixes.' + range + ' must be a string';
+      }
+
+      function checkOrConvertNumber(parent, settingName) {
+        if (typeof parent[settingName] === 'string') {
+          parent[settingName] = parseFloat(parent[settingName], 10);
+          if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName;
+        } else if (typeof parent[settingName] === 'number') {
+          if (isNaN(parent[settingName])) throw 'invalid number for ' + settingName;
+        } else {
+          throw settingName + ' must be a number';
+        }
+      }
+
+      if (typeof settings.sizeRangeSuffixes !== 'object')
+        throw 'sizeRangeSuffixes must be defined and must be an object';
+
+      checkSuffixesRange('lt100');
+      checkSuffixesRange('lt240');
+      checkSuffixesRange('lt320');
+      checkSuffixesRange('lt500');
+      checkSuffixesRange('lt640');
+      checkSuffixesRange('lt1024');
+
+      checkOrConvertNumber(settings, 'rowHeight');
+      checkOrConvertNumber(settings, 'maxRowHeight');
+
+      if (settings.maxRowHeight > 0 && 
+          settings.maxRowHeight < settings.rowHeight) {
+        settings.maxRowHeight = settings.rowHeight;
+      }
+      
+      checkOrConvertNumber(settings, 'margins');
+
+      if (settings.lastRow !== 'nojustify' &&
+          settings.lastRow !== 'justify' &&
+          settings.lastRow !== 'hide') {
+        throw 'lastRow must be "nojustify", "justify" or "hide"';
+      }
+
+      checkOrConvertNumber(settings, 'justifyThreshold');
+      if (settings.justifyThreshold < 0 || settings.justifyThreshold > 1)
+        throw 'justifyThreshold must be in the interval [0,1]';
+      if (typeof settings.cssAnimation !== 'boolean') {
+        throw 'cssAnimation must be a boolean'; 
+      }
+      
+      checkOrConvertNumber(settings.captionSettings, 'animationDuration');
+      checkOrConvertNumber(settings, 'imagesAnimationDuration');
+
+      checkOrConvertNumber(settings.captionSettings, 'visibleOpacity');
+      if (settings.captionSettings.visibleOpacity < 0 || settings.captionSettings.visibleOpacity > 1)
+        throw 'captionSettings.visibleOpacity must be in the interval [0, 1]';
+
+      checkOrConvertNumber(settings.captionSettings, 'nonVisibleOpacity');
+      if (settings.captionSettings.visibleOpacity < 0 || settings.captionSettings.visibleOpacity > 1)
+        throw 'captionSettings.nonVisibleOpacity must be in the interval [0, 1]';
+
+      if (typeof settings.fixedHeight !== 'boolean') {
+        throw 'fixedHeight must be a boolean';  
+      }
+
+      if (typeof settings.captions !== 'boolean') {
+        throw 'captions must be a boolean'; 
+      }
+
+      checkOrConvertNumber(settings, 'refreshTime');
+
+      if (typeof settings.randomize !== 'boolean') {
+        throw 'randomize must be a boolean';  
+      }
+
+    }
+
+    return this.each(function (index, gallery) {
+
+      var $gallery = $(gallery);
+      $gallery.addClass('justified-gallery');
+
+      var context = $gallery.data('jg.context');
+      if (typeof context === 'undefined') {
+
+        if (typeof arg !== 'undefined' && arg !== null && typeof arg !== 'object') 
+          throw 'The argument must be an object';
+
+        // Spinner init
+        var $spinner = $('<div class="spinner"><span></span><span></span><span></span></div>');
+
+        //Context init
+        context = {
+          settings : $.extend({}, defaults, arg),
+          imgAnalyzerTimeout : null,
+          entries : null,
+          buildingRow : {
+            entriesBuff : [],
+            width : 0,
+            aspectRatio : 0
+          },
+          lastAnalyzedIndex : -1,
+          yield : {
+            every : 2, /* do a flush every context.yield.every flushes (
+                  * must be greater than 1, else the analyzeImages will loop */
+            flushed : 0 //flushed rows without a yield
+          },
+          offY : 0,
+          spinner : {
+            active : false,
+            phase : 0,
+            timeslot : 150,
+            $el : $spinner,
+            $points : $spinner.find('span'),
+            intervalId : null
+          },
+          checkWidthIntervalId : null,
+          galleryWidth : $gallery.width(),
+          $gallery : $gallery
+        };
+
+        $gallery.data('jg.context', context);
+
+      } else if (arg === 'norewind') {
+        /* Hide the image of the buildingRow to prevent strange effects when the row will be
+           re-justified again */
+        for (var i = 0; i < context.buildingRow.entriesBuff.length; i++) {
+          hideImgImmediately(context.buildingRow.entriesBuff[i], context);
+        }
+        // In this case we don't rewind, and analyze all the images
+      } else {
+        context.settings = $.extend({}, context.settings, arg);
+        rewind(context);
+      }
+      
+      checkSettings(context);
+
+      context.entries = $gallery.find('> a, > div:not(.spinner, #page-end)').toArray();
+      if (context.entries.length === 0) return;
+
+      // Randomize
+      if (context.settings.randomize) {
+        context.entries.sort(function () { return Math.random() * 2 - 1; });
+        $.each(context.entries, function () {
+          $(this).appendTo($gallery);
+        });
+      }
+
+      var imagesToLoad = false;
+      $.each(context.entries, function (index, entry) {
+        var $entry = $(entry);
+        var $image = $entry.find('img');
+
+        if ($image.data('jg.loaded') !== true && $image.data('jg.loaded') !== 'skipped') {
+
+          // Link Rel global overwrite
+          if (context.settings.rel !== null) $entry.attr('rel', context.settings.rel);
+
+          // Link Target global overwrite
+          if (context.settings.target !== null) $entry.attr('target', context.settings.target);
+
+          // Image src
+          var imageSrc = (typeof $image.data('safe-src') !== 'undefined') ? 
+                            $image.data('safe-src') : $image.attr('src');
+          $image.data('jg.originalSrc', imageSrc);
+          $image.attr('src', imageSrc);
+
+          var width = parseInt($image.attr('width'), 10);
+          var height = parseInt($image.attr('height'), 10);
+          if(context.settings.waitThumbnailsLoad !== true && !isNaN(width) && !isNaN(height)) {
+            $image.data('jg.imgw', width);
+            $image.data('jg.imgh', height);
+            $image.data('jg.loaded', 'skipped');
+            startImgAnalyzer(context, false);
+            return true;
+          }
+
+          $image.data('jg.loaded', false);
+          imagesToLoad = true;
+
+          // Spinner start
+          if (context.spinner.active === false) {
+            context.spinner.active = true;
+            $gallery.append(context.spinner.$el);
+            $gallery.height(context.offY + context.spinner.$el.innerHeight());
+            startLoadingSpinnerAnimation(context.spinner);
+          }
+
+          /* Check if the image is loaded or not using another image object.
+            We cannot use the 'complete' image property, because some browsers, 
+            with a 404 set complete = true */
+          var loadImg = new Image();
+          var $loadImg = $(loadImg);
+          $loadImg.one('load', function imgLoaded () {
+            //DEBUG// console.log('img load (alt: ' + $image.attr('alt') + ')');
+            $image.off('load error');
+            $image.data('jg.imgw', loadImg.width);
+            $image.data('jg.imgh', loadImg.height);
+            $image.data('jg.loaded', true);
+            startImgAnalyzer(context, false);
+          });
+          $loadImg.one('error', function imgLoadError () {
+            //DEBUG// console.log('img error (alt: ' + $image.attr('alt') + ')');
+            $image.off('load error');
+            $image.data('jg.loaded', 'error');
+            startImgAnalyzer(context, false);
+          });
+          loadImg.src = imageSrc;
+
+        }
+
+      });
+
+      if (!imagesToLoad) startImgAnalyzer(context, false);
+      checkWidth(context);
+    });
+
+  };
+  
 }(jQuery));
diff --git a/mod/admin.php b/mod/admin.php
index 68ce6fe85..06f44c89b 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -687,7 +687,9 @@ function admin_page_users(&$a){
 	$order = " order by account_email asc ";
 	if($_REQUEST['order'] === 'expires')
 		$order = " order by account_expires desc ";
-
+    if($_REQUEST['order'] === 'created')
+		$order = " order by account_created desc ";
+		
 	$users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . 			"`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " .
 			"(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " .
 			"WHERE ch.channel_account_id = ac.account_id and not (ch.channel_pageflags & %d )) as `channels` " .
diff --git a/mod/photos.php b/mod/photos.php
index f2df894c0..44a7ce0f0 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -703,7 +703,7 @@ function photos_content(&$a) {
 		if(count($r)) {
 			$twist = 'rotright';
 			$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
-			$o .= '<div id="photo-album-contents-' . $a->pager['page'] . '">';
+			$o .= '<div id="photo-album-contents">';
 
 			foreach($r as $rr) {
 
@@ -758,20 +758,15 @@ function photos_content(&$a) {
 				echo $ajaxout;
 				killme();
 			}
-
-			echo '<div id="photo-album-contents-' . $a->pager['page'] . '">';
 			echo $ajaxout;
-			echo '</div>';
-			echo '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
+			echo '<script>justifyPhotosAjax();</script>';
 			killme();
 		}
 
-
-		$o .= '</div>';    // photo-album-contents
-		$o .= '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
 		$o .= '<div id="page-end"></div>';
+		$o .= '</div>';    // photo-album-contents
 		$o .= '<div id="photo-album-end"></div>';
-		$o .= '<script>$(document).ready(function() { loadingPage = false;});</script>';
+		$o .= '<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>';
 		$o .= '<div id="page-spinner"></div>';
 //		$o .= paginate($a);
 
@@ -1226,7 +1221,6 @@ function photos_content(&$a) {
 		if($photos) {
 			$o = replace_macros(get_markup_template('photosajax.tpl'),array(
 				'$photos' => $photos,
-				'$page' => $a->pager['page']
 			));
 		}
 		else {
@@ -1243,7 +1237,6 @@ function photos_content(&$a) {
 			'$can_post' => $can_post,
 			'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'),
 			'$photos' => $photos,
-			'$page' => $a->pager['page']
 		));
 
 	}
diff --git a/view/js/main.js b/view/js/main.js
index 2e297c9d6..086ef3196 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -704,22 +704,26 @@ function updateConvItems(mode,data) {
 
 	}
 
-	function justifyPhotos(bParam_page) {
+	function justifyPhotos() {
 		justifiedGalleryActive = true;
-		$('#photo-album-contents-' + bParam_page).justifiedGallery({
-			lastRow : 'nojustify',
+		$('#photo-album-contents').justifiedGallery({
 			margins: 3,
-			sizeRangeSuffixes : {
+			sizeRangeSuffixes: {
 				'lt100': '-2',
 				'lt240': '-2',
 				'lt320': '-2',
-				'lt500': '-1',
+				'lt500': '',
 				'lt640': '-1',
 				'lt1024': '-0'
 			}
 		}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
 	}
 
+	function justifyPhotosAjax() {
+		justifiedGalleryActive = true;
+		$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
+	}
+
 	function notify_popup_loader(notifyType) {
 
 		/* notifications template */
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 0f86a635d..fce518cfe 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -3,14 +3,12 @@
 <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
 {{/if}}
 
-<div id="photo-album-contents-{{$page}}">
+<div id="photo-album-contents">
 {{foreach $photos as $photo}}
 	{{include file="photo_top.tpl"}}
 {{/foreach}}
-
-</div>
-<script>justifyPhotos({{$page}});</script>
 <div id="page-end"></div>
+</div>
 <div class="photos-end"></div>
-<script>$(document).ready(function() { loadingPage = false;});</script>
+<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
 <div id="page-spinner"></div>
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
index a9a9605d0..632aab2b3 100755
--- a/view/tpl/photosajax.tpl
+++ b/view/tpl/photosajax.tpl
@@ -1,7 +1,4 @@
-<!-- -->
-<div id="photo-album-contents-{{$page}}">
 {{foreach $photos as $photo}}
 	{{include file="photo_top.tpl"}}
 {{/foreach}}
-</div>
-<script>justifyPhotos({{$page}});</script>
+<script>justifyPhotosAjax()</script>