new smiley

diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif
new file mode 100644 (file)
index 0000000..a125d0f
Binary files /dev/null and b/images/smiley-Oo.gif differ

diff --git a/include/text.php b/include/text.php
index f32aaad07e8c01e3c127421ca8e21c51e6a1ac49..1db88ca2c8b80b00e31467ede6fe04befaeabaae 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
        $a = get_app();
 
        $s = str_replace(
-       array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
+       array( '<3', '</3', '<\\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 ecfed6c423b23eb179cd45a4b0cc96c529e3bc93..941a8f3e2757876e15373e79ca28c5558e9c3e42 100644 (file)
--- 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 71b92986d20289ae64c9450ddbfa3dac41b0e1ef..83af1ae37162a15590bfd412641af4ac46ee2a8f 100644 (file)
--- 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>