From: Waldir Pimenta Date: Sat, 25 May 2013 12:25:31 +0000 (+0100) Subject: skin: Remove the id "anonlogin" and merge pt-anonlogin with pt-login X-Git-Tag: 1.31.0-rc.0~17119^2 X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=1078e93358067a3bc47bd2b9231d00e519b819aa;p=lhc%2Fweb%2Fwiklou.git skin: Remove the id "anonlogin" and merge pt-anonlogin with pt-login This was used as an alternative id for the login link in the personal tools at the top right for ShowIPinHeader context. This seems to have been inherited since the days of the PHPTal-based skins (at least git-blame shows their presence back in Brion's rewrite of the skin in november 2004). I've asked several maintainers about this and nobody could figure out why it would need a different id. After all, whenever the user sees the login link it means they are using the wiki as an anonymous user. My best guess is that this was meant to allow the ability to style the login differently when the (anonymous) user has already made an edit (or if we init a session for other reasons). This is also what toggles the anon userlinks are shown (i.e. the links to the IP userpage and talkpage), but I see no evidence of this, and in any case it would be better to change the class of the whole personal tools div instead of changing the IDs. Change-Id: Ib3445934853db5361c3c6fecfe75623b0b921400 --- diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 18e36ba426..35183ce252 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -722,7 +722,6 @@ class SkinTemplate extends Skin { : 'login'; $is_signup = $request->getText( 'type' ) == 'signup'; - $login_id = $this->showIPinHeader() ? 'anonlogin' : 'login'; $login_url = array( 'text' => $this->msg( $loginlink )->text(), 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ), @@ -756,7 +755,7 @@ class SkinTemplate extends Skin { $personal_urls['createaccount'] = $createaccount_url; } - $personal_urls[$login_id] = $login_url; + $personal_urls['login'] = $login_url; } wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title, $this ) ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 9e68ef2c15..1c4f760b24 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3659,7 +3659,6 @@ Please try again.', 'accesskey-pt-watchlist' => 'l', # do not translate or duplicate this message to other languages 'accesskey-pt-mycontris' => 'y', # do not translate or duplicate this message to other languages 'accesskey-pt-login' => 'o', # do not translate or duplicate this message to other languages -'accesskey-pt-anonlogin' => 'o', # do not translate or duplicate this message to other languages 'accesskey-pt-logout' => '', # do not translate or duplicate this message to other languages 'accesskey-ca-talk' => 't', # do not translate or duplicate this message to other languages 'accesskey-ca-edit' => 'e', # do not translate or duplicate this message to other languages @@ -3729,7 +3728,6 @@ Please try again.', 'tooltip-pt-watchlist' => 'A list of pages you are monitoring for changes', 'tooltip-pt-mycontris' => 'A list of your contributions', 'tooltip-pt-login' => 'You are encouraged to log in; however, it is not mandatory', -'tooltip-pt-anonlogin' => 'You are encouraged to log in; however, it is not mandatory', 'tooltip-pt-logout' => 'Log out', 'tooltip-ca-talk' => 'Discussion about the content page', 'tooltip-ca-edit' => 'You can edit this page. Please use the preview button before saving', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 361bd8deca..d70de05aaa 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -1294,8 +1294,8 @@ See example: [[Special:UserLogin]]', See also: * {{msg-mw|Login}} -* {{msg-mw|Accesskey-pt-anonlogin}} -* {{msg-mw|Tooltip-pt-anonlogin}} +* {{msg-mw|Accesskey-pt-login}} +* {{msg-mw|Tooltip-pt-login}} {{Identical|Log in}}", 'nav-login-createaccount' => "Shown to anonymous users in the upper right corner of the page. When you can't create an account, the message {{msg-mw|login}} is shown. {{Identical|Log in / create account}}", @@ -7528,12 +7528,6 @@ See also: * {{msg-mw|Accesskey-pt-mycontris}} * {{msg-mw|Tooltip-pt-mycontris}}', 'tooltip-pt-login' => "Tooltip shown when hovering over the link 'Log in / create account' in the upper right corner show on all pages while not logged in.", -'tooltip-pt-anonlogin' => 'Used as tooltip for link {{msg-mw|Login}} in your personal toolbox (upper right side). - -See also: -* {{msg-mw|Login}} -* {{msg-mw|Accesskey-pt-anonlogin}} -* {{msg-mw|Tooltip-pt-anonlogin}}', 'tooltip-pt-logout' => 'Tooltip shown when hovering over the {{msg-mw|Logout}} link in your personal toolbox (upper right side). See also: diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic index ebbc22c5dd..5656d82e5a 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -478,7 +478,6 @@ andconvert andtitle anon anoneditwarning -anonlogin anonnotice anononly anonpreviewwarning diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index e0dd8eeabd..97a00a9bf2 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -32,7 +32,6 @@ $wgIgnoredMessages = array( 'accesskey-pt-watchlist', 'accesskey-pt-mycontris', 'accesskey-pt-login', - 'accesskey-pt-anonlogin', 'accesskey-pt-logout', 'accesskey-ca-talk', 'accesskey-ca-edit', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 2162d2449a..d84b563f6b 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2565,7 +2565,6 @@ $wgMessageStructure = array( 'accesskey-pt-watchlist', 'accesskey-pt-mycontris', 'accesskey-pt-login', - 'accesskey-pt-anonlogin', 'accesskey-pt-logout', 'accesskey-ca-talk', 'accesskey-ca-edit', @@ -2636,7 +2635,6 @@ $wgMessageStructure = array( 'tooltip-pt-watchlist', 'tooltip-pt-mycontris', 'tooltip-pt-login', - 'tooltip-pt-anonlogin', 'tooltip-pt-logout', 'tooltip-ca-talk', 'tooltip-ca-edit', diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index 142cb8d68b..dc5c001cf5 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -378,7 +378,7 @@ class CologneBlueTemplate extends BaseTemplate { ); $personalUrls = $this->getPersonalTools(); - foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) { + foreach ( array( 'logout', 'createaccount', 'login' ) as $key ) { if ( $personalUrls[$key] ) { $s[] = $this->makeListItem( $key, $personalUrls[$key], array( 'tag' => 'span' ) ); } @@ -419,7 +419,7 @@ class CologneBlueTemplate extends BaseTemplate { // Personal tools ("My pages") $qbmyoptions = $this->getPersonalTools(); - foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) { + foreach ( array( 'logout', 'createaccount', 'login', ) as $key ) { $qbmyoptions[$key] = null; }