diff options
| -rwxr-xr-x | include/conversation.php | 5 | ||||
| -rwxr-xr-x | mod/oexchange.php | 18 | ||||
| -rwxr-xr-x | mod/smilies.php | 3 | ||||
| -rwxr-xr-x | view/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/head.tpl | 7 | ||||
| -rwxr-xr-x | view/theme/dispy/style.css | 8 | ||||
| -rwxr-xr-x | view/theme/duepuntozero/comment_item.tpl | 32 | ||||
| -rwxr-xr-x | view/theme/loozah/comment_item.tpl | 32 | ||||
| -rwxr-xr-x | view/theme/testbubble/comment_item.tpl | 7 | ||||
| -rwxr-xr-x | view/theme/testbubble/style.css | 9 |
10 files changed, 109 insertions, 14 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2ea9b603f..3d13a1179 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -522,8 +522,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share')); } -// $qcomment = array(':-)','LOL','ROTFL','[smile]'); - $qcomment = null; + + $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); + $qcomment = (($qc) ? explode("\n",$qc) : null); if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) { $comment = replace_macros($cmnt_tpl,array( diff --git a/mod/oexchange.php b/mod/oexchange.php index 53dce6446..72d2bcb9e 100755 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -11,8 +11,6 @@ function oexchange_init(&$a) { killme(); } - - } @@ -28,14 +26,14 @@ function oexchange_content(&$a) { return; } - $url = (((x($_GET,'url')) && strlen($_GET['url'])) - ? urlencode(notags(trim($_GET['url']))) : ''); - $title = (((x($_GET,'title')) && strlen($_GET['title'])) - ? '&title=' . urlencode(notags(trim($_GET['title']))) : ''); - $description = (((x($_GET,'description')) && strlen($_GET['description'])) - ? '&description=' . urlencode(notags(trim($_GET['description']))) : ''); - $tags = (((x($_GET,'tags')) && strlen($_GET['tags'])) - ? '&tags=' . urlencode(notags(trim($_GET['tags']))) : ''); + $url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url'])) + ? urlencode(notags(trim($_REQUEST['url']))) : ''); + $title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title'])) + ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : ''); + $description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description'])) + ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : ''); + $tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) + ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : ''); $s = fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags); diff --git a/mod/smilies.php b/mod/smilies.php new file mode 100755 index 000000000..c47f95da7 --- /dev/null +++ b/mod/smilies.php @@ -0,0 +1,3 @@ +<?php + +function smilies_content(&$a) { return smilies('',true); } diff --git a/view/comment_item.tpl b/view/comment_item.tpl index b29735227..c992593f8 100755 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -11,13 +11,13 @@ <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> </div> <div class="comment-edit-photo-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> {{ if $qcomment }} {{ for $qcomment as $qc }} <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span> {{ endfor }} {{ endif }} + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> <div class="comment-edit-text-end"></div> <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > diff --git a/view/head.tpl b/view/head.tpl index 70d830faa..2a1837088 100755 --- a/view/head.tpl +++ b/view/head.tpl @@ -55,7 +55,12 @@ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); } - $("#comment-edit-text-" + id).val(tmpStr + $(obj).html()); + var ins = $(obj).html(); + ins = ins.replace('<','<'); + ins = ins.replace('>','>'); + ins = ins.replace('&','&'); + ins = ins.replace('"','"'); + $("#comment-edit-text-" + id).val(tmpStr + ins); } function showHideComments(id) { diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index f2807b36f..5bc1450db 100755 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -1291,3 +1291,11 @@ footer { display: block; margin: 50px 20%; clear: both; } .acpopupitem.selected { color: #2e3436; background-color: #eeeeec; } +.qcomment { + opacity: 0; + filter:alpha(opacity=0); +} +.qcomment:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl new file mode 100755 index 000000000..b29735227 --- /dev/null +++ b/view/theme/duepuntozero/comment_item.tpl @@ -0,0 +1,32 @@ + <div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> + <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> + <input type="hidden" name="type" value="$type" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="parent" value="$parent" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="jsreload" value="$jsreload" /> + <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + + <div class="comment-edit-photo" id="comment-edit-photo-$id" > + <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> + </div> + <div class="comment-edit-photo-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> + {{ if $qcomment }} + {{ for $qcomment as $qc }} + <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span> + + {{ endfor }} + {{ endif }} + + <div class="comment-edit-text-end"></div> + <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > + <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> + <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> + </div> + + <div class="comment-edit-end"></div> + </form> + + </div> diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/loozah/comment_item.tpl new file mode 100755 index 000000000..b29735227 --- /dev/null +++ b/view/theme/loozah/comment_item.tpl @@ -0,0 +1,32 @@ + <div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> + <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> + <input type="hidden" name="type" value="$type" /> + <input type="hidden" name="profile_uid" value="$profile_uid" /> + <input type="hidden" name="parent" value="$parent" /> + <input type="hidden" name="return" value="$return_path" /> + <input type="hidden" name="jsreload" value="$jsreload" /> + <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> + + <div class="comment-edit-photo" id="comment-edit-photo-$id" > + <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> + </div> + <div class="comment-edit-photo-end"></div> + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> + {{ if $qcomment }} + {{ for $qcomment as $qc }} + <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span> + + {{ endfor }} + {{ endif }} + + <div class="comment-edit-text-end"></div> + <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > + <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" /> + <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span> + <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div> + </div> + + <div class="comment-edit-end"></div> + </form> + + </div> diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index cad572f4e..bc75eb1a6 100755 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -11,6 +11,13 @@ <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> </div> <div class="comment-edit-photo-end"></div> + {{ if $qcomment }} + {{ for $qcomment as $qc }} + <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span> + + {{ endfor }} + {{ endif }} + <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> <div class="comment-edit-text-end"></div> diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 118fc2e7c..fcb7bea7a 100755 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -3259,3 +3259,12 @@ ul.menu-popup { background-color:#b20202; order-bottom: none; } + +.qcomment { + opacity: 0; + filter:alpha(opacity=0); +} +.qcomment:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} |