From 41e5e7e912fb93bc618a431c6e0d731a76fa87c8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 19:45:21 +0000
Subject: Added @title for input submit

---
 lib/disfavorform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index d0c3b1832..f339f215a 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -125,7 +125,7 @@ class DisfavorForm extends Form
     function formActions()
     {
         $this->out->submit('disfavor-submit-' . $this->notice->id,
-                           _('Disfavor favorite'));
+                           _('Disfavor favorite'), 'submit', null, _('Disfavor this notice'));
     }
     
     /**
-- 
cgit v1.2.3-54-g00ecf


From 5426c4ec6a8691969fbb704056ea87ad85021b79 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 19:58:28 +0000
Subject: Using config site name for creative commons bit. Fix i18n.

---
 lib/action.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/action.php b/lib/action.php
index e62a032b6..320814a8a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -439,7 +439,8 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('img', array('id' => 'license_cc',
                                     'src' => common_config('license', 'image'),
                                     'alt' => common_config('license', 'title')));
-        $this->text(_('All criti.ca content and data are available under the '));
+        //TODO: This is dirty: i18n
+        $this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
                                   'href' => common_config('license', 'url')),
-- 
cgit v1.2.3-54-g00ecf


From 6b23a9ed2f35e487847fe80b588eb3a967aaecb8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 21:34:57 +0000
Subject: Disfavor markup/style

---
 lib/disfavorform.php       | 12 ++++++++++++
 theme/base/css/display.css |  9 ++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index f339f215a..45a9ddb1d 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -103,6 +103,18 @@ class DisfavorForm extends Form
                            common_session_token());
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Disfavor this notice'));
+    }
+
+
     /**
      * Data elements
      *
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 76e52ffc9..0041baf44 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -860,15 +860,18 @@ padding-left:16px;
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 10px;
+width:16px;
+padding:2px 0;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .form_favor legend {
+.notice-options .form_favor legend,
+.notice-options .form_disfavor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .form_favor fieldset {
+.notice-options .form_favor fieldset,
+.notice-options .form_disfavor fieldset {
 border:0;
 padding:0;
 }
-- 
cgit v1.2.3-54-g00ecf


From 9d384aadb1f27cea85d23c944f787cf300a4389a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 22:08:51 +0000
Subject: @id for site_nav_global_primary items in order to target for styling

---
 actions/register.php           |  1 +
 lib/action.php                 | 22 +++++++++++++---------
 theme/identica/css/display.css | 19 ++++++++++++++++---
 3 files changed, 30 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/actions/register.php b/actions/register.php
index f0d47f19b..08243c1e2 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -399,6 +399,7 @@ class RegisterAction extends Action
         $this->elementEnd('li');
         $attrs = array('type' => 'checkbox',
                        'id' => 'license',
+                       'class' => 'checkbox',
                        'name' => 'license',
                        'value' => 'true');
         if ($this->boolean('license')) {
diff --git a/lib/action.php b/lib/action.php
index 320814a8a..3d61afde2 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -242,25 +242,29 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('ul', array('class' => 'nav'));
         if ($user) {
             $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
-                            _('Home'));
+                            _('Home'), _('Personal timeline'), false, 'nav_home');
         }
-        $this->menuItem(common_local_url('peoplesearch'), _('Search'));
+        $this->menuItem(common_local_url('peoplesearch'),
+                        _('Search'), _('Search the site for people and text'), false, 'nav_search');
         if ($user) {
             $this->menuItem(common_local_url('profilesettings'),
-                            _('Account'));
+                            _('Account'), _('Account settings'), false, 'nav_account');
             $this->menuItem(common_local_url('imsettings'),
-                            _('Connect'));
+                            _('Connect'), _('Connect settings'), false, 'nav_connect');
             $this->menuItem(common_local_url('logout'),
-                            _('Logout'));
+                            _('Logout'), _('Logout from the site'), false, 'nav_logout');
         } else {
-            $this->menuItem(common_local_url('login'), _('Login'));
+            $this->menuItem(common_local_url('login'),
+                            _('Login'), _('Login to the site'), false, 'nav_login');
             if (!common_config('site', 'closed')) {
-                $this->menuItem(common_local_url('register'), _('Register'));
+                $this->menuItem(common_local_url('register'),
+                                _('Register'), _('Create an account'), false, 'nav_register');
             }
-            $this->menuItem(common_local_url('openidlogin'), _('OpenID'));
+            $this->menuItem(common_local_url('openidlogin'),
+                            _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
         }
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                        _('Help'));
+                        _('Help'), _('Help me!'), false, 'nav_help');
         $this->elementEnd('ul');
         $this->elementEnd('dd');
         $this->elementEnd('dl');
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 0235c2d7d..a5b177004 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -57,6 +57,21 @@ background-color:transparent;
 }
 
 
+#site_nav_global_primary a {
+}
+
+#nav_register a {
+background-color:#A9BF4F;
+color:#fff;
+text-decoration:none;
+font-weight:bold;
+padding:2px 4px;
+
+}
+#nav_login a {
+}
+
+
 #site_nav_local_views a {
 border-color:#fff;
 background-color:rgba(255, 255, 255, 0.2);
@@ -71,6 +86,7 @@ background-color:rgba(255, 255, 255, 0.7);
 background-color:#fff;
 }
 
+
 #page_notice .error {
 background-color:#F7E8E8;
 }
@@ -78,9 +94,6 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
-
-
-
 #export_data li a {
 background-repeat:no-repeat;
 background-position:0 45%;
-- 
cgit v1.2.3-54-g00ecf


From 910bd332430b0af233ae78b330994520d4b59c97 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 00:10:42 +0000
Subject: Minimal cross browser styling (mostly IE7). w00t!

---
 lib/action.php                 |  2 +-
 theme/base/css/display.css     | 28 ++++++++++++++++++----------
 theme/identica/css/display.css | 18 +++++++++++++++---
 3 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/action.php b/lib/action.php
index 3d61afde2..c463c8459 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -138,7 +138,7 @@ class Action extends HTMLOutputter // lawsuit
             if (file_exists(theme_file('ie'.$ver.'.css'))) {
                 // Yes, IE people should be put in jail.
                 $this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
-                               'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
+                               'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
             }
         }
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0041baf44..5a52780fc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,13 +48,18 @@ input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
--moz-border-radius:4px;
 }
-input:focus, textarea:focus, select:focus {
+input, textarea, select {
 border-width:2px;
 border-style: solid;
+-moz-border-radius:4px;
+}
+input.submit {
+font-weight:bold;
+}
+textarea {
+overflow:auto;
 }
-
 select, option {
 padding-bottom:0;
 }
@@ -73,10 +78,11 @@ font-weight:bold;
 form ul li input {
 }
 
-form input.checkbox {
+input.checkbox {
 position:relative;
 top:2px;
 left:0;
+border:0;
 }
 
 #page_notice .error,
@@ -120,7 +126,7 @@ float:left;
 }
 
 .form_settings label {
-margin-top:7px;
+margin-top:2px;
 width:152px;
 }
 
@@ -388,9 +394,7 @@ display:none;
 }
 #form_notice textarea {
 -moz-border-radius:4px;
-width:304px;
 width:377px;
-height:95px;
 height:86px;
 line-height:1.5;
 padding:7px 7px 14px 7px;
@@ -416,7 +420,6 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:125px;
 top:116px;
 right:98px;
 z-index:9;
@@ -445,10 +448,14 @@ text-indent:-9999px;
 }
 #form_notice .form_actions {
 position:absolute;
-top:107px;
-top:98px;
+bottom:0;
 right:0;
 }
+#form_notice .form_actions input.submit {
+width:60px;
+padding:8px;
+}
+
 #form_notice li {
 margin-bottom:0;
 }
@@ -715,6 +722,7 @@ font-style:italic;
 
 .notice .entry-title {
 float:left;
+width:100%;
 }
 .notice p.entry-content {
 display:inline;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index a5b177004..8a1130387 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -5,13 +5,23 @@ background-color:#ddd;
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
+background-color:#ddd;
 }
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
+input, textarea, select {
+border-color:#aaa;
+}
+
 input:focus, textarea:focus, select:focus {
-border-color:#B2D0DD;
+border-color:#A9BF4F;
+}
+input.submit {
+background-color:#A9BF4F;
+color:#fff;
 }
+
 a {
 color:#002E6E;
 }
@@ -33,7 +43,8 @@ background-color:#fcfffc;
 background-color:#CEE1E9;
 }
 
-
+#form_notice textarea {
+}
 
 #form_notice label {
 color:#88171A;
@@ -59,7 +70,8 @@ background-color:transparent;
 
 #site_nav_global_primary a {
 }
-
+#form_notice .form_actions input.submit {
+}
 #nav_register a {
 background-color:#A9BF4F;
 color:#fff;
-- 
cgit v1.2.3-54-g00ecf


From 8f9762aab183a8bf502d734ec5f18ca0e68f48cb Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 00:48:12 +0000
Subject: Cross-browser stuff

---
 lib/action.php                 |  2 ++
 theme/base/css/display.css     | 35 ++++++++++++++++++++++++++++++-----
 theme/base/css/ie.css          | 26 ++++++++++++++++++++++++++
 theme/base/css/ie7.css         |  5 +++++
 theme/identica/css/display.css |  4 ++++
 5 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 theme/base/css/ie.css
 create mode 100644 theme/base/css/ie7.css

(limited to 'lib')

diff --git a/lib/action.php b/lib/action.php
index c463c8459..9cd2d5a18 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
+        $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+                       'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
         foreach (array(6,7) as $ver) {
             if (file_exists(theme_file('ie'.$ver.'.css'))) {
                 // Yes, IE people should be put in jail.
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5a52780fc..06860e30d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -52,7 +52,9 @@ font-size:1em;
 input, textarea, select {
 border-width:2px;
 border-style: solid;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 input.submit {
 font-weight:bold;
@@ -88,7 +90,9 @@ border:0;
 #page_notice .error,
 #page_notice .success {
 padding:4px 7px;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 form label.submit {
 display:none;
@@ -175,7 +179,9 @@ margin-left:0;
 
 
 .form_settings .form_note {
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 padding:0 7px;
 }
 
@@ -206,6 +212,7 @@ margin-bottom:29px;
 
 #site_nav_global_primary {
 float:right;
+margin-right:18px;
 }
 #site_nav_global_primary ul li {
 display:inline;
@@ -236,8 +243,8 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:68%;
-padding-bottom:11px;
+width:64%;
+padding:18px;
 }
 
 
@@ -260,6 +267,8 @@ text-decoration:none;
 padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
+-webkit-border-top-left-radius:4px;
+-webkit-border-top-right-radius:4px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -328,8 +337,8 @@ margin-bottom:11px;
 line-height:1.5;
 }
 
-
-#site_content_license_cc p {
+#site_content_license_cc {
+margin-bottom:0;
 }
 #site_content_license_cc img {
 display:inline;
@@ -357,12 +366,17 @@ margin-bottom:1em;
 width:644px;
 padding:18px;
 float:left;
+border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
+-webkit-border-radius:7px;
+-webkit-border-top-left-radius:0;
 }
 
 #content_inner {
 position:relative;
+width:100%;
+float;left;
 }
 
 #aside_primary {
@@ -370,7 +384,9 @@ width:300px;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 
 
@@ -393,8 +409,11 @@ padding:0;
 display:none;
 }
 #form_notice textarea {
--moz-border-radius:4px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
 width:377px;
+width:370px;
 height:86px;
 line-height:1.5;
 padding:7px 7px 14px 7px;
@@ -680,7 +699,9 @@ list-style-type:none;
 #notices_primary {
 float:left;
 width:644px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 #notices_primary h2 {
 display:none;
@@ -919,11 +940,13 @@ border-bottom:0;
 
 .pagination .nav_prev a {
 -moz-border-radius-topright:7px;
+-webkit-border-top-right-radius:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
 -moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
 padding-right:20px;
 border-right:0;
 }
@@ -1138,7 +1161,9 @@ height:109px;
 border-width:1px;
 border-style:dotted;
 text-decoration:none;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 padding:7px;
 font-size:1.6em;
 font-weight:bold;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
new file mode 100644
index 000000000..ef64da953
--- /dev/null
+++ b/theme/base/css/ie.css
@@ -0,0 +1,26 @@
+/* IE specific styles */
+
+#aside_primary {
+padding-left:11px;
+}
+.notice-options form input.submit {
+font-size:0;
+margin-top:3px;
+height:16px;
+text-align:right;
+text-indent:0;
+color:#fff;
+width:24px;
+}
+
+input.checkbox {
+top:0;
+}
+
+legend {
+margin-left:-7px;
+}
+
+.notice div.entry-content .timestamp a {
+display:inline;
+}
\ No newline at end of file
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
new file mode 100644
index 000000000..a6e2548ab
--- /dev/null
+++ b/theme/base/css/ie7.css
@@ -0,0 +1,5 @@
+/* IE7 specific styles */
+
+#form_notice textarea {
+width:370px;
+} 
\ No newline at end of file
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8a1130387..eb7b47a12 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,11 +30,15 @@ background-color:#ddd;
 }
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
 
-- 
cgit v1.2.3-54-g00ecf


From 0b5f0f4faaf04fdf13dbd5dea1f081b9e1cc6071 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 03:09:13 +0000
Subject: Renamed form_datas to form_data

---
 actions/emailsettings.php   |  4 ++--
 actions/imsettings.php      |  4 ++--
 actions/login.php           |  2 +-
 actions/openidsettings.php  |  2 +-
 actions/othersettings.php   |  2 +-
 actions/profilesettings.php |  2 +-
 actions/register.php        |  2 +-
 actions/smssettings.php     |  8 ++++----
 actions/twittersettings.php |  4 ++--
 lib/noticeform.php          |  2 +-
 theme/base/css/display.css  | 22 +++++++++++-----------
 11 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'lib')

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;
 }
 
-- 
cgit v1.2.3-54-g00ecf