summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/emailsettings.php4
-rw-r--r--actions/imsettings.php4
-rw-r--r--actions/login.php2
-rw-r--r--actions/openidsettings.php2
-rw-r--r--actions/othersettings.php2
-rw-r--r--actions/profilesettings.php2
-rw-r--r--actions/register.php2
-rw-r--r--actions/smssettings.php8
-rw-r--r--actions/twittersettings.php4
-rw-r--r--lib/noticeform.php2
-rw-r--r--theme/base/css/display.css22
11 files changed, 27 insertions, 27 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 7ae62fb55..b84acb214 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -110,7 +110,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->hidden('email', $confirm->address);
$this->submit('cancel', _('Cancel'));
} else {
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('email', _('Email Address'),
($this->arg('email')) ? $this->arg('email') : null,
@@ -146,7 +146,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
$this->element('legend', null, _('Preferences'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('emailnotifysub',
_('Send me notices of new subscriptions through email.'),
diff --git a/actions/imsettings.php b/actions/imsettings.php
index edbd81b57..e0f5ede3a 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -113,7 +113,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->hidden('jabber', $confirm->address);
$this->submit('cancel', _('Cancel'));
} else {
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('jabber', _('IM Address'),
($this->arg('jabber')) ? $this->arg('jabber') : null,
@@ -131,7 +131,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
$this->element('legend', null, _('Preferences'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('jabbernotify',
_('Send me notices through Jabber/GTalk.'),
diff --git a/actions/login.php b/actions/login.php
index 9fa501a5d..11cf1f02a 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -223,7 +223,7 @@ class LoginAction extends Action
'action' => common_local_url('login')));
$this->elementStart('fieldset');
$this->element('legend', null, _('Login to site'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('nickname', _('Nickname'));
$this->elementEnd('li');
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 126d2c992..92469d20f 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -95,7 +95,7 @@ class OpenidsettingsAction extends AccountSettingsAction
$this->element('p', 'form_guide',
_('If you want to add an OpenID to your account, ' .
'enter it in the box below and click "Add".'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->element('label', array('for' => 'openid_url'),
_('OpenID URL'));
diff --git a/actions/othersettings.php b/actions/othersettings.php
index cbb2c0cb9..b542233ca 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -107,7 +107,7 @@ class OthersettingsAction extends AccountSettingsAction
'metamark.net' => 'metamark.net'
);
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->dropdown('urlshorteningservice', _('Service'),
$services, _('Automatic shortening service to use.'),
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 12251b83b..6dd4775e5 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -93,7 +93,7 @@ class ProfilesettingsAction extends AccountSettingsAction
# too much common patterns here... abstractable?
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('nickname', _('Nickname'),
($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
diff --git a/actions/register.php b/actions/register.php
index 08243c1e2..159daaa73 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -343,7 +343,7 @@ class RegisterAction extends Action
$this->hidden('code', $code);
}
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
_('1-64 lowercase letters or numbers, '.
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 489fd1f58..f89cbe1ab 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -113,7 +113,7 @@ class SmssettingsAction extends ConnectSettingsAction
$this->hidden('carrier', $confirm->address_extra);
$this->submit('cancel', _('Cancel'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('code', _('Confirmation code'), null,
_('Enter the code you received on your phone.'));
@@ -121,7 +121,7 @@ class SmssettingsAction extends ConnectSettingsAction
$this->elementEnd('ul');
$this->submit('confirm', _('Confirm'));
} else {
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('sms', _('SMS Phone number'),
($this->arg('sms')) ? $this->arg('sms') : null,
@@ -156,7 +156,7 @@ class SmssettingsAction extends ConnectSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
$this->element('legend', null, _('Preferences'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('smsnotify',
_('Send me notices through SMS; '.
@@ -448,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction
$cnt = $carrier->find();
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
$this->elementStart('select', array('name' => 'carrier',
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 079099123..efc8215cd 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -104,7 +104,7 @@ class TwittersettingsAction extends ConnectSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_twitter_account'));
$this->element('legend', null, _('Twitter Account'));
$this->hidden('token', common_session_token());
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
if ($fuser) {
$this->elementStart('li');
$this->element('span', 'twitter_user', $fuser->nickname);
@@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction
array('id' => 'settings_twitter_preferences'));
$this->element('legend', null, _('Preferences'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('noticesync',
_('Automatically send my notices to Twitter.'),
diff --git a/lib/noticeform.php b/lib/noticeform.php
index d6a3aa9c2..f0205f1c1 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -123,7 +123,7 @@ class NoticeForm extends Form
{
$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->element('label', array('for' => 'notice_data-text'),
sprintf(_('What\'s up, %s?'), $user->nickname));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 716f3256f..d659a4b4c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -114,17 +114,17 @@ font-style:italic;
}
-.form_settings .form_datas li {
+.form_settings .form_data li {
width:100%;
float:left;
}
-.form_settings .form_datas label {
+.form_settings .form_data label {
float:left;
}
-.form_settings .form_datas textarea,
-.form_settings .form_datas select,
-.form_settings .form_datas input {
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
margin-left:11px;
float:left;
}
@@ -149,7 +149,7 @@ font-weight:bold;
display:none;
}
-.form_settings .form_datas p.form_guide {
+.form_settings .form_data p.form_guide {
clear:both;
margin-left:163px;
margin-bottom:0;
@@ -424,7 +424,7 @@ display:block;
font-size:1.3em;
margin-bottom:7px;
}
-#form_notice .form_datas li {
+#form_notice .form_data li {
float:left;
}
@@ -979,12 +979,12 @@ background-color:#D1D9E4;
#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 {
display:none;
}
#form_user-relationship .form_note,
-#form_user-relationship .form_datas,
+#form_user-relationship .form_data,
#form_user-relationship .form_actions label {
display:block;
}
@@ -992,7 +992,7 @@ display:block;
#user_actions #user-relationship_submit {
margin-bottom:0;
}
-#form_user-relationship .form_datas li label {
+#form_user-relationship .form_data li label {
margin-right:11px;
}
@@ -1070,7 +1070,7 @@ font-size:2.2em;
-#form_settings_photo .form_datas {
+#form_settings_photo .form_data {
clear:both;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-01 02:25:38 +0000