From b1d31aca519bf7ca99420ad99ccd9575cc24455f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 15 Feb 2012 18:13:41 -0800 Subject: [PATCH] quick comments --- include/conversation.php | 5 ++-- mod/oexchange.php | 18 ++++++------- mod/smilies.php | 3 +++ view/comment_item.tpl | 2 +- view/head.tpl | 7 +++++- view/theme/dispy/style.css | 8 ++++++ view/theme/duepuntozero/comment_item.tpl | 32 ++++++++++++++++++++++++ view/theme/loozah/comment_item.tpl | 32 ++++++++++++++++++++++++ view/theme/testbubble/comment_item.tpl | 7 ++++++ view/theme/testbubble/style.css | 9 +++++++ 10 files changed, 109 insertions(+), 14 deletions(-) create mode 100755 mod/smilies.php create mode 100755 view/theme/duepuntozero/comment_item.tpl create mode 100755 view/theme/loozah/comment_item.tpl diff --git a/include/conversation.php b/include/conversation.php index 2ea9b603f2..3d13a11798 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 53dce6446a..72d2bcb9e4 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 0000000000..c47f95da76 --- /dev/null +++ b/mod/smilies.php @@ -0,0 +1,3 @@ +$mytitle
- {{ if $qcomment }} {{ for $qcomment as $qc }} $qc   {{ endfor }} {{ endif }} +
+ {{ if $qcomment }} + {{ for $qcomment as $qc }} + $qc +   + {{ endfor }} + {{ endif }} +
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 118fc2e7cc..fcb7bea7a1 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); +}