diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-22 21:49:31 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-22 21:49:31 +0000 |
| commit | baaf55e9d6e6acdf1d2ee0a4099bb8824520ebb4 (patch) | |
| tree | 260ced6ee4b2b5e0e68f37976c88ef6dd2bd3049 | |
| parent | 10241a6d8353f2efb1fd8f5f34f56785c62bfc67 (diff) | |
| parent | 251551fee68f8941b5f64ea4afbe34d13b09a77d (diff) | |
Merge branch 'master' of /var/www/trunk
| -rw-r--r-- | lib/groupsection.php | 14 | ||||
| -rw-r--r-- | theme/base/css/display.css | 4 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/lib/groupsection.php b/lib/groupsection.php index bf26ab48c..c19299493 100644 --- a/lib/groupsection.php +++ b/lib/groupsection.php @@ -58,13 +58,13 @@ class GroupSection extends Section $cnt = 0; - $this->out->elementStart('ul', 'entities group xoxo'); + $this->out->elementStart('table'); while ($profiles->fetch() && ++$cnt <= GROUPS_PER_SECTION) { $this->showGroup($profiles); } - $this->out->elementEnd('ul'); + $this->out->elementEnd('table'); return ($cnt > GROUPS_PER_SECTION); } @@ -76,7 +76,9 @@ class GroupSection extends Section 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) ? $group->fullname : $group->nickname, @@ -95,9 +97,11 @@ class GroupSection extends Section $group->nickname)); $this->out->element('span', 'fn org nickname', $group->nickname); $this->out->elementEnd('a'); + $this->out->elementEnd('span'); + $this->out->elementEnd('td'); 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'); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5d2a0d3c4..3f34ee7b2 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -841,6 +841,10 @@ display:inline; .notice div.entry-content .timestamp { margin-left:59px; } +#showstream .notice div.entry-content .timestamp { +margin-left:0; +} + .notice div.entry-content .timestamp dt, .notice div.entry-content .response dt { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index c10f46fe9..dd623b217 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -226,7 +226,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 .notices div.entry-content, .notices div.notice-options { -opacity:0.3; +opacity:0.4; } .notices li.hover div.entry-content, .notices li.hover div.notice-options { |