Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 63 insertions, 0 deletions

diff --git a/mod/lightpics/views/default/js/photos/upload.php b/mod/lightpics/views/default/js/photos/upload.php
new file mode 100644
index 000000000..e3922c8c8
--- /dev/null
+++ b/mod/lightpics/views/default/js/photos/upload.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ *
+ */
+
+if ($maxfilesize = (int) elgg_get_plugin_setting('maxfilesize', 'lightpics')) {
+	$maxfilesize *= 1024 * 1024;
+} else {
+	$maxfilesize = 5 * 1024 * 1024;
+}
+?>
+
+elgg.provide('elgg.tidypics.upload');
+
+elgg.tidypics.upload.init = function() {
+	
+	window.locale = {
+		"fileupload": {
+			"error": elgg.echo('tidypics:upload:error'),
+			"errors": {
+				"maxFileSize": elgg.echo('tidypics:upload:maxfilesize'),
+				"minFileSize": elgg.echo('tidypics:upload:minfilesize'),
+				"acceptFileTypes": elgg.echo('tidypics:upload:acceptfiletypes'),
+				"maxNumberOfFiles": elgg.echo('tidypics:upload:maxnumberoffiles'),
+			},
+		}
+	};
+	
+	$.widget('blueimpJUI.fileupload', $.blueimpUI.fileupload, {
+		_transition: function (node) {
+			var that = this,
+				deferred = $.Deferred();
+			if (node.hasClass('fade')) {
+				node.fadeToggle(function () {
+					deferred.resolveWith(node);
+				});
+			} else {
+				deferred.resolveWith(node);
+			}
+			return deferred;
+		},
+	});
+
+	// Initialize the jQuery File Upload widget:
+	$('#fileupload').fileupload();
+
+	// Settings
+	$('#fileupload').fileupload('option', {
+		maxFileSize: <?php echo $maxfilesize; ?>,
+		acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
+		change: function() {
+			elgg.tidypics.upload.fileinput.hide().appendTo($('#fileupload'));
+			elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
+		},
+		drop: function () {
+			return false;
+		}
+	});
+	
+	elgg.tidypics.upload.fileinput = $('#fileupload .elgg-input-file');
+};
+
+elgg.register_hook_handler('init', 'system', elgg.tidypics.upload.init);