GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

General markup and style cleanup

Browse Source
This commit is contained in:
sarven 2009-01-21 22:44:27 +00:00
parent a39bb4a3b8
commit 4b42c35269
6 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
actions/showgroup.php
View File

@ -195,13 +195,13 @@ class ShowgroupAction extends Action
function showGroupProfile() function showGroupProfile()
{ {
$this->elementStart('div', array('id' => 'group_profile', $this->elementStart('div', array('id' => 'user_profile',
'class' => 'vcard author')); 'class' => 'vcard author'));
$this->element('h2', null, _('Group profile')); $this->element('h2', null, _('Group profile'));
$this->elementStart('dl', 'group_depiction'); $this->elementStart('dl', 'user_depiction');
$this->element('dt', null, _('Photo')); $this->element('dt', null, _('Avatar'));
$this->elementStart('dd'); $this->elementStart('dd');
$logo = ($this->group->homepage_logo) ? $logo = ($this->group->homepage_logo) ?
@ -215,7 +215,7 @@ class ShowgroupAction extends Action
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
$this->elementStart('dl', 'group_nickname'); $this->elementStart('dl', 'user_nickname');
$this->element('dt', null, _('Nickname')); $this->element('dt', null, _('Nickname'));
$this->elementStart('dd'); $this->elementStart('dd');
$hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid'; $hasFN = ($this->group->fullname) ? 'nickname url uid' : 'fn nickname url uid';
@ -226,7 +226,7 @@ class ShowgroupAction extends Action
$this->elementEnd('dl'); $this->elementEnd('dl');
if ($this->group->fullname) { if ($this->group->fullname) {
$this->elementStart('dl', 'group_fn'); $this->elementStart('dl', 'user_fn');
$this->element('dt', null, _('Full name')); $this->element('dt', null, _('Full name'));
$this->elementStart('dd'); $this->elementStart('dd');
$this->element('span', 'fn', $this->group->fullname); $this->element('span', 'fn', $this->group->fullname);
@ -235,14 +235,14 @@ class ShowgroupAction extends Action
} }
if ($this->group->location) { if ($this->group->location) {
$this->elementStart('dl', 'group_location'); $this->elementStart('dl', 'user_location');
$this->element('dt', null, _('Location')); $this->element('dt', null, _('Location'));
$this->element('dd', 'location', $this->group->location); $this->element('dd', 'location', $this->group->location);
$this->elementEnd('dl'); $this->elementEnd('dl');
} }
if ($this->group->homepage) { if ($this->group->homepage) {
$this->elementStart('dl', 'group_url'); $this->elementStart('dl', 'user_url');
$this->element('dt', null, _('URL')); $this->element('dt', null, _('URL'));
$this->elementStart('dd'); $this->elementStart('dd');
$this->element('a', array('href' => $this->group->homepage, $this->element('a', array('href' => $this->group->homepage,
@ -253,7 +253,7 @@ class ShowgroupAction extends Action
} }
if ($this->group->description) { if ($this->group->description) {
$this->elementStart('dl', 'group_note'); $this->elementStart('dl', 'user_note');
$this->element('dt', null, _('Note')); $this->element('dt', null, _('Note'));
$this->element('dd', 'note', $this->group->description); $this->element('dd', 'note', $this->group->description);
$this->elementEnd('dl'); $this->elementEnd('dl');
@ -261,10 +261,10 @@ class ShowgroupAction extends Action
$this->elementEnd('div'); $this->elementEnd('div');
$this->elementStart('div', array('id' => 'group_actions')); $this->elementStart('div', array('id' => 'user_actions'));
$this->element('h2', null, _('Group actions')); $this->element('h2', null, _('Group actions'));
$this->elementStart('ul'); $this->elementStart('ul');
$this->elementStart('li', array('id' => 'group_subscribe')); $this->elementStart('li', array('id' => 'user_subscribe'));
$cur = common_current_user(); $cur = common_current_user();
if ($cur) { if ($cur) {
if ($cur->isMember($this->group)) { if ($cur->isMember($this->group)) {
@ -361,4 +361,4 @@ class ShowgroupAction extends Action
_('All members')); _('All members'));
} }
} }
} }

6
actions/showstream.php
View File

@ -410,7 +410,7 @@ class ShowstreamAction extends Action
$this->elementStart('p'); $this->elementStart('p');
$this->element('a', array('href' => common_local_url('subscriptions', $this->element('a', array('href' => common_local_url('subscriptions',
array('nickname' => $this->profile->nickname)), array('nickname' => $this->profile->nickname)),
'class' => 'mores'), 'class' => 'more'),
_('All subscriptions')); _('All subscriptions'));
$this->elementEnd('p'); $this->elementEnd('p');
} }
@ -439,7 +439,7 @@ class ShowstreamAction extends Action
$this->elementStart('p'); $this->elementStart('p');
$this->element('a', array('href' => common_local_url('subscribers', $this->element('a', array('href' => common_local_url('subscribers',
array('nickname' => $this->profile->nickname)), array('nickname' => $this->profile->nickname)),
'class' => 'mores'), 'class' => 'more'),
_('All subscribers')); _('All subscribers'));
$this->elementEnd('p'); $this->elementEnd('p');
} }
@ -521,7 +521,7 @@ class ShowstreamAction extends Action
$this->elementStart('p'); $this->elementStart('p');
$this->element('a', array('href' => common_local_url('usergroups', $this->element('a', array('href' => common_local_url('usergroups',
array('nickname' => $this->profile->nickname)), array('nickname' => $this->profile->nickname)),
'class' => 'mores'), 'class' => 'more'),
_('All groups')); _('All groups'));
$this->elementEnd('p'); $this->elementEnd('p');
} }

