From 48a5a2484e762a9804237ae28c24dafe5db7f953 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 00:04:19 -0800
Subject: [PATCH] new smiley

---
 images/smiley-Oo.gif | Bin 0 -> 1045 bytes
 include/text.php     |   4 +++-
 view/jot-header.tpl  |   1 +
 view/jot.tpl         |   4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 images/smiley-Oo.gif

diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a125d0ff20d76612bfa4b219183447bc7c5eb003
GIT binary patch
literal 1045
zcmZ?wbhEHb6krfwcvj2cY$EU<2%ahZd!l%Mli=%P;<Y)>)4H-=9TER@QToSixnK9>
z|2$Oq`&jY&O}W316hEGqe!fri?s|bK+3aUe?SJ>-<Hhx2?>>H-*qr$B%eVU*1+QE_
zRg>*_c^=od8?wbw+}D=y<OQ(bT_<pNuf(zW0vFF8eS1>k+jZI3N5y~LmH&E8_WKRl
z51+qoTs7s{UeTX-<R`WyrTK8~pD%KCmB9J4hgMayuUXu4{>;I1Yee6?dtVT%yKm=;
zL;Kcc`f+yU@vd6fxu=uk#F6bcm-Fu1vHbE1fiG8O7L{{WX4t;JD06Uu$jUm-hg*ei
zEa$zjPP8<PW5vAIk6*v9sAS*S$1|&lbNdv*cvp@+6M55v<=(vikl@Dg`LfL6{TtG}
zIi_@^AK1NWMj_{^W4khfWmeU4Hm7p$-Lbs2Ea21EA1PiOTPF)Fui<?D;`z(huZu!B
zdJ6c?o<8vT+s`8hHokcE^6<X(MF~dFUOa0l@m(>$?b%+DNo^^O$=shVNPoE^^AqUt
zpMM#^K=D7fpKD04vtxj(k)8oFBT!KBCkyKdhFS(4kOELNF|c22sBNmvayF1*V~@^m
zZWb>H&-E0u2&pU<k?hlzSJvj@lH+7mF^mgnDw6l$=4WPR*vM*}Zc<y4sJxMZiGguH
zgJ2L_gtgti1N%=g2<4bp7@gR6;s8s0nT*(#D_6ZF*nH)7?>()dlqA8P!O6|c^nSO1
zo|CY>O){&iCJ!$!kA9Ru#tVT(E;6zzTq+h14>WRda7=6H2wLVOZ(!Tu(viw^P?lGr
zA?2n*2dkuBn2LacLX&5^RA|!-$tefV3aSTRl9(y5=v<q5FU!*fAC{bElvdT@<6;4O
zl?&umCI)5(ZU%OsSIvN4ZRY2$ZU#D|mWhd3v#M5`zjrDVkGcjI15hc`oH=S-UDKF&
z`P6EsbWi2cYTmfKrl}EZR0^t5${?c{T3gx}7`qs1JG;9kw06}p_H|F2*4^7Nv3Xu=
WPc1|r$XqHp0nMm^Z~{4@U=09PNRn0n

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index f32aaad07e..1db88ca2c8 100644
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o',
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -698,6 +698,8 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index ecfed6c423..941a8f3e27 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -7,6 +7,7 @@ var textlen = 0;
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").show();	
+//		$("#jot-title").show();
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
diff --git a/view/jot.tpl b/view/jot.tpl
index 71b92986d2..83af1ae371 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -12,8 +12,10 @@
 		<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="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<div id="jot-title-wrapper">
+		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		</div>
 
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>