Merge branch 'uiredesign' of /var/www/trunk into uiredesign

3 files changed, 32 insertions, 13 deletions

diff --git a/lib/action.php b/lib/action.php
index 89c7d5d7b..812eee0e5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -134,11 +134,13 @@ 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.
                 $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]');
             }
         }
     }
@@ -242,25 +244,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');
@@ -439,7 +445,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')),
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index d0c3b1832..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
      *
@@ -125,7 +137,7 @@ class DisfavorForm extends Form
     function formActions()
     {
         $this->out->submit('disfavor-submit-' . $this->notice->id,
-                           _('Disfavor favorite'));
+                           _('Disfavor favorite'), 'submit', null, _('Disfavor this notice'));
     }
     
     /**
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));