Merge branch 'master' of github.com:fabrixxm/friendika

6 files changed, 15 insertions, 282 deletions

diff --git a/view/it/insecure_net.tpl b/view/it/insecure_net.tpl
deleted file mode 100644
index 7ab6270ff..000000000
--- a/view/it/insecure_net.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="profile-edit-insecure">
-<p>
-Il social network a cui $name appartiene &egrave; una rete aperta con limitati o non esistenti controlli di privacy.
-Usa la necessaria discrezione.
-</p>
-</div>
diff --git a/view/it/jot-header.tpl b/view/it/jot-header.tpl
deleted file mode 100644
index 8ca5a0717..000000000
--- a/view/it/jot-header.tpl
+++ /dev/null
@@ -1,165 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var editor;
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
-
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-
-	}
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		$('#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();
-				$('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) {
-				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("Inserisci l'indirizzo del collegamento:");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotGetVideo() {
-		reply = prompt("Inserisci un collegamento a YouTube:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("Please enter a video(.ogg) link/URL:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("Please enter an audio(.ogg) link/URL:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
-		}
-	}
-
-	function jotGetLocation() {
-		reply = prompt("Dove ti trovi ora?", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-			$('#like-rotator-' + id).hide();
-			$(window).scrollTop(0);
-		});
-	}
-
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	$geotag
-
-</script>
-
diff --git a/view/it/msg-header.tpl b/view/it/msg-header.tpl
deleted file mode 100644
index 69e813ae2..000000000
--- a/view/it/msg-header.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
-
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-	}
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("Inserisci l'indirizzo del collegamento:");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/it/profile_tabs.tpl b/view/it/profile_tabs.tpl
deleted file mode 100644
index 9c0f27d62..000000000
--- a/view/it/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Stato</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profilo</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Foto</a>
-<div id="profile-tabs-end"></div>
-</div>
diff --git a/view/it/settings.tpl b/view/it/settings.tpl
index 87f40f26f..d1e25da81 100644
--- a/view/it/settings.tpl
+++ b/view/it/settings.tpl
@@ -90,6 +90,13 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-blockw-wrapper" >
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
+<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
+</div>
+<div id="settings-blockw-end" ></div>
+
+
 <div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
 <div id="settings-expire-end"></div>
 
diff --git a/view/it/strings.php b/view/it/strings.php
index 1312f0013..1e0840dd7 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -165,6 +165,9 @@ $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
 $a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Upload New Photos"] = "Carica nuova foto";
 $a->strings["View Album"] = "Vedi album";
+$a->strings['Status'] = 'Stato';
+$a->strings['Profile'] = 'Profilo';
+$a->strings['Photos'] = 'Foto';
 $a->strings["Item not found."] = "Elemento non trovato.";
 $a->strings["View \$owner_name's profile"] = "Guarda il profilo di \$owner_name";
 $a->strings["to"] = "a";
@@ -284,6 +287,11 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
 $a->strings["Errors encountered creating database tables."] = "Errori creando le tabelle nel database.";
 $a->strings["Normal View"] = "Vista normale";
 $a->strings["New Item View"] = "Vista Nuovi Elementi";
+$a->strings['Please enter a link URL:'] = 'Inserisci l\'indirizzo del collegamento:';
+$a->strings['Please enter a YouTube link:'] = 'Inserisci un collegamento a YouTube:';
+$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
+$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
+$a->strings['Where are you right now?'] = 'Dove ti trovi ora?';
 $a->strings["No such group"] = "Nessun gruppo";
 $a->strings["Group is empty"] = "Il gruppo è vuoto";
 $a->strings["Group: "] = "Gruppo: ";