X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=3ef9ffa3c86aa6b5c2a09fef127e3dfcc75bf03d;hb=b7d07466943a73e1c009467c8daa6e499810080f;hp=c01a686904b5dc0e0489192514d0703bdf5c04ec;hpb=39cf147a77f2d53bd53885716c44b7e4951d0e45;p=quix0rs-gnu-social.git diff --git a/lib/action.php b/lib/action.php index c01a686904..3ef9ffa3c8 100644 --- a/lib/action.php +++ b/lib/action.php @@ -111,6 +111,19 @@ class Action extends HTMLOutputter // lawsuit } } + function endHTML() + { + global $_startTime; + + if (isset($_startTime)) { + $endTime = microtime(true); + $diff = round(($endTime - $_startTime) * 1000); + $this->raw(""); + } + + return parent::endHTML(); + } + /** * Show head, a template method. * @@ -300,11 +313,11 @@ class Action extends HTMLOutputter // lawsuit * events and appending to the array. Try to avoid adding strings that won't be used, as * they'll be added to HTML output. */ - + function showScriptMessages() { $messages = array(); - + if (Event::handle('StartScriptMessages', array($this, &$messages))) { // Common messages needed for timeline views etc... @@ -312,14 +325,14 @@ class Action extends HTMLOutputter // lawsuit $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more'); $messages = array_merge($messages, $this->getScriptMessages()); - + Event::handle('EndScriptMessages', array($this, &$messages)); } - + if (!empty($messages)) { $this->inlineScript('SN.messages=' . json_encode($messages)); } - + return $messages; } @@ -476,9 +489,13 @@ class Action extends HTMLOutputter // lawsuit $user = User::singleUser(); $url = common_local_url('showstream', array('nickname' => $user->nickname)); + } else if (common_logged_in()) { + $cur = common_current_user(); + $url = common_local_url('all', array('nickname' => $cur->nickname)); } else { $url = common_local_url('public'); } + $this->elementStart('a', array('class' => 'url home bookmark', 'href' => $url)); @@ -513,6 +530,7 @@ class Action extends HTMLOutputter // lawsuit $this->text(' '); $this->element('span', array('class' => 'fn org'), common_config('site', 'name')); $this->elementEnd('a'); + Event::handle('EndAddressData', array($this)); } $this->elementEnd('address'); @@ -529,71 +547,62 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('ul', array('class' => 'nav', 'id' => 'site_nav_global_primary')); if (Event::handle('StartPrimaryNav', array($this))) { - if ($user) { - // TRANS: Tooltip for main menu option "Personal" - $tooltip = _m('TOOLTIP', 'Personal profile and friends timeline'); - $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)), - // TRANS: Main menu option when logged in for access to personal profile and friends timeline - _m('MENU', 'Personal'), $tooltip, false, 'nav_home'); - // TRANS: Tooltip for main menu option "Account" - $tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile'); + if (!empty($user)) { + $this->menuItem(common_local_url('all', + array('nickname' => $user->nickname)), + _m('Home'), + _m('Friends timeline'), + false, + 'nav_home'); + $this->menuItem(common_local_url('showstream', + array('nickname' => $user->nickname)), + _m('Profile'), + _m('Your profile'), + false, + 'nav_profile'); + $this->menuItem(common_local_url('public'), + _m('Public'), + _m('Everyone on this site'), + false, + 'nav_public'); $this->menuItem(common_local_url('profilesettings'), - // TRANS: Main menu option when logged in for access to user settings - _('Account'), $tooltip, false, 'nav_account'); - // TRANS: Tooltip for main menu option "Services" - $tooltip = _m('TOOLTIP', 'Connect to services'); - $this->menuItem(common_local_url('oauthconnectionssettings'), - // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services - _('Connect'), $tooltip, false, 'nav_connect'); + _m('Settings'), + _m('Change your personal settings'), + false, + 'nav_account'); if ($user->hasRight(Right::CONFIGURESITE)) { - // TRANS: Tooltip for menu option "Admin" - $tooltip = _m('TOOLTIP', 'Change site configuration'); $this->menuItem(common_local_url('siteadminpanel'), - // TRANS: Main menu option when logged in and site admin for access to site configuration - _m('MENU', 'Admin'), $tooltip, false, 'nav_admin'); - } - if (common_config('invite', 'enabled')) { - // TRANS: Tooltip for main menu option "Invite" - $tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s'); - $this->menuItem(common_local_url('invite'), - // TRANS: Main menu option when logged in and invitations are allowed for inviting new users - _m('MENU', 'Invite'), - sprintf($tooltip, - common_config('site', 'name')), - false, 'nav_invitecontact'); + _m('Admin'), + _m('Site configuration'), + false, + 'nav_admin'); } - // TRANS: Tooltip for main menu option "Logout" - $tooltip = _m('TOOLTIP', 'Logout from the site'); $this->menuItem(common_local_url('logout'), - // TRANS: Main menu option when logged in to log out the current user - _m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); - } - else { - if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) { - // TRANS: Tooltip for main menu option "Register" - $tooltip = _m('TOOLTIP', 'Create an account'); - $this->menuItem(common_local_url('register'), - // TRANS: Main menu option when not logged in to register a new account - _m('MENU', 'Register'), $tooltip, false, 'nav_register'); - } - // TRANS: Tooltip for main menu option "Login" - $tooltip = _m('TOOLTIP', 'Login to the site'); + _m('Logout'), + _m('Logout from the site'), + false, + 'nav_logout'); + } else { + $this->menuItem(common_local_url('public'), + _m('Public'), + _m('Everyone on this site'), + false, + 'nav_public'); $this->menuItem(common_local_url('login'), - // TRANS: Main menu option when not logged in to log in - _m('MENU', 'Login'), $tooltip, false, 'nav_login'); + _m('Login'), + _m('Login to the site'), + false, + 'nav_login'); } - // TRANS: Tooltip for main menu option "Help" - $tooltip = _m('TOOLTIP', 'Help me!'); - $this->menuItem(common_local_url('doc', array('title' => 'help')), - // TRANS: Main menu option for help on the StatusNet site - _m('MENU', 'Help'), $tooltip, false, 'nav_help'); - if ($user || !common_config('site', 'private')) { - // TRANS: Tooltip for main menu option "Search" - $tooltip = _m('TOOLTIP', 'Search for people or text'); - $this->menuItem(common_local_url('peoplesearch'), - // TRANS: Main menu option when logged in or when the StatusNet instance is not private - _m('MENU', 'Search'), $tooltip, false, 'nav_search'); + + if (!empty($user) || !common_config('site', 'private')) { + $this->menuItem(common_local_url('noticesearch'), + _m('Search'), + _m('Search the site'), + false, + 'nav_search'); } + Event::handle('EndPrimaryNav', array($this)); } $this->elementEnd('ul'); @@ -826,8 +835,11 @@ class Action extends HTMLOutputter // lawsuit function showFooter() { $this->elementStart('div', array('id' => 'footer')); - $this->showSecondaryNav(); - $this->showLicenses(); + if (Event::handle('StartShowInsideFooter', array($this))) { + $this->showSecondaryNav(); + $this->showLicenses(); + Event::handle('EndShowInsideFooter', array($this)); + } $this->elementEnd('div'); }