Merge branch 'master' of https://github.com/friendica/red

2 files changed, 80 insertions, 101 deletions

diff --git a/view/js/main.js b/view/js/main.js
index ac457f5ea..f43ae4d1b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -112,8 +112,9 @@
 		return true;
 	}
 
-
-
+	function viewsrc(id) {
+		$.colorbox({href: 'viewsrc/' + id });
+	}
 
 	function qCommentInsert(obj,id) {
 		var tmpStr = $("#comment-edit-text-" + id).val();
@@ -196,17 +197,6 @@
 
 		msie = false; // $.browser.msie ;
 		
-		/* setup tooltips *//*
-		$("a,.tt").each(function(){
-			var e = $(this);
-			var pos="bottom";
-			if (e.hasClass("tttop")) pos="top";
-			if (e.hasClass("ttbottom")) pos="bottom";
-			if (e.hasClass("ttleft")) pos="left";
-			if (e.hasClass("ttright")) pos="right";
-			e.tipTip({defaultPosition: pos, edgeOffset: 8});
-		});*/
-		
 		var e = document.getElementById('content-complete');
 		if(e)
 			pageHasMoreContent = false;		
@@ -600,7 +590,7 @@ function updateConvItems(mode,data) {
 
 		var update_url;
 
-		if(typeof buildCmd == 'function') {
+//		if(typeof buildCmd == 'function') {
 			if(scroll_next) {
 				bParam_page = next_page;
 				page_load = true;
@@ -609,12 +599,12 @@ function updateConvItems(mode,data) {
 				bParam_page = 1;
 			}
 			update_url = buildCmd();
-		}
-		else {
-			page_load = false;
-			var udargs = ((page_load) ? '/load' : '');
-			update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
-		}
+//		}
+//		else {
+//			page_load = false;
+//			var udargs = ((page_load) ? '/load' : '');
+//			update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
+//		}
 
 		if(page_load)
 			$("#page-spinner").spin('small');
@@ -648,15 +638,6 @@ function updateConvItems(mode,data) {
 
 	}
 
-
-	function imgbright(node) {
-//		$(node).removeClass("drophide").addClass("drop");
-	}
-
-	function imgdull(node) {
-//		$(node).removeClass("drop").addClass("drophide");
-	}
-
 	function notify_popup_loader(notifyType) {
 
 		/* notifications template */
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index fa788280d..4daa7f704 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -25,100 +25,98 @@ $(document).ready(function() {
 });
 
 function channel_privacy_macro(n) {
-    if(n == 0) {
-        $('#id_view_stream option').eq(0).attr('selected','selected');
-        $('#id_view_profile option').eq(0).attr('selected','selected');
-        $('#id_view_photos option').eq(0).attr('selected','selected');
-        $('#id_view_contacts option').eq(0).attr('selected','selected');
-        $('#id_view_storage option').eq(0).attr('selected','selected');
-        $('#id_view_pages option').eq(0).attr('selected','selected');
-        $('#id_send_stream option').eq(0).attr('selected','selected');
-        $('#id_post_wall option').eq(0).attr('selected','selected');
-        $('#id_post_comments option').eq(0).attr('selected','selected');
-        $('#id_post_mail option').eq(0).attr('selected','selected');
-        $('#id_post_photos option').eq(0).attr('selected','selected');
-        $('#id_tag_deliver option').eq(0).attr('selected','selected');
-        $('#id_chat option').eq(0).attr('selected','selected');
-        $('#id_write_storage option').eq(0).attr('selected','selected');
-        $('#id_write_pages option').eq(0).attr('selected','selected');
-        $('#id_delegate option').eq(0).attr('selected','selected');
+	if(n == 0) {
+		$('#id_view_stream option').eq(0).attr('selected','selected');
+		$('#id_view_profile option').eq(0).attr('selected','selected');
+		$('#id_view_photos option').eq(0).attr('selected','selected');
+		$('#id_view_contacts option').eq(0).attr('selected','selected');
+		$('#id_view_storage option').eq(0).attr('selected','selected');
+		$('#id_view_pages option').eq(0).attr('selected','selected');
+		$('#id_send_stream option').eq(0).attr('selected','selected');
+		$('#id_post_wall option').eq(0).attr('selected','selected');
+		$('#id_post_comments option').eq(0).attr('selected','selected');
+		$('#id_post_mail option').eq(0).attr('selected','selected');
+		$('#id_post_photos option').eq(0).attr('selected','selected');
+		$('#id_tag_deliver option').eq(0).attr('selected','selected');
+		$('#id_chat option').eq(0).attr('selected','selected');
+		$('#id_write_storage option').eq(0).attr('selected','selected');
+		$('#id_write_pages option').eq(0).attr('selected','selected');
+		$('#id_delegate option').eq(0).attr('selected','selected');
 		$('#id_republish option').eq(0).attr('selected','selected');
 		$('#id_bookmark option').eq(0).attr('selected','selected');
 		$('#id_profile_in_directory_onoff .off').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .on').addClass('hidden');
 		$('#id_profile_in_directory').val(0);
 	}
-    if(n == 1) {
-        $('#id_view_stream option').eq(1).attr('selected','selected');
-        $('#id_view_profile option').eq(1).attr('selected','selected');
-        $('#id_view_photos option').eq(1).attr('selected','selected');
-        $('#id_view_contacts option').eq(1).attr('selected','selected');
-        $('#id_view_storage option').eq(1).attr('selected','selected');
-        $('#id_view_pages option').eq(1).attr('selected','selected');
-        $('#id_send_stream option').eq(1).attr('selected','selected');
-        $('#id_post_wall option').eq(1).attr('selected','selected');
-        $('#id_post_comments option').eq(1).attr('selected','selected');
-        $('#id_post_mail option').eq(1).attr('selected','selected');
-        $('#id_post_photos option').eq(1).attr('selected','selected');
-        $('#id_tag_deliver option').eq(1).attr('selected','selected');
-        $('#id_chat option').eq(1).attr('selected','selected');
-        $('#id_write_storage option').eq(1).attr('selected','selected');
-        $('#id_write_pages option').eq(1).attr('selected','selected');
-        $('#id_delegate option').eq(0).attr('selected','selected');
+	if(n == 1) {
+		$('#id_view_stream option').eq(1).attr('selected','selected');
+		$('#id_view_profile option').eq(1).attr('selected','selected');
+		$('#id_view_photos option').eq(1).attr('selected','selected');
+		$('#id_view_contacts option').eq(1).attr('selected','selected');
+		$('#id_view_storage option').eq(1).attr('selected','selected');
+		$('#id_view_pages option').eq(1).attr('selected','selected');
+		$('#id_send_stream option').eq(1).attr('selected','selected');
+		$('#id_post_wall option').eq(1).attr('selected','selected');
+		$('#id_post_comments option').eq(1).attr('selected','selected');
+		$('#id_post_mail option').eq(1).attr('selected','selected');
+		$('#id_post_photos option').eq(1).attr('selected','selected');
+		$('#id_tag_deliver option').eq(1).attr('selected','selected');
+		$('#id_chat option').eq(1).attr('selected','selected');
+		$('#id_write_storage option').eq(1).attr('selected','selected');
+		$('#id_write_pages option').eq(1).attr('selected','selected');
+		$('#id_delegate option').eq(0).attr('selected','selected');
 		$('#id_republish option').eq(0).attr('selected','selected');
 		$('#id_bookmark option').eq(1).attr('selected','selected');
 		$('#id_profile_in_directory_onoff .off').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .on').addClass('hidden');
 		$('#id_profile_in_directory').val(0);
 	}
-    if(n == 2) {
-        $('#id_view_stream option').eq(6).attr('selected','selected');
-        $('#id_view_profile option').eq(6).attr('selected','selected');
-        $('#id_view_photos option').eq(6).attr('selected','selected');
-        $('#id_view_contacts option').eq(6).attr('selected','selected');
-        $('#id_view_storage option').eq(6).attr('selected','selected');
-        $('#id_view_pages option').eq(6).attr('selected','selected');
-        $('#id_send_stream option').eq(2).attr('selected','selected');
-        $('#id_post_wall option').eq(1).attr('selected','selected');
-        $('#id_post_comments option').eq(2).attr('selected','selected');
-        $('#id_post_mail option').eq(1).attr('selected','selected');
-        $('#id_post_photos option').eq(0).attr('selected','selected');
-        $('#id_tag_deliver option').eq(1).attr('selected','selected');
-        $('#id_chat option').eq(1).attr('selected','selected');
-        $('#id_write_storage option').eq(0).attr('selected','selected');
-        $('#id_write_pages option').eq(0).attr('selected','selected');
-        $('#id_delegate option').eq(0).attr('selected','selected');
+	if(n == 2) {
+		$('#id_view_stream option').eq(7).attr('selected','selected');
+		$('#id_view_profile option').eq(7).attr('selected','selected');
+		$('#id_view_photos option').eq(7).attr('selected','selected');
+		$('#id_view_contacts option').eq(7).attr('selected','selected');
+		$('#id_view_storage option').eq(7).attr('selected','selected');
+		$('#id_view_pages option').eq(7).attr('selected','selected');
+		$('#id_send_stream option').eq(2).attr('selected','selected');
+		$('#id_post_wall option').eq(1).attr('selected','selected');
+		$('#id_post_comments option').eq(2).attr('selected','selected');
+		$('#id_post_mail option').eq(1).attr('selected','selected');
+		$('#id_post_photos option').eq(0).attr('selected','selected');
+		$('#id_tag_deliver option').eq(1).attr('selected','selected');
+		$('#id_chat option').eq(1).attr('selected','selected');
+		$('#id_write_storage option').eq(0).attr('selected','selected');
+		$('#id_write_pages option').eq(0).attr('selected','selected');
+		$('#id_delegate option').eq(0).attr('selected','selected');
 		$('#id_republish option').eq(1).attr('selected','selected');
 		$('#id_bookmark option').eq(1).attr('selected','selected');
 		$('#id_profile_in_directory_onoff .on').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .off').addClass('hidden');
 		$('#id_profile_in_directory').val(1);
 	}
-    if(n == 3) {
-        $('#id_view_stream option').eq(6).attr('selected','selected');
-        $('#id_view_profile option').eq(6).attr('selected','selected');
-        $('#id_view_photos option').eq(6).attr('selected','selected');
-        $('#id_view_contacts option').eq(6).attr('selected','selected');
-        $('#id_view_storage option').eq(6).attr('selected','selected');
-        $('#id_view_pages option').eq(6).attr('selected','selected');
-        $('#id_send_stream option').eq(4).attr('selected','selected');
-        $('#id_post_wall option').eq(4).attr('selected','selected');
-        $('#id_post_comments option').eq(4).attr('selected','selected');
-        $('#id_post_mail option').eq(4).attr('selected','selected');
-        $('#id_post_photos option').eq(2).attr('selected','selected');
-        $('#id_tag_deliver option').eq(1).attr('selected','selected');
-        $('#id_chat option').eq(4).attr('selected','selected');
-        $('#id_write_storage option').eq(2).attr('selected','selected');
-        $('#id_write_pages option').eq(2).attr('selected','selected');
-        $('#id_delegate option').eq(0).attr('selected','selected');
-		$('#id_republish option').eq(4).attr('selected','selected');
-		$('#id_bookmark option').eq(4).attr('selected','selected');
+	if(n == 3) {
+		$('#id_view_stream option').eq(7).attr('selected','selected');
+		$('#id_view_profile option').eq(7).attr('selected','selected');
+		$('#id_view_photos option').eq(7).attr('selected','selected');
+		$('#id_view_contacts option').eq(7).attr('selected','selected');
+		$('#id_view_storage option').eq(7).attr('selected','selected');
+		$('#id_view_pages option').eq(7).attr('selected','selected');
+		$('#id_send_stream option').eq(5).attr('selected','selected');
+		$('#id_post_wall option').eq(5).attr('selected','selected');
+		$('#id_post_comments option').eq(5).attr('selected','selected');
+		$('#id_post_mail option').eq(5).attr('selected','selected');
+		$('#id_post_photos option').eq(2).attr('selected','selected');
+		$('#id_tag_deliver option').eq(1).attr('selected','selected');
+		$('#id_chat option').eq(5).attr('selected','selected');
+		$('#id_write_storage option').eq(2).attr('selected','selected');
+		$('#id_write_pages option').eq(2).attr('selected','selected');
+		$('#id_delegate option').eq(0).attr('selected','selected');
+		$('#id_republish option').eq(5).attr('selected','selected');
+		$('#id_bookmark option').eq(5).attr('selected','selected');
 		$('#id_profile_in_directory_onoff .on').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .off').addClass('hidden');
 		$('#id_profile_in_directory').val(1);
 
 	}
 
-
-
 }