Merge remote branch 'mike/master'

4 files changed, 12 insertions, 71 deletions

diff --git a/view/en/head.tpl b/view/en/head.tpl
index ce141b251..8f97a11e5 100644
--- a/view/en/head.tpl
+++ b/view/en/head.tpl
@@ -2,7 +2,7 @@
 <base href="$baseurl" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/en/jot.tpl b/view/en/jot.tpl
deleted file mode 100644
index 7c6a857e8..000000000
--- a/view/en/jot.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="item" method="post" >
-		<input type="hidden" name="type" value="wall" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
-
-
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Share" />
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Upload Photo" title="Upload Photo"  /></div>
-	</div> 
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
-	</div> 
-	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your location" onclick="jotGetLocation();" />
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
-	</div> 
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
-	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
-	<div id="profile-jot-perms-end"></div>
-	<div id="profile-jot-email-wrapper" style="display: none;" >
-	<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
-	<div id="profile-jot-email-end"></div>
-	</div>
-	<div id="profile-jot-networks" style="display: none;" >
-	$jotnets
-	</div>
-	<div id="profile-jot-networks-end"></div>
-	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl
index 56cbf1d7c..6b7eb8873 100644
--- a/view/en/mail_received_html_body_eml.tpl
+++ b/view/en/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
 <body>
 <table style="border:1px solid #ccc">
 	<tbody>
-	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
 
 	<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
 
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
index d2b9d0612..6d2ecba4d 100644
--- a/view/en/profile_advanced.php
+++ b/view/en/profile_advanced.php
@@ -112,8 +112,7 @@ $o .= <<< EOT
 <div id="advanced-profile-religion-end"></div>
 EOT;
 }
-
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -124,7 +123,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -135,7 +134,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -146,7 +145,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -157,7 +156,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -168,7 +167,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -179,7 +178,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -190,7 +189,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -201,7 +200,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -212,7 +211,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>