r109480 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r109479‎ | r109480 | r109481 >
Date:02:39, 19 January 2012
Author:preilly
Status:ok
Tags:
Comment:
1.18wmf: MFT r109479
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/beta_common.css (modified) (history)
  • /branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/common.css (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
@@ -54,6 +54,7 @@
5555 'OptOutTemplate',
5656 'ApplicationWmlTemplate',
5757 'ThanksNoticeTemplate',
 58+ 'SopaNoticeTemplate',
5859 );
5960
6061 foreach ( $autoloadClasses as $class ) {
@@ -200,6 +201,7 @@
201202 'mobile-frontend-login',
202203 'mobile-frontend-placeholder',
203204 'mobile-frontend-dismiss-notification',
 205+ 'mobile-frontend-sopa-notice',
204206 );
205207
206208 public $itemsToRemove = array(
@@ -676,6 +678,10 @@
677679 $this->sendApplicationVersionVaryHeader();
678680 $this->checkUserStatus();
679681 $this->checkUserLoggedIn();
 682+
 683+ if (self::$code === 'en') {
 684+ self::$displayNoticeId = 2;
 685+ }
680686
681687 if ( self::$title->isSpecial( 'Userlogin' ) && self::$isBetaGroupMember ) {
682688 self::$wsLoginToken = $wgRequest->getSessionData( 'wsLoginToken' );
@@ -1585,6 +1591,14 @@
15861592 }
15871593 }
15881594
 1595+ if ( !empty( self::$displayNoticeId ) ) {
 1596+ if ( intval( self::$displayNoticeId ) === 2 ) {
 1597+ $sopaNoticeTemplate = new SopaNoticeTemplate();
 1598+ $sopaNoticeTemplate->set( 'messages', self::$messages );
 1599+ $noticeHtml = $sopaNoticeTemplate->getHTML();
 1600+ }
 1601+ }
 1602+
15891603 // header( 'Content-Type: application/xhtml+xml; charset=utf-8' );
15901604 $searchTemplate = $this->getSearchTemplate();
15911605 $searchWebkitHtml = $searchTemplate->getHTML();
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php
@@ -74,6 +74,7 @@
7575 'mobile-frontend-login' => 'Log in',
7676 'mobile-frontend-placeholder' => 'Type your search here...',
7777 'mobile-frontend-dismiss-notification' => 'dismiss this notification',
 78+ 'mobile-frontend-sopa-notice' => '<strong>IMAGINE A WORLD WITHOUT FREE KNOWLEDGE</strong>,<br/>Right now, the U.S. Congress is considering legislation that could cripple this site<br/> and your ability to access information online. <a href="http://en.wikipedia.org/wiki/Wikipedia:SOPA_initiative/Mobile_Learn_more">Learn more</a>.',
7879 );
7980
8081 /** Message documentation (Message documentation)
@@ -4492,7 +4493,6 @@
44934494 'mobile-frontend-password' => 'Wachtwoord:',
44944495 'mobile-frontend-login' => 'Aanmelden',
44954496 'mobile-frontend-placeholder' => 'Zoeken...',
4496 - 'mobile-frontend-dismiss-notification' => 'deze melding verwijderen',
44974497 );
44984498
44994499 /** ‪Nederlands (informeel)‬ (‪Nederlands (informeel)‬)
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/common.css
@@ -287,4 +287,15 @@
288288 table td, table th {
289289 border: 1px solid #cccccc;
290290 padding: 3px;
 291+}
 292+
 293+.mwm-message.mwm-notice {
 294+ background: #FFFFFF;
 295+ font-size: 1.1em;
 296+ color: #000000;
 297+}
 298+.mwm-message.mwm-notice a {
 299+ text-decoration: underline;
 300+ font-weight: bold;
 301+ color: #000000;
291302 }
\ No newline at end of file
Index: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/beta_common.css
@@ -312,4 +312,15 @@
313313 table td, table th {
314314 border: 1px solid #cccccc;
315315 padding: 3px;
 316+}
 317+
 318+.mwm-message.mwm-notice {
 319+ background: #000000;
 320+ font-size: 1.1em;
 321+ color: #ffffff;
 322+}
 323+.mwm-message.mwm-notice a {
 324+ text-decoration: underline;
 325+ font-weight: bold;
 326+ color: #ffffff;
316327 }
\ No newline at end of file

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r109479reverse banner colorspreilly02:31, 19 January 2012

Status & tagging log