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, 8 insertions, 13 deletions

diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 0db0dd165..5dac96940 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -1,13 +1,12 @@
+/**
+ * JavaScript used by mod/settings
+ */
 
-var ispublic = aStr['everybody'] ;
+// is this used anywhere?
+var ispublic = aStr.everybody;
 
 $(document).ready(function() {
-	$('form').areYouSure(); // Warn user about unsaved settings
-
-	$("a#settings-default-perms-menu").colorbox({ 
-		'inline' : true, 
-		'transition' : 'elastic' 
-	});
+	$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
 
 	$("#id_permissions_role").change(function() {
 		var role = $("#id_permissions_role").val();
@@ -24,13 +23,11 @@ $(document).ready(function() {
 			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
-		if(selstr == null) { 
+		if(selstr === null) {
 			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
-
 	}).trigger('change');
-
 });
 
 /**
@@ -137,7 +134,5 @@ function channel_privacy_macro(n) {
 		$('#id_profile_in_directory_onoff .on').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .off').addClass('hidden');
 		$('#id_profile_in_directory').val(1);
-
 	}
-
-}
+}
\ No newline at end of file