diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/facebookhome.php | 5 | ||||
| -rw-r--r-- | actions/remotesubscribe.php | 16 | ||||
| -rw-r--r-- | actions/shownotice.php | 2 | ||||
| -rw-r--r-- | actions/showstream.php | 2 |
4 files changed, 21 insertions, 4 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php index ea56ec071..b05e51b91 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -91,6 +91,9 @@ class FacebookhomeAction extends FacebookAction function login() { + + $this->showStylesheets(); + $nickname = common_canonical_nickname($this->trimmed('nickname')); $password = $this->arg('password'); @@ -185,6 +188,8 @@ class FacebookhomeAction extends FacebookAction function getUpdatePermission() { + $this->showStylesheets(); + $this->elementStart('div', array('class' => 'content')); $instructions = sprintf(_('If you would like the %s app to automatically update ' . diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php index 3c8346fbe..f727a63b8 100644 --- a/actions/remotesubscribe.php +++ b/actions/remotesubscribe.php @@ -92,14 +92,26 @@ class RemotesubscribeAction extends Action { # id = remotesubscribe conflicts with the # button on profile page - $this->elementStart('form', array('id' => 'remsub', 'method' => 'post', - 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('form', array('id' => 'form_remote_subscribe', + 'method' => 'post', + 'class' => 'form_settings', + 'action' => common_local_url('remotesubscribe'))); + $this->elementStart('fieldset'); + $this->element('legend', 'Subscribe to a remote user'); $this->hidden('token', common_session_token()); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); $this->input('nickname', _('User nickname'), $this->nickname, _('Nickname of the user you want to follow')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('profile_url', _('Profile URL'), $this->profile_url, _('URL of your profile on another compatible microblogging service')); + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('submit', _('Subscribe')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/shownotice.php b/actions/shownotice.php index beae478ba..d5f35cd84 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -95,7 +95,7 @@ class ShownoticeAction extends Action return false; } - $this->avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); + $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); return true; } diff --git a/actions/showstream.php b/actions/showstream.php index 157ccdd0c..2fd56ad2e 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -367,7 +367,7 @@ class ShowstreamAction extends Action $url = common_local_url('remotesubscribe', array('nickname' => $this->profile->nickname)); $this->element('a', array('href' => $url, - 'id' => 'entity_subscribe_remote'), + 'class' => 'entity_remote_subscribe'), _('Subscribe')); } |