Merge pull request #2 from friendica/master

Upgraded to latest red

4 files changed, 20 insertions, 1 deletions

diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index 6bfa039a8..ed1577792 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -38,6 +38,7 @@ function connectFullShare() {
 	$('#me_id_perms_post_mail').attr('checked','checked');
 	$('#me_id_perms_chat').attr('checked','checked');
 	$('#me_id_perms_view_storage').attr('checked','checked');
+	$('#me_id_perms_republish').attr('checked','checked');
 }
 
 function connectCautiousShare() {
@@ -73,6 +74,8 @@ function connectForum() {
 	$('#me_id_perms_post_comments').attr('checked','checked');
 	$('#me_id_perms_post_mail').attr('checked','checked');
 	$('#me_id_perms_tag_deliver').attr('checked','checked');
+	$('#me_id_perms_republish').attr('checked','checked');
+
 }
 
 function connectSoapBox() {
diff --git a/view/js/mod_network.js b/view/js/mod_network.js
index 7c3a9d246..ca910ae52 100644
--- a/view/js/mod_network.js
+++ b/view/js/mod_network.js
@@ -3,7 +3,7 @@ $(document).ready(function() {
 	a = $("#search-text").autocomplete({ 
 		serviceUrl: baseurl + '/search_ac',
 		minChars: 2,
-		width: 350,
+		width: 250,
 	});
 }); 
 
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 1695372eb..e749cd761 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -37,6 +37,7 @@ function channel_privacy_macro(n) {
         $('#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_profile_in_directory_onoff .off').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .on').addClass('hidden');
 		$('#id_profile_in_directory').val(0);
@@ -58,6 +59,7 @@ function channel_privacy_macro(n) {
         $('#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_profile_in_directory_onoff .off').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .on').addClass('hidden');
 		$('#id_profile_in_directory').val(0);
@@ -79,6 +81,7 @@ function channel_privacy_macro(n) {
         $('#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_profile_in_directory_onoff .on').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .off').addClass('hidden');
 		$('#id_profile_in_directory').val(1);
@@ -100,6 +103,7 @@ function channel_privacy_macro(n) {
         $('#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_profile_in_directory_onoff .on').removeClass('hidden');
 		$('#id_profile_in_directory_onoff .off').addClass('hidden');
 		$('#id_profile_in_directory').val(1);
diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js
new file mode 100644
index 000000000..140f13843
--- /dev/null
+++ b/view/js/mod_sources.js
@@ -0,0 +1,12 @@
+$(document).ready(function() { 
+	var a; 
+	a = $("#id_name").autocomplete({ 
+		serviceUrl: baseurl + '/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#id_xchan").val(data);
+		}			
+	});
+
+});