Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 46 insertions, 0 deletions

diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
new file mode 100644
index 000000000..b2737407b
--- /dev/null
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -0,0 +1,46 @@
+		$(function(){
+			var x = ($('#avatar_crop_x').val()) ? $('#avatar_crop_x').val() : 0;
+			var y = ($('#avatar_crop_y').val()) ? $('#avatar_crop_y').val() : 0;
+			var w = ($('#avatar_crop_w').val()) ? $('#avatar_crop_w').val() : $("#avatar_original img").attr("width");
+			var h = ($('#avatar_crop_h').val()) ? $('#avatar_crop_h').val() : $("#avatar_original img").attr("height");
+
+			jQuery("#avatar_original img").Jcrop({
+				onChange: showPreview,
+    			setSelect: [ x, y, w, h ],
+				onSelect: updateCoords,
+				aspectRatio: 1,
+				boxWidth: 480,
+				boxHeight: 480,
+				bgColor: '#000',
+				bgOpacity: .4
+			});
+		});
+
+		function showPreview(coords) {
+			var rx = 96 / coords.w;
+			var ry = 96 / coords.h;
+
+			var img_width = $("#avatar_original img").attr("width");
+			var img_height = $("#avatar_original img").attr("height");
+
+			$('#avatar_preview img').css({
+				width: Math.round(rx *img_width) + 'px',
+				height: Math.round(ry * img_height) + 'px',
+				marginLeft: '-' + Math.round(rx * coords.x) + 'px',
+				marginTop: '-' + Math.round(ry * coords.y) + 'px'
+			});
+		};
+
+		function updateCoords(c) {
+			$('#avatar_crop_x').val(c.x);
+			$('#avatar_crop_y').val(c.y);
+			$('#avatar_crop_w').val(c.w);
+			$('#avatar_crop_h').val(c.h);
+		};
+
+		function checkCoords() {
+			if (parseInt($('#avatar_crop_w').val())) return true;
+			alert('Please select a crop region then press submit.');
+			return false;
+		};
+