diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/disfavor.php | 2 | ||||
| -rw-r--r-- | actions/favor.php | 2 | ||||
| -rw-r--r-- | actions/login.php | 8 | ||||
| -rw-r--r-- | actions/othersettings.php | 14 | ||||
| -rw-r--r-- | actions/profilesettings.php | 30 |
5 files changed, 41 insertions, 15 deletions
diff --git a/actions/disfavor.php b/actions/disfavor.php index fc36f7c75..3e3e4a547 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -69,7 +69,7 @@ class DisfavorAction extends Action $user->blowFavesCache(); if ($this->boolean('ajax')) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Add to favorites')); $this->elementEnd('head'); diff --git a/actions/favor.php b/actions/favor.php index 8d751a7a9..afda93cff 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -68,7 +68,7 @@ class FavorAction extends Action $user->blowFavesCache(); if ($this->boolean('ajax')) { - common_start_html('text/xml;charset=utf-8', true); + $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); $this->element('title', null, _('Disfavor favorite')); $this->elementEnd('head'); diff --git a/actions/login.php b/actions/login.php index 224b30f6f..4e580d360 100644 --- a/actions/login.php +++ b/actions/login.php @@ -107,13 +107,13 @@ class LoginAction extends Action function showForm($error=null) { - $this->error = $error; - $this->showPage(); + $this->error = $error; + $this->showPage(); } function title() { - return _('Login'); + return _('Login'); } function showPageNotice() @@ -131,7 +131,7 @@ class LoginAction extends Action { $this->elementStart('form', array('method' => 'post', 'id' => 'form_login', - 'class' => 'form_login', + 'class' => 'form_settings', 'action' => common_local_url('login'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Login to site')); diff --git a/actions/othersettings.php b/actions/othersettings.php index f35630f36..cbb2c0cb9 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -83,11 +83,14 @@ class OthersettingsAction extends AccountSettingsAction { $user = common_current_user(); - $this->element('h2', null, _('URL Auto-shortening')); + $this->elementStart('form', array('method' => 'post', - 'id' => 'othersettings', + 'id' => 'form_settings_other', + 'class' => 'form_settings', 'action' => common_local_url('othersettings'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('URL Auto-shortening')); $this->hidden('token', common_session_token()); // I18N @@ -104,12 +107,15 @@ class OthersettingsAction extends AccountSettingsAction 'metamark.net' => 'metamark.net' ); + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice); - + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/profilesettings.php b/actions/profilesettings.php index c31f76227..12251b83b 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -84,52 +84,72 @@ class ProfilesettingsAction extends AccountSettingsAction $profile = $user->getProfile(); $this->elementStart('form', array('method' => 'POST', - 'id' => 'profilesettings', + 'id' => 'form_settings_profile', + 'class' => 'form_settings', 'action' => common_local_url('profilesettings'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Profile information')); $this->hidden('token', common_session_token()); # too much common patterns here... abstractable? + $this->elementStart('ul', 'form_datas'); + $this->elementStart('li'); $this->input('nickname', _('Nickname'), ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname, _('1-64 lowercase letters or numbers, no punctuation or spaces')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('fullname', _('Full name'), ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('homepage', _('Homepage'), ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage, _('URL of your homepage, blog, or profile on another site')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->textarea('bio', _('Bio'), ($this->arg('bio')) ? $this->arg('bio') : $profile->bio, _('Describe yourself and your interests in 140 chars')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('location', _('Location'), ($this->arg('location')) ? $this->arg('location') : $profile->location, _('Where you are, like "City, State (or Region), Country"')); + $this->elementEnd('li'); + $this->elementStart('li'); $this->input('tags', _('Tags'), ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()), _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated')); - + $this->elementEnd('li'); + $this->elementStart('li'); $language = common_language(); $this->dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language); - + $this->elementEnd('li'); $timezone = common_timezone(); $timezones = array(); foreach(DateTimeZone::listIdentifiers() as $k => $v) { $timezones[$v] = $v; } + $this->elementStart('li'); $this->dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone); - + $this->elementEnd('li'); + $this->elementStart('li'); $this->checkbox('autosubscribe', _('Automatically subscribe to whoever '. 'subscribes to me (best for non-humans)'), ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe); - + $this->elementEnd('li'); + $this->elementEnd('ul'); $this->submit('save', _('Save')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } |