diff options
| -rw-r--r-- | actions/subscriptions.php | 2 | ||||
| -rw-r--r-- | lib/grouplist.php | 22 | ||||
| -rw-r--r-- | theme/base/css/display.css | 26 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 3 |
4 files changed, 34 insertions, 19 deletions
diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 8d1462d49..bcc557891 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -111,7 +111,7 @@ class SubscriptionsList extends ProfileList $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id, 'method' => 'post', - 'class' => 'subedit', + 'class' => 'form_subcription_edit', 'action' => common_local_url('subedit'))); $this->out->hidden('token', common_session_token()); $this->out->hidden('profile', $profile->id); diff --git a/lib/grouplist.php b/lib/grouplist.php index dd10a2753..869e44897 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -66,7 +66,7 @@ class GroupList extends Widget function show() { - $this->out->elementStart('ul', 'groups'); + $this->out->elementStart('ul', 'profiles groups xoxo'); $cnt = 0; @@ -85,19 +85,19 @@ class GroupList extends Widget function showGroup() { - $this->out->elementStart('li', array('class' => 'group', + $this->out->elementStart('li', array('class' => 'profile', 'id' => 'group-' . $this->group->id)); $user = common_current_user(); - $this->out->elementStart('div', array('id' => 'group_group', - 'class' => 'vcard')); + $this->out->elementStart('div', 'entity_profile vcard'); $logo = ($this->group->stream_logo) ? $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->group->homeUrl(), - 'class' => 'url')); + 'class' => 'url', + 'rel' => 'group')); $this->out->element('img', array('src' => $logo, 'class' => 'photo avatar', 'width' => AVATAR_STREAM_SIZE, @@ -105,24 +105,24 @@ class GroupList extends Widget 'alt' => ($this->group->fullname) ? $this->group->fullname : $this->group->nickname)); - $hasFN = ($this->group->fullname) ? 'nickname' : 'fn nickname'; + $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn org nickname url uid'; $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', 'group_fn'); + $this->out->elementStart('dl', 'entity_fn'); $this->out->element('dt', null, 'Full name'); $this->out->elementStart('dd'); - $this->out->elementStart('span', 'fn'); + $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', 'group_location'); + $this->out->elementStart('dl', 'entity_location'); $this->out->element('dt', null, _('Location')); $this->out->elementStart('dd', 'location'); $this->out->raw($this->highlight($this->group->location)); @@ -130,7 +130,7 @@ class GroupList extends Widget $this->out->elementEnd('dl'); } if ($this->group->homepage) { - $this->out->elementStart('dl', 'group_url'); + $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, @@ -141,7 +141,7 @@ class GroupList extends Widget $this->out->elementEnd('dl'); } if ($this->group->description) { - $this->out->elementStart('dl', 'group_note'); + $this->out->elementStart('dl', 'entity_note'); $this->out->element('dt', null, _('Note')); $this->out->elementStart('dd', 'note'); $this->out->raw($this->highlight($this->group->description)); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 45affbaf6..e49f27dfb 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -655,10 +655,15 @@ margin-bottom:0; min-height:60px; } + +.profile .form_group_join, +.profile .form_group_leave, .profile .form_user_subscribe, .profile .form_user_unsubscribe { float:right; } +.profile .form_group_join legend, +.profile .form_group_leave legend, .profile .form_user_subscribe legend, .profile .form_user_unsubscribe legend { display:none; @@ -678,12 +683,27 @@ display:inline; float:none; } .profile .entity_profile .entity_note, -.profile .entity_profile .entity_url { +.profile .entity_profile .entity_url, +.profile .entity_profile .entity_tags, +.profile .entity_profile .form_subcription_edit { margin-left:59px; clear:none; display:block; width:auto; } +.profile .entity_profile .entity_tags dt { +display:inline; +margin-right:11px; +} + + +.profile .entity_profile .form_subcription_edit label { +font-weight:normal; +margin-right:11px; +} + + + /* NOTICE */ .notice, @@ -1195,7 +1215,3 @@ text-align:center; #testimonials { clear:both; } - -.entity_tags dt { -display:block; -}
\ No newline at end of file diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 1df14a7f1..66ee3c25d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -58,8 +58,7 @@ background-color:#fcfffc; #aside_primary, #entity_subscribe a, -#TB_window input.submit, -.form_user_subscribe input.submit { +#TB_window input.submit { background-color:#CEE1E9; } |