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

Merge branch 'master' of /var/www/trunk

This commit is contained in:
Zach Copley 2009-01-23 12:13:24 +00:00
parent 44d1e723df 7fa5e22438
commit 57ba50c4c8
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
actions/twittersettings.php
View File

@ -104,18 +104,20 @@ class TwittersettingsAction extends ConnectSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_twitter_account')); $this->elementStart('fieldset', array('id' => 'settings_twitter_account'));
$this->element('legend', null, _('Twitter Account')); $this->element('legend', null, _('Twitter Account'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->elementStart('ul', 'form_data');
if ($fuser) { if ($fuser) {
$this->elementStart('li'); $this->elementStart('ul', 'form_data');
$this->elementStart('li', array('id' => 'settings_twitter_remove'));
$this->element('span', 'twitter_user', $fuser->nickname); $this->element('span', 'twitter_user', $fuser->nickname);
$this->element('a', array('href' => $fuser->uri), $fuser->uri); $this->element('a', array('href' => $fuser->uri), $fuser->uri);
$this->element('p', 'form_guide', $this->element('p', 'form_guide',
_('Current verified Twitter account.')); _('Current verified Twitter account.'));
$this->hidden('flink_foreign_id', $flink->foreign_id); $this->hidden('flink_foreign_id', $flink->foreign_id);
$this->submit('remove', _('Remove'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul');
$this->submit('remove', _('Remove'));
} else { } else {
$this->elementStart('li'); $this->elementStart('ul', 'form_data');
$this->elementStart('li', array('id' => 'settings_twitter_login'));
$this->input('twitter_username', _('Twitter user name'), $this->input('twitter_username', _('Twitter user name'),
($this->arg('twitter_username')) ? ($this->arg('twitter_username')) ?
$this->arg('twitter_username') : $this->arg('twitter_username') :
@ -125,8 +127,8 @@ class TwittersettingsAction extends ConnectSettingsAction
$this->elementStart('li'); $this->elementStart('li');
$this->password('twitter_password', _('Twitter password')); $this->password('twitter_password', _('Twitter password'));
$this->elementend('li'); $this->elementend('li');
$this->elementEnd('ul');
} }
$this->elementEnd('ul');
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
$this->elementStart('fieldset', $this->elementStart('fieldset',
@ -224,10 +226,10 @@ class TwittersettingsAction extends ConnectSettingsAction
$friends_count = count($friends); $friends_count = count($friends);
if ($friends_count > 0) { if ($friends_count > 0) {
$this->elementStart('div', array('id' => 'entity_subscriptions',
$this->element('h3', null, _('Twitter Friends')); 'class' => 'section'));
$this->elementStart('div', array('id' => 'subscriptions')); $this->element('h2', null, _('Twitter Friends'));
$this->elementStart('ul', array('id' => 'subscriptions_avatars')); $this->elementStart('ul', 'entities users xoxo');
for ($i = 0; $i < min($friends_count, SUBSCRIPTIONS); $i++) { for ($i = 0; $i < min($friends_count, SUBSCRIPTIONS); $i++) {
@ -238,13 +240,12 @@ class TwittersettingsAction extends ConnectSettingsAction
continue; continue;
} }
$this->elementStart('li'); $this->elementStart('li', 'vcard');
$this->elementStart('a', array('title' => ($other->fullname) ? $this->elementStart('a', array('title' => ($other->fullname) ?
$other->fullname : $other->fullname :
$other->nickname, $other->nickname,
'href' => $other->profileurl, 'href' => $other->profileurl,
'rel' => 'contact', 'class' => 'url'));
'class' => 'subscription'));
$avatar = $other->getAvatar(AVATAR_MINI_SIZE); $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
@ -255,10 +256,12 @@ class TwittersettingsAction extends ConnectSettingsAction
$this->element('img', array('src' => $avatar_url, $this->element('img', array('src' => $avatar_url,
'width' => AVATAR_MINI_SIZE, 'width' => AVATAR_MINI_SIZE,
'height' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE,
'class' => 'avatar mini', 'class' => 'avatar photo',
'alt' => ($other->fullname) ? 'alt' => ($other->fullname) ?
$other->fullname : $other->fullname :
$other->nickname)); $other->nickname));
$this->element('span', 'fn nickname', $other->nickname);
$this->elementEnd('a'); $this->elementEnd('a');
$this->elementEnd('li'); $this->elementEnd('li');

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

@ -61,6 +61,7 @@ border-radius:4px;
input.submit { input.submit {
font-weight:bold; font-weight:bold;
cursor:pointer;
} }
textarea { textarea {
overflow:auto; overflow:auto;
@ -120,6 +121,10 @@ float:left;
margin-left:11px; margin-left:11px;
float:left; float:left;
} }
.form_settings .form_data input.submit {
margin-left:0;
}
.form_settings label { .form_settings label {
margin-top:2px; margin-top:2px;
width:152px; width:152px;
@ -175,7 +180,8 @@ width:90%;
#form_login p.form_guide, #form_login p.form_guide,
#form_register #settings_rememberme p.form_guide, #form_register #settings_rememberme p.form_guide,
#form_openid_login #settings_rememberme p.form_guide { #form_openid_login #settings_rememberme p.form_guide,
#settings_twitter_remove p.form_guide {
margin-left:0; margin-left:0;
} }
@ -453,7 +459,6 @@ top:25px;
right:30px; right:30px;
margin-left:4px; margin-left:4px;
padding:0; padding:0;
cursor:pointer;
width:16px; width:16px;
height:16px; height:16px;
border:0; border:0;
@ -586,7 +591,6 @@ display:none;
.entity_actions input.submit { .entity_actions input.submit {
display:block; display:block;
text-align:left; text-align:left;
cursor:pointer;
width:100%; width:100%;
} }
.entity_actions a, .entity_actions a,
@ -650,7 +654,7 @@ content: ":";
} }
.section ul.entities { .section ul.entities {
width:220px; width:280px;
float:left; float:left;
} }
.section .entities li { .section .entities li {
@ -918,7 +922,6 @@ padding-left:16px;
} }
.notice-options form input.submit { .notice-options form input.submit {
cursor:pointer;
width:16px; width:16px;
padding:2px 0; padding:2px 0;
} }