Skip to content
Snippets Groups Projects
Commit 0d9530db authored by Jared Hancock's avatar Jared Hancock
Browse files

collabs: Add avatars to the popup mgmt dialog

And, add to the collabs preview popup too
parent 364044e8
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,11 @@ abstract class Avatar {
abstract function getUrl($size);
function getImageTag($size=null) {
return '<img class="avatar" alt="'.__('Avatar').'" src="'.$this->getUrl($size).'" />';
$style = ($size)
? sprintf('style="max-height:%spx"', $size)
: '';
return "<img {$style} class=\"avatar\" alt=\""
.__('Avatar').'" src="'.$this->getUrl($size).'" />';
}
function __toString() {
......
......@@ -5,9 +5,11 @@
if (($users=$thread->getCollaborators())) {?>
<?php
foreach($users as $user) {
echo sprintf('<tr><td %s><i class="icon-%s"></i> %s <em>&lt;%s&gt;</em></td></tr>',
echo sprintf('<tr><td %s>%s%s <em class="faded">&lt;%s&gt;</em></td></tr>',
($user->isActive()? '' : 'class="faded"'),
($user->isActive()? 'comments' : 'comment-alt'),
(($U = $user->getUser()) && ($A = $U->getAvatar()))
? $A->getImageTag(20) : sprintf('<i class="icon-%s"></i>',
($user->isActive()? 'comments' : 'comment-alt')),
Format::htmlchars($user->getName()),
$user->getEmail());
}
......
......@@ -15,8 +15,10 @@ if(($users=$thread->getCollaborators())) {?>
$checked = $user->isActive() ? 'checked="checked"' : '';
echo sprintf('<tr>
<td>
<label class="inline checkbox">
<input type="checkbox" name="cid[]" id="c%d" value="%d" %s>
<a class="collaborator" href="#thread/%d/collaborators/%d/view">%s</a>
</label>
<a class="collaborator" href="#thread/%d/collaborators/%d/view">%s%s</a>
<span class="faded"><em>%s</em></span></td>
<td width="10">
<input type="hidden" name="del[]" id="d%d" value="">
......@@ -28,6 +30,8 @@ if(($users=$thread->getCollaborators())) {?>
$checked,
$thread->getId(),
$user->getId(),
(($U = $user->getUser()) && ($A = $U->getAvatar()))
? $U->getAvatar()->getImageTag(24) : '',
Format::htmlchars($user->getName()),
$user->getEmail(),
$user->getId(),
......
......@@ -125,10 +125,12 @@ echo '</div>'; // ticket preview content.
if ($thread && ($collabs=$thread->getCollaborators())) {?>
<?php
foreach($collabs as $collab) {
echo sprintf('<tr><td %s><i class="icon-%s"></i>
echo sprintf('<tr><td %s>%s
<a href="users.php?id=%d" class="no-pjax">%s</a> <em>&lt;%s&gt;</em></td></tr>',
($collab->isActive()? '' : 'class="faded"'),
($collab->isActive()? 'comments' : 'comment-alt'),
(($U = $collab->getUser()) && ($A = $U->getAvatar()))
? $A->getImageTag(20) : sprintf('<i class="icon-%s"></i>',
$collab->isActive() ? 'comments' : 'comment-alt'),
$collab->getUserId(),
$collab->getName(),
$collab->getEmail());
......
......@@ -946,6 +946,8 @@ a#post-note:hover {
}
img.avatar {
border-radius: inherit;
vertical-align: middle;
margin-right: 5px;
}
.avatar > img.avatar {
width: 100%;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment