diff options
| author | friendica <info@friendica.com> | 2012-01-04 00:04:19 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-04 00:04:19 -0800 |
| commit | 48a5a2484e762a9804237ae28c24dafe5db7f953 (patch) | |
| tree | 859bbc4580b9e940c2918a046683e9b22d460e10 | |
| parent | fc7d0360bb059bf87c5c531a2bfd5bcee3aef3f6 (diff) | |
| download | volse-hubzilla-48a5a2484e762a9804237ae28c24dafe5db7f953.tar.gz volse-hubzilla-48a5a2484e762a9804237ae28c24dafe5db7f953.tar.bz2 volse-hubzilla-48a5a2484e762a9804237ae28c24dafe5db7f953.zip | |
new smiley
| -rw-r--r-- | images/smiley-Oo.gif | bin | 0 -> 1045 bytes | |||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | view/jot-header.tpl | 1 | ||||
| -rw-r--r-- | view/jot.tpl | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif Binary files differnew file mode 100644 index 000000000..a125d0ff2 --- /dev/null +++ b/images/smiley-Oo.gif diff --git a/include/text.php b/include/text.php index f32aaad07..1db88ca2c 100644 --- 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 ecfed6c42..941a8f3e2 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 71b92986d..83af1ae37 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> |
