summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/grouplist.php27
-rw-r--r--theme/base/css/display.css2
2 files changed, 6 insertions, 23 deletions
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 47aabddcd..d9547acb9 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -97,7 +97,7 @@ class GroupList extends Widget
$this->out->elementStart('a', array('href' => $this->group->homeUrl(),
'class' => 'url',
- 'rel' => 'group'));
+ 'rel' => 'contact group'));
$this->out->element('img', array('src' => $logo,
'class' => 'photo avatar',
'width' => AVATAR_STREAM_SIZE,
@@ -105,48 +105,31 @@ class GroupList extends Widget
'alt' =>
($this->group->fullname) ? $this->group->fullname :
$this->group->nickname));
- $hasFN = ($this->group->fullname) ? 'nickname url' : 'fn org nickname url';
+ $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname';
$this->out->elementStart('span', $hasFN);
$this->out->raw($this->highlight($this->group->nickname));
$this->out->elementEnd('span');
$this->out->elementEnd('a');
if ($this->group->fullname) {
- $this->out->elementStart('dl', 'entity_fn');
- $this->out->element('dt', null, 'Full name');
- $this->out->elementStart('dd');
$this->out->elementStart('span', 'fn org');
$this->out->raw($this->highlight($this->group->fullname));
$this->out->elementEnd('span');
- $this->out->elementEnd('dd');
- $this->out->elementEnd('dl');
}
if ($this->group->location) {
- $this->out->elementStart('dl', 'entity_location');
- $this->out->element('dt', null, _('Location'));
- $this->out->elementStart('dd', 'label');
+ $this->out->elementStart('span', 'label');
$this->out->raw($this->highlight($this->group->location));
- $this->out->elementEnd('dd');
- $this->out->elementEnd('dl');
}
if ($this->group->homepage) {
- $this->out->elementStart('dl', 'entity_url');
- $this->out->element('dt', null, _('URL'));
- $this->out->elementStart('dd');
$this->out->elementStart('a', array('href' => $this->group->homepage,
'class' => 'url'));
$this->out->raw($this->highlight($this->group->homepage));
$this->out->elementEnd('a');
- $this->out->elementEnd('dd');
- $this->out->elementEnd('dl');
}
if ($this->group->description) {
- $this->out->elementStart('dl', 'entity_note');
- $this->out->element('dt', null, _('Note'));
- $this->out->elementStart('dd', 'note');
+ $this->out->elementStart('p', 'note');
$this->out->raw($this->highlight($this->group->description));
- $this->out->elementEnd('dd');
- $this->out->elementEnd('dl');
+ $this->out->elementEnd('p');
}
# If we're on a list with an owner (subscriptions or subscribers)...
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f9ed80aa9..1bab7d965 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -787,7 +787,7 @@ display:none;
list-style-type:none;
}
.profile .entity_profile .fn.nickname,
-.profile .entity_profile .url[rel=contact] {
+.profile .entity_profile .url[rel~=contact] {
margin-left:0;
display:inline;
}