1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 04:12:00 +02:00

Comment fixes. Problem remains with SEF Urls

This commit is contained in:
Cameron
2013-03-29 15:31:03 -07:00
parent 9dbb631c1c
commit 11589d6f9e
6 changed files with 35 additions and 19 deletions

View File

@@ -74,10 +74,13 @@ class comment_shortcodes extends e_shortcode
function sc_timedate($parm='')
{
global $TIMEDATE, $datestamp, $gen;
$datestamp = $gen->convert_date($this->var['comment_datestamp'], "short");
return $datestamp;
{
if($parm == 'relative')
{
return e107::getDate()->computeLapse($this->var['comment_datestamp'],time(),false, false, 'short');
}
return e107::getDate()->convert_date($this->var['comment_datestamp'], "short");
}
@@ -251,7 +254,7 @@ class comment_shortcodes extends e_shortcode
function sc_comment_input($parm='')
{
$options = array(
'class' => 'tbox input comment-input',
'class' => 'tbox input-xxlarge comment-input',
'placeholder' => "Leave a message..." // TODO Lan
);

View File

@@ -42,13 +42,13 @@ function user_avatar_shortcode($parm='')
if (vartrue($image))
{
$img = (strpos($image,"://")!==false) ? $image : $tp->thumbUrl(e_MEDIA."avatars/".$image,"aw=".$width."&ah=".$height);
$img = (strpos($image,"://")!==false) ? $image : $tp->thumbUrl(e_MEDIA."avatars/".$image,"w=".$width."&h=".$height);
$text = "<img class='user-avatar e-tip' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />
";
}
else
{
$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","aw=".$width."&ah=".$height);
$img = $tp->thumbUrl(e_IMAGE."generic/blank_avatar.jpg","w=".$width."&h=".$height);
$text = "<img class='user-avatar' src='".$img."' alt='' />";
}

View File

@@ -129,7 +129,7 @@ $COMMENT_TEMPLATE['ITEM'] = '
<div class="row-fluid">
<div class="comment-box-username span1">{USERNAME}</div>
<div class="comment-box-date span2">{TIMEDATE}</div>
<div class="comment-box-date span2">{TIMEDATE=relative}</div>
<div class="comment-status span3">{COMMENT_STATUS}</div>
<div class="comment-moderate span6">{COMMENT_RATE} {REPLY} {COMMENTEDIT} {COMMENT_MODERATE}</div>