Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 25 insertions, 26 deletions

diff --git a/view/js/mod_events.js b/view/js/mod_events.js
index fc25e4331..270bf798b 100644
--- a/view/js/mod_events.js
+++ b/view/js/mod_events.js
@@ -1,35 +1,34 @@
+/**
+ * JavaScript for mod/events
+ */
 
 $(document).ready( function() { showHideFinishDate(); });
 
-	function showHideFinishDate() {
-		if( $('#id_nofinish').is(':checked'))
-			$('#event-finish-wrapper').hide();
-		else
-			$('#event-finish-wrapper').show();
-	}
-
-	function eventGetStart() {
-		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
-		$('#startModal').modal();
-		$('#start-modal-OKButton').on('click', function() {
-    	reply=$('#start-date').val();
-    	if(reply && reply.length) {
+function showHideFinishDate() {
+	if( $('#id_nofinish').is(':checked'))
+		$('#event-finish-wrapper').hide();
+	else
+		$('#event-finish-wrapper').show();
+}
+function eventGetStart() {
+	//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+	$('#startModal').modal();
+	$('#start-modal-OKButton').on('click', function() {
+		reply=$('#start-date').val();
+		if(reply && reply.length) {
 			$('#start-text').val(reply);
 			$('#startModal').modal('hide');
 		}
-		})
-		
-		
-	}
-	function eventGetFinish() {
-		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
-		$('#finishModal').modal();
-		$('#finish-modal-OKButton').on('click', function() {
-    	reply=$('#finish-date').val();
-    	if(reply && reply.length) {
+	});
+}
+function eventGetFinish() {
+	//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+	$('#finishModal').modal();
+	$('#finish-modal-OKButton').on('click', function() {
+		reply=$('#finish-date').val();
+		if(reply && reply.length) {
 			$('#finish-text').val(reply);
 			$('#finishModal').modal('hide');
 		}
-		})
-				
-	}
+	});
+}
\ No newline at end of file