X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=5987abf3c35dfe2fd28e01fae01ea0919221614d;hb=b7bf1f87f31dac025875e3ff1e656a077dafe2b3;hp=89c7d5d7b8080c559a88fb15c9dcb4d4b9e7f948;hpb=2ca56c0bc6a4f503ebf4444f1da1c7c8c400d8aa;p=quix0rs-gnu-social.git

diff --git a/lib/action.php b/lib/action.php
index 89c7d5d7b8..5987abf3c3 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 profile and friends timeline'), false, 'nav_home');
         }
-        $this->menuItem(common_local_url('peoplesearch'), _('Search'));
+        $this->menuItem(common_local_url('peoplesearch'),
+                        _('Search'), _('Search for people or text'), false, 'nav_search');
         if ($user) {
             $this->menuItem(common_local_url('profilesettings'),
-                            _('Account'));
+                            _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
             $this->menuItem(common_local_url('imsettings'),
-                            _('Connect'));
+                            _('Connect'), _('Connect to IM, SMS, Twitter'), 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');
@@ -295,15 +301,20 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->showLocalNavBlock();
+        $this->showContentBlock();
+        $this->showAside();
+        $this->elementEnd('div');
+    }
+
+    function showLocalNavBlock()
+    {
         $this->elementStart('dl', array('id' => 'site_nav_local_views'));
         $this->element('dt', null, _('Local views'));
         $this->elementStart('dd');
         $this->showLocalNav();
         $this->elementEnd('dd');
         $this->elementEnd('dl');
-        $this->showContentBlock();
-        $this->showAside();
-        $this->elementEnd('div');
     }
 
     // SHOULD overload
@@ -439,7 +450,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')),