mirror of
https://github.com/e107inc/e107.git
synced 2025-08-05 14:17:49 +02:00
More avatar code moved to $tp->toAvatar() and minor css fixes.
This commit is contained in:
@@ -492,12 +492,12 @@ class adminstyle_infopanel
|
|||||||
{
|
{
|
||||||
$hide = ($count > 3) ? ' hide' : '';
|
$hide = ($count > 3) ? ' hide' : '';
|
||||||
|
|
||||||
$TEMPLATE = "{SETIMAGE: w=40}
|
$TEMPLATE = "{SETIMAGE: w=40&h=40}
|
||||||
<li id='comment-".$row['comment_id']."' class='media".$hide."'>
|
<li id='comment-".$row['comment_id']."' class='media".$hide."'>
|
||||||
<span class='media-object pull-left'>{USER_AVATAR=".$row['comment_author_id']."}</span>
|
<span class='media-object pull-left'>{USER_AVATAR=".$row['comment_author_id']."}</span>
|
||||||
<div class='btn-group pull-right'>
|
<div class='btn-group pull-right'>
|
||||||
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-mini btn-danger'><i class='icon-remove'></i> Delete</button>
|
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-sm btn-mini btn-danger'><i class='icon-remove'></i> Delete</button>
|
||||||
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-mini btn-success'><i class='icon-ok'></i> Approve</button>
|
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-sm btn-mini btn-success'><i class='icon-ok'></i> Approve</button>
|
||||||
</div>
|
</div>
|
||||||
<div class='media-body'><small class='muted smalltext'>Posted by {USERNAME} {TIMEDATE=relative}</small><br />
|
<div class='media-body'><small class='muted smalltext'>Posted by {USERNAME} {TIMEDATE=relative}</small><br />
|
||||||
<p>{COMMENT}</p>
|
<p>{COMMENT}</p>
|
||||||
|
@@ -3003,10 +3003,11 @@ class e107plugin
|
|||||||
|
|
||||||
$ret['menuName'] = varset($eplug_menu_name);
|
$ret['menuName'] = varset($eplug_menu_name);
|
||||||
|
|
||||||
if (varset($eplug_prefs))
|
|
||||||
|
if (!empty($eplug_prefs) && is_array($eplug_prefs))
|
||||||
{
|
{
|
||||||
$c = 0;
|
$c = 0;
|
||||||
foreach ($eplug_prefs as $name => $value)
|
foreach($eplug_prefs as $name => $value)
|
||||||
{
|
{
|
||||||
$ret['mainPrefs']['pref'][$c]['@attributes']['name'] = $name;
|
$ret['mainPrefs']['pref'][$c]['@attributes']['name'] = $name;
|
||||||
$ret['mainPrefs']['pref'][$c]['@value'] = $value;
|
$ret['mainPrefs']['pref'][$c]['@value'] = $value;
|
||||||
|
@@ -413,7 +413,7 @@ class pm_shortcodes extends e_shortcode
|
|||||||
|
|
||||||
public function sc_pm_avatar()
|
public function sc_pm_avatar()
|
||||||
{
|
{
|
||||||
return e107::getParser()->parseTemplate("{USER_AVATAR={$this->var['user_image']}}");
|
return e107::getParser()->toAvatar($this->var);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user