Browse Source

preliminary qcomment support, [nosmile] tag to disable smiley processing

pull/36/merge
friendica 9 years ago
parent
commit
03171fd7de
7 changed files with 45 additions and 4 deletions
  1. +1
    -1
      include/bb2diaspora.php
  2. +4
    -1
      include/bbcode.php
  3. +4
    -1
      include/conversation.php
  4. +4
    -1
      include/text.php
  5. +6
    -0
      view/comment_item.tpl
  6. +12
    -0
      view/head.tpl
  7. +14
    -0
      view/theme/duepuntozero/style.css

+ 1
- 1
include/bb2diaspora.php View File

@ -212,7 +212,7 @@ function bb2diaspora($Text,$preserve_nl = false) {
$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text);
$Text = str_replace('[nosmile]','',$Text);
// oembed tag
// $Text = oembed_bbcode2html($Text);


+ 4
- 1
include/bbcode.php View File

@ -174,7 +174,10 @@ upper-alpha;">$2</ul>' ,$Text);
$Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/sm", '<table border="0" >$1</table>' ,$Text);
$Text = str_replace('[hr]','<hr />', $Text);
// This is actually executed in prepare_body()
$Text = str_replace('[nosmile]','',$Text);
// Check for font change text
$Text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm","<span style=\"font-family: $1;\">$2</span>",$Text);


+ 4
- 1
include/conversation.php View File

@ -522,6 +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;
if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => '',
@ -529,6 +532,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $item['item_id'],
'$parent' => $item['parent'],
'$qcomment' => $qcomment,
'$profile_uid' => $profile_owner,
'$mylink' => $a->contact['url'],
'$mytitle' => t('This is you'),
@ -634,7 +638,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// Build the HTML
$body = prepare_body($item,true);
$tmp_item = replace_macros($template,array(
'$type' => implode("",array_slice(split("/",$item['verb']),-1)),


+ 4
- 1
include/text.php View File

@ -878,7 +878,10 @@ function prepare_text($text) {
require_once('include/bbcode.php');
$s = smilies(bbcode($text));
if(stristr($text,'[nosmile]'))
$s = bbcode($text);
else
$s = smilies(bbcode($text));
return $s;
}}


+ 6
- 0
view/comment_item.tpl View File

@ -12,6 +12,12 @@
</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>
&nbsp;
{{ endfor }}
{{ endif }}
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >


+ 12
- 0
view/head.tpl View File

@ -46,6 +46,18 @@
}
}
function commentInsert(obj,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == '$comment') {
tmpStr = '';
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
$("#comment-edit-text-" + id).val(tmpStr + $(obj).html());
}
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();


+ 14
- 0
view/theme/duepuntozero/style.css View File

@ -2953,3 +2953,17 @@ div.jGrowl div.info {
color: #ffffff;
padding-left: 58px;
}
.qcomment {
border: 1px solid #EEE;
padding: 3px;
}
.qcomment {
opacity: 0;
filter:alpha(opacity=0);
}
.qcomment:hover {
opacity: 1.0;
filter:alpha(opacity=100);
}

Loading…
Cancel
Save