Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php

1 files changed, 22 insertions, 0 deletions

diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js
new file mode 100644
index 000000000..d33713ee3
--- /dev/null
+++ b/view/js/mod_mitem.js
@@ -0,0 +1,22 @@
+$(document).ready(function() {
+
+	$("a#settings-default-perms-menu").colorbox({ 
+		'inline' : true, 
+		'transition' : 'elastic' 
+	});
+
+
+	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+		var selstr;
+		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+			selstr = $(this).text();
+			$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+			$('#jot-public').hide();
+		});
+		if(selstr == null) { 
+			$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+			$('#jot-public').show();
+		}
+
+	}).trigger('change');
+});