18
lib/groupeditform.php
View File

@ -78,9 +78,9 @@ class GroupEditForm extends Form
function id() function id()
{ {
if ($this->group) { if ($this->group) {
return 'group_edit-' . $this->group->id; return 'form_group_edit-' . $this->group->id;
} else { } else {
return 'group_add'; return 'form_group_add';
} }
} }
@ -92,7 +92,7 @@ class GroupEditForm extends Form
function formClass() 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 * Data elements of the form
* *

6
lib/groupminilist.php
View File

@ -49,7 +49,7 @@ class GroupMiniList extends GroupList
{ {
function show() function show()
{ {
$this->out->elementStart('ul', 'groups'); $this->out->elementStart('ul', 'groups xoxo');
$cnt = 0; $cnt = 0;
@ -73,7 +73,7 @@ class GroupMiniList extends GroupList
$this->group->fullname : $this->group->fullname :
$this->group->nickname, $this->group->nickname,
'href' => $this->group->homeUrl(), 'href' => $this->group->homeUrl(),
'rel' => 'contact', 'rel' => 'contact group',
'class' => 'url')); 'class' => 'url'));
$logo = ($this->group->stream_logo) ? $logo = ($this->group->stream_logo) ?
$this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE);
@ -85,7 +85,7 @@ class GroupMiniList extends GroupList
'alt' => ($this->group->fullname) ? 'alt' => ($this->group->fullname) ?
$this->group->fullname : $this->group->fullname :
$this->group->nickname)); $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('a');
$this->out->elementEnd('li'); $this->out->elementEnd('li');
} }

4
lib/profileminilist.php
View File

@ -49,7 +49,7 @@ class ProfileMiniList extends ProfileList
{ {
function show() function show()
{ {
$this->out->elementStart('ul', 'users'); $this->out->elementStart('ul', 'users xoxo');
$cnt = 0; $cnt = 0;
@ -73,7 +73,7 @@ class ProfileMiniList extends ProfileList
$this->profile->fullname : $this->profile->fullname :
$this->profile->nickname, $this->profile->nickname,
'href' => $this->profile->profileurl, 'href' => $this->profile->profileurl,
'rel' => 'contact', 'rel' => 'contact member',
'class' => 'url')); 'class' => 'url'));
$avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE); $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)), $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)),

8
theme/base/css/display.css
View File

@ -149,7 +149,8 @@ font-weight:bold;
#form_login legend, #form_login legend,
#form_register legend, #form_register legend,
#form_password legend, #form_password legend,
#form_settings_avatar legend { #form_settings_avatar legend,
#form_group_add legend {
display:none; display:none;
} }
@ -189,6 +190,8 @@ border-radius:4px;
padding:0 7px; padding:0 7px;
} }
/* FORM SETTINGS */ /* FORM SETTINGS */
@ -691,9 +694,8 @@ margin-right:7px;
margin-bottom:7px; margin-bottom:7px;
} }
#user_subscriptions .users li .photo { #user_subscriptions .users li .photo {
width:24px;
height:24px;
margin-right:0; margin-right:0;
margin-bottom:0;
} }
#user_subscriptions .users li .fn { #user_subscriptions .users li .fn {
display:none; display:none;