diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-19 12:28:45 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-19 12:28:45 +0000 |
| commit | 264ab53953d529680cea4df31ed125710bb26988 (patch) | |
| tree | f31c6addf124ff4b1fdfab587d9ddc05b5f19477 /lib/action.php | |
| parent | f2b06b8bbd56ce94d7b46ffcec36e2be3f260fe9 (diff) | |
| parent | 838502dfd9894e409714c512f83179bab68446d7 (diff) | |
Merge branch 'uiredesign' of /var/www/trunk into uiredesign
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 29 |
1 files changed, 18 insertions, 11 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')), |