General markup and style cleanup
This commit is contained in:
sarven
parent
a39bb4a3b8
commit
4b42c35269
|
|
@ -195,13 +195,13 @@ class ShowgroupAction extends Action
|
|||
|
||||
function showGroupProfile()
|
||||
{
|
||||
$this->elementStart('div', array('id' => 'group_profile',
|
||||
$this->elementStart('div', array('id' => 'user_profile',
|
||||
'class' => 'vcard author'));
|
||||
|
||||
$this->element('h2', null, _('Group profile'));
|
||||
|
||||
$this->elementStart('dl', 'group_depiction');
|
||||
$this->element('dt', null, _('Photo'));
|
||||
$this->elementStart('dl', 'user_depiction');
|
||||
$this->element('dt', null, _('Avatar'));
|
||||
$this->elementStart('dd');
|
||||
|
||||
$logo = ($this->group->homepage_logo) ?
|
||||
|
|
@ -215,7 +215,7 @@ class ShowgroupAction extends Action
|
|||
$this->elementEnd('dd');
|
||||
$this->elementEnd('dl');
|
||||
|
||||
$this->elementStart('dl', 'group_nickname');
|
||||
$this->elementStart('dl', 'user_nickname');
|
||||
$this->element('dt', null, _('Nickname'));
|
||||
$this->elementStart('dd');
|
||||
$hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid';
|
||||
|
|
@ -226,7 +226,7 @@ class ShowgroupAction extends Action
|
|||
$this->elementEnd('dl');
|
||||
|
||||
if ($this->group->fullname) {
|
||||
$this->elementStart('dl', 'group_fn');
|
||||
$this->elementStart('dl', 'user_fn');
|
||||
$this->element('dt', null, _('Full name'));
|
||||
$this->elementStart('dd');
|
||||
$this->element('span', 'fn', $this->group->fullname);
|
||||
|
|
@ -235,14 +235,14 @@ class ShowgroupAction extends Action
|
|||
}
|
||||
|
||||
if ($this->group->location) {
|
||||
$this->elementStart('dl', 'group_location');
|
||||
$this->elementStart('dl', 'user_location');
|
||||
$this->element('dt', null, _('Location'));
|
||||
$this->element('dd', 'location', $this->group->location);
|
||||
$this->elementEnd('dl');
|
||||
}
|
||||
|
||||
if ($this->group->homepage) {
|
||||
$this->elementStart('dl', 'group_url');
|
||||
$this->elementStart('dl', 'user_url');
|
||||
$this->element('dt', null, _('URL'));
|
||||
$this->elementStart('dd');
|
||||
$this->element('a', array('href' => $this->group->homepage,
|
||||
|
|
@ -253,7 +253,7 @@ class ShowgroupAction extends Action
|
|||
}
|
||||
|
||||
if ($this->group->description) {
|
||||
$this->elementStart('dl', 'group_note');
|
||||
$this->elementStart('dl', 'user_note');
|
||||
$this->element('dt', null, _('Note'));
|
||||
$this->element('dd', 'note', $this->group->description);
|
||||
$this->elementEnd('dl');
|
||||
|
|
@ -261,10 +261,10 @@ class ShowgroupAction extends Action
|
|||
|
||||
$this->elementEnd('div');
|
||||
|
||||
$this->elementStart('div', array('id' => 'group_actions'));
|
||||
$this->elementStart('div', array('id' => 'user_actions'));
|
||||
$this->element('h2', null, _('Group actions'));
|
||||
$this->elementStart('ul');
|
||||
$this->elementStart('li', array('id' => 'group_subscribe'));
|
||||
$this->elementStart('li', array('id' => 'user_subscribe'));
|
||||
$cur = common_current_user();
|
||||
if ($cur) {
|
||||
if ($cur->isMember($this->group)) {
|
||||
|
|
@ -361,4 +361,4 @@ class ShowgroupAction extends Action
|
|||
_('All members'));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -410,7 +410,7 @@ class ShowstreamAction extends Action
|
|||
$this->elementStart('p');
|
||||
$this->element('a', array('href' => common_local_url('subscriptions',
|
||||
array('nickname' => $this->profile->nickname)),
|
||||
'class' => 'mores'),
|
||||
'class' => 'more'),
|
||||
_('All subscriptions'));
|
||||
$this->elementEnd('p');
|
||||
}
|
||||
|
|
@ -439,7 +439,7 @@ class ShowstreamAction extends Action
|
|||
$this->elementStart('p');
|
||||
$this->element('a', array('href' => common_local_url('subscribers',
|
||||
array('nickname' => $this->profile->nickname)),
|
||||
'class' => 'mores'),
|
||||
'class' => 'more'),
|
||||
_('All subscribers'));
|
||||
$this->elementEnd('p');
|
||||
}
|
||||
|
|
@ -521,7 +521,7 @@ class ShowstreamAction extends Action
|
|||
$this->elementStart('p');
|
||||
$this->element('a', array('href' => common_local_url('usergroups',
|
||||
array('nickname' => $this->profile->nickname)),
|
||||
'class' => 'mores'),
|
||||
'class' => 'more'),
|
||||
_('All groups'));
|
||||
$this->elementEnd('p');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,9 +78,9 @@ class GroupEditForm extends Form
|
|||
function id()
|
||||
{
|
||||
if ($this->group) {
|
||||
return 'group_edit-' . $this->group->id;
|
||||
return 'form_group_edit-' . $this->group->id;
|
||||
} else {
|
||||
return 'group_add';
|
||||
return 'form_group_add';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ class GroupEditForm extends Form
|
|||
|
||||
function formClass()
|
||||
{
|
||||
return 'form_group_add';
|
||||
return 'form_settings';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -111,6 +111,18 @@ class GroupEditForm extends Form
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Name of the form
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function formLegend()
|
||||
{
|
||||
$this->out->element('legend', null, _('Create a new group'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Data elements of the form
|
||||
*
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class GroupMiniList extends GroupList
|
|||
{
|
||||
function show()
|
||||
{
|
||||
$this->out->elementStart('ul', 'groups');
|
||||
$this->out->elementStart('ul', 'groups xoxo');
|
||||
|
||||
$cnt = 0;
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ class GroupMiniList extends GroupList
|
|||
$this->group->fullname :
|
||||
$this->group->nickname,
|
||||
'href' => $this->group->homeUrl(),
|
||||
'rel' => 'contact',
|
||||
'rel' => 'contact group',
|
||||
'class' => 'url'));
|
||||
$logo = ($this->group->stream_logo) ?
|
||||
$this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
|
||||
|
|
@ -85,7 +85,7 @@ class GroupMiniList extends GroupList
|
|||
'alt' => ($this->group->fullname) ?
|
||||
$this->group->fullname :
|
||||
$this->group->nickname));
|
||||
$this->out->element('span', 'fn nickname', $this->group->nickname);
|
||||
$this->out->element('span', 'fn org nickname', $this->group->nickname);
|
||||
$this->out->elementEnd('a');
|
||||
$this->out->elementEnd('li');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class ProfileMiniList extends ProfileList
|
|||
{
|
||||
function show()
|
||||
{
|
||||
$this->out->elementStart('ul', 'users');
|
||||
$this->out->elementStart('ul', 'users xoxo');
|
||||
|
||||
$cnt = 0;
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ class ProfileMiniList extends ProfileList
|
|||
$this->profile->fullname :
|
||||
$this->profile->nickname,
|
||||
'href' => $this->profile->profileurl,
|
||||
'rel' => 'contact',
|
||||
'rel' => 'contact member',
|
||||
'class' => 'url'));
|
||||
$avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
|
||||
$this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)),
|
||||
|
|
|
|||
|
|
@ -149,7 +149,8 @@ font-weight:bold;
|
|||
#form_login legend,
|
||||
#form_register legend,
|
||||
#form_password legend,
|
||||
#form_settings_avatar legend {
|
||||
#form_settings_avatar legend,
|
||||
#form_group_add legend {
|
||||
display:none;
|
||||
}
|
||||
|
||||
|
|
@ -189,6 +190,8 @@ border-radius:4px;
|
|||
padding:0 7px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* FORM SETTINGS */
|
||||
|
||||
|
||||
|
|
@ -691,9 +694,8 @@ margin-right:7px;
|
|||
margin-bottom:7px;
|
||||
}
|
||||
#user_subscriptions .users li .photo {
|
||||
width:24px;
|
||||
height:24px;
|
||||
margin-right:0;
|
||||
margin-bottom:0;
|
||||
}
|
||||
#user_subscriptions .users li .fn {
|
||||
display:none;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user