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

Renamed form_datas to form_data

This commit is contained in:
sarven 2009-01-19 03:09:13 +00:00
parent 6fa7ac1305
commit 0b5f0f4faa
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/emailsettings.php
View File

@ -110,7 +110,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->hidden('email', $confirm->address); $this->hidden('email', $confirm->address);
$this->submit('cancel', _('Cancel')); $this->submit('cancel', _('Cancel'));
} else { } else {
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('email', _('Email Address'), $this->input('email', _('Email Address'),
($this->arg('email')) ? $this->arg('email') : null, ($this->arg('email')) ? $this->arg('email') : null,
@ -146,7 +146,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_email_preferences')); $this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
$this->element('legend', null, _('Preferences')); $this->element('legend', null, _('Preferences'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->checkbox('emailnotifysub', $this->checkbox('emailnotifysub',
_('Send me notices of new subscriptions through email.'), _('Send me notices of new subscriptions through email.'),

4
actions/imsettings.php
View File

@ -113,7 +113,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->hidden('jabber', $confirm->address); $this->hidden('jabber', $confirm->address);
$this->submit('cancel', _('Cancel')); $this->submit('cancel', _('Cancel'));
} else { } else {
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('jabber', _('IM Address'), $this->input('jabber', _('IM Address'),
($this->arg('jabber')) ? $this->arg('jabber') : null, ($this->arg('jabber')) ? $this->arg('jabber') : null,
@ -131,7 +131,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_im_preferences')); $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
$this->element('legend', null, _('Preferences')); $this->element('legend', null, _('Preferences'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->checkbox('jabbernotify', $this->checkbox('jabbernotify',
_('Send me notices through Jabber/GTalk.'), _('Send me notices through Jabber/GTalk.'),

2
actions/login.php
View File

@ -223,7 +223,7 @@ class LoginAction extends Action
'action' => common_local_url('login'))); 'action' => common_local_url('login')));
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->element('legend', null, _('Login to site')); $this->element('legend', null, _('Login to site'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('nickname', _('Nickname')); $this->input('nickname', _('Nickname'));
$this->elementEnd('li'); $this->elementEnd('li');

2
actions/openidsettings.php
View File

@ -95,7 +95,7 @@ class OpenidsettingsAction extends AccountSettingsAction
$this->element('p', 'form_guide', $this->element('p', 'form_guide',
_('If you want to add an OpenID to your account, ' . _('If you want to add an OpenID to your account, ' .
'enter it in the box below and click "Add".')); 'enter it in the box below and click "Add".'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->element('label', array('for' => 'openid_url'), $this->element('label', array('for' => 'openid_url'),
_('OpenID URL')); _('OpenID URL'));

2
actions/othersettings.php
View File

@ -107,7 +107,7 @@ class OthersettingsAction extends AccountSettingsAction
'metamark.net' => 'metamark.net' 'metamark.net' => 'metamark.net'
); );
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->dropdown('urlshorteningservice', _('Service'), $this->dropdown('urlshorteningservice', _('Service'),
$services, _('Automatic shortening service to use.'), $services, _('Automatic shortening service to use.'),

2
actions/profilesettings.php
View File

@ -93,7 +93,7 @@ class ProfilesettingsAction extends AccountSettingsAction
# too much common patterns here... abstractable? # too much common patterns here... abstractable?
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('nickname', _('Nickname'), $this->input('nickname', _('Nickname'),
($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname, ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,

2
actions/register.php
View File

@ -343,7 +343,7 @@ class RegisterAction extends Action
$this->hidden('code', $code); $this->hidden('code', $code);
} }
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('nickname', _('Nickname'), $this->trimmed('nickname'), $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
_('1-64 lowercase letters or numbers, '. _('1-64 lowercase letters or numbers, '.

8
actions/smssettings.php
View File

@ -113,7 +113,7 @@ class SmssettingsAction extends ConnectSettingsAction
$this->hidden('carrier', $confirm->address_extra); $this->hidden('carrier', $confirm->address_extra);
$this->submit('cancel', _('Cancel')); $this->submit('cancel', _('Cancel'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('code', _('Confirmation code'), null, $this->input('code', _('Confirmation code'), null,
_('Enter the code you received on your phone.')); _('Enter the code you received on your phone.'));
@ -121,7 +121,7 @@ class SmssettingsAction extends ConnectSettingsAction
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->submit('confirm', _('Confirm')); $this->submit('confirm', _('Confirm'));
} else { } else {
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('sms', _('SMS Phone number'), $this->input('sms', _('SMS Phone number'),
($this->arg('sms')) ? $this->arg('sms') : null, ($this->arg('sms')) ? $this->arg('sms') : null,
@ -156,7 +156,7 @@ class SmssettingsAction extends ConnectSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_sms_preferences')); $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
$this->element('legend', null, _('Preferences')); $this->element('legend', null, _('Preferences'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->checkbox('smsnotify', $this->checkbox('smsnotify',
_('Send me notices through SMS; '. _('Send me notices through SMS; '.
@ -448,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction
$cnt = $carrier->find(); $cnt = $carrier->find();
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->element('label', array('for' => 'carrier'), _('Mobile carrier')); $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
$this->elementStart('select', array('name' => 'carrier', $this->elementStart('select', array('name' => 'carrier',

4
actions/twittersettings.php
View File

@ -104,7 +104,7 @@ 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_datas'); $this->elementStart('ul', 'form_data');
if ($fuser) { if ($fuser) {
$this->elementStart('li'); $this->elementStart('li');
$this->element('span', 'twitter_user', $fuser->nickname); $this->element('span', 'twitter_user', $fuser->nickname);
@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction
array('id' => 'settings_twitter_preferences')); array('id' => 'settings_twitter_preferences'));
$this->element('legend', null, _('Preferences')); $this->element('legend', null, _('Preferences'));
$this->elementStart('ul', 'form_datas'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->checkbox('noticesync', $this->checkbox('noticesync',
_('Automatically send my notices to Twitter.'), _('Automatically send my notices to Twitter.'),

2
lib/noticeform.php
View File

@ -123,7 +123,7 @@ class NoticeForm extends Form
{ {
$user = common_current_user(); $user = common_current_user();
$this->out->elementStart('ul', 'form_datas'); $this->out->elementStart('ul', 'form_data');
$this->out->elementStart('li', array('id' => 'notice_text')); $this->out->elementStart('li', array('id' => 'notice_text'));
$this->out->element('label', array('for' => 'notice_data-text'), $this->out->element('label', array('for' => 'notice_data-text'),
sprintf(_('What\'s up, %s?'), $user->nickname)); sprintf(_('What\'s up, %s?'), $user->nickname));

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

@ -114,17 +114,17 @@ font-style:italic;
} }
.form_settings .form_datas li { .form_settings .form_data li {
width:100%; width:100%;
float:left; float:left;
} }
.form_settings .form_datas label { .form_settings .form_data label {
float:left; float:left;
} }
.form_settings .form_datas textarea, .form_settings .form_data textarea,
.form_settings .form_datas select, .form_settings .form_data select,
.form_settings .form_datas input { .form_settings .form_data input {
margin-left:11px; margin-left:11px;
float:left; float:left;
} }
@ -149,7 +149,7 @@ font-weight:bold;
display:none; display:none;
} }
.form_settings .form_datas p.form_guide { .form_settings .form_data p.form_guide {
clear:both; clear:both;
margin-left:163px; margin-left:163px;
margin-bottom:0; margin-bottom:0;
@ -424,7 +424,7 @@ display:block;
font-size:1.3em; font-size:1.3em;
margin-bottom:7px; margin-bottom:7px;
} }
#form_notice .form_datas li { #form_notice .form_data li {
float:left; float:left;
} }
@ -979,12 +979,12 @@ background-color:#D1D9E4;
#user_actions #user_subscribe .form_note, #user_actions #user_subscribe .form_note,
#user_actions #user_subscribe .form_datas, #user_actions #user_subscribe .form_data,
#user_actions #user_subscribe .form_actions label { #user_actions #user_subscribe .form_actions label {
display:none; display:none;
} }
#form_user-relationship .form_note, #form_user-relationship .form_note,
#form_user-relationship .form_datas, #form_user-relationship .form_data,
#form_user-relationship .form_actions label { #form_user-relationship .form_actions label {
display:block; display:block;
} }
@ -992,7 +992,7 @@ display:block;
#user_actions #user-relationship_submit { #user_actions #user-relationship_submit {
margin-bottom:0; margin-bottom:0;
} }
#form_user-relationship .form_datas li label { #form_user-relationship .form_data li label {
margin-right:11px; margin-right:11px;
} }
@ -1070,7 +1070,7 @@ font-size:2.2em;
#form_settings_photo .form_datas { #form_settings_photo .form_data {
clear:both; clear:both;
} }