forked from GNUsocial/gnu-social
Merge branch 'master' of /var/www/trunk
This commit is contained in:
commit
baaf55e9d6
@ -58,13 +58,13 @@ class GroupSection extends Section
|
|||||||
|
|
||||||
$cnt = 0;
|
$cnt = 0;
|
||||||
|
|
||||||
$this->out->elementStart('ul', 'entities group xoxo');
|
$this->out->elementStart('table');
|
||||||
|
|
||||||
while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) {
|
while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) {
|
||||||
$this->showGroup($profiles);
|
$this->showGroup($profiles);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->out->elementEnd('ul');
|
$this->out->elementEnd('table');
|
||||||
|
|
||||||
return ($cnt > GROUPS_PER_SECTION);
|
return ($cnt > GROUPS_PER_SECTION);
|
||||||
}
|
}
|
||||||
@ -76,7 +76,9 @@ class GroupSection extends Section
|
|||||||
|
|
||||||
function showGroup($group)
|
function showGroup($group)
|
||||||
{
|
{
|
||||||
$this->out->elementStart('li', 'vcard');
|
$this->out->elementStart('tr');
|
||||||
|
$this->out->elementStart('td');
|
||||||
|
$this->out->elementStart('span', 'vcard');
|
||||||
$this->out->elementStart('a', array('title' => ($group->fullname) ?
|
$this->out->elementStart('a', array('title' => ($group->fullname) ?
|
||||||
$group->fullname :
|
$group->fullname :
|
||||||
$group->nickname,
|
$group->nickname,
|
||||||
@ -95,9 +97,11 @@ class GroupSection extends Section
|
|||||||
$group->nickname));
|
$group->nickname));
|
||||||
$this->out->element('span', 'fn org nickname', $group->nickname);
|
$this->out->element('span', 'fn org nickname', $group->nickname);
|
||||||
$this->out->elementEnd('a');
|
$this->out->elementEnd('a');
|
||||||
|
$this->out->elementEnd('span');
|
||||||
|
$this->out->elementEnd('td');
|
||||||
if ($group->value) {
|
if ($group->value) {
|
||||||
$this->out->element('span', 'value', $group->value);
|
$this->out->element('td', 'value', $group->value);
|
||||||
}
|
}
|
||||||
$this->out->elementEnd('li');
|
$this->out->elementEnd('tr');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -841,6 +841,10 @@ display:inline;
|
|||||||
.notice div.entry-content .timestamp {
|
.notice div.entry-content .timestamp {
|
||||||
margin-left:59px;
|
margin-left:59px;
|
||||||
}
|
}
|
||||||
|
#showstream .notice div.entry-content .timestamp {
|
||||||
|
margin-left:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.notice div.entry-content .timestamp dt,
|
.notice div.entry-content .timestamp dt,
|
||||||
.notice div.entry-content .response dt {
|
.notice div.entry-content .response dt {
|
||||||
|
@ -226,7 +226,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
|
|||||||
|
|
||||||
.notices div.entry-content,
|
.notices div.entry-content,
|
||||||
.notices div.notice-options {
|
.notices div.notice-options {
|
||||||
opacity:0.3;
|
opacity:0.4;
|
||||||
}
|
}
|
||||||
.notices li.hover div.entry-content,
|
.notices li.hover div.entry-content,
|
||||||
.notices li.hover div.notice-options {
|
.notices li.hover div.notice-options {
|
||||||
|
Loading…
Reference in New Issue
Block a user