https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109480
Revision: 109480
Author: preilly
Date: 2012-01-19 02:39:07 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
1.18wmf: MFT r109479
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php
branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/beta_common.css
branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/common.css
Modified:
branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php
2012-01-19 02:31:32 UTC (rev 109479)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.i18n.php
2012-01-19 02:39:07 UTC (rev 109480)
@@ -74,6 +74,7 @@
'mobile-frontend-login' => 'Log in',
'mobile-frontend-placeholder' => 'Type your search here...',
'mobile-frontend-dismiss-notification' => 'dismiss this notification',
+ '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>.',
);
/** Message documentation (Message documentation)
@@ -4492,7 +4493,6 @@
'mobile-frontend-password' => 'Wachtwoord:',
'mobile-frontend-login' => 'Aanmelden',
'mobile-frontend-placeholder' => 'Zoeken...',
- 'mobile-frontend-dismiss-notification' => 'deze melding verwijderen',
);
/** Nederlands (informeel) (Nederlands (informeel))
Modified: branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
2012-01-19 02:31:32 UTC (rev 109479)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/MobileFrontend.php
2012-01-19 02:39:07 UTC (rev 109480)
@@ -54,6 +54,7 @@
'OptOutTemplate',
'ApplicationWmlTemplate',
'ThanksNoticeTemplate',
+ 'SopaNoticeTemplate',
);
foreach ( $autoloadClasses as $class ) {
@@ -200,6 +201,7 @@
'mobile-frontend-login',
'mobile-frontend-placeholder',
'mobile-frontend-dismiss-notification',
+ 'mobile-frontend-sopa-notice',
);
public $itemsToRemove = array(
@@ -676,6 +678,10 @@
$this->sendApplicationVersionVaryHeader();
$this->checkUserStatus();
$this->checkUserLoggedIn();
+
+ if (self::$code === 'en') {
+ self::$displayNoticeId = 2;
+ }
if ( self::$title->isSpecial( 'Userlogin' ) &&
self::$isBetaGroupMember ) {
self::$wsLoginToken = $wgRequest->getSessionData(
'wsLoginToken' );
@@ -1585,6 +1591,14 @@
}
}
+ if ( !empty( self::$displayNoticeId ) ) {
+ if ( intval( self::$displayNoticeId ) === 2 ) {
+ $sopaNoticeTemplate = new
SopaNoticeTemplate();
+ $sopaNoticeTemplate->set( 'messages',
self::$messages );
+ $noticeHtml =
$sopaNoticeTemplate->getHTML();
+ }
+ }
+
// header( 'Content-Type: application/xhtml+xml;
charset=utf-8' );
$searchTemplate = $this->getSearchTemplate();
$searchWebkitHtml = $searchTemplate->getHTML();
Modified:
branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/beta_common.css
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/beta_common.css
2012-01-19 02:31:32 UTC (rev 109479)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/beta_common.css
2012-01-19 02:39:07 UTC (rev 109480)
@@ -312,4 +312,15 @@
table td, table th {
border: 1px solid #cccccc;
padding: 3px;
+}
+
+.mwm-message.mwm-notice {
+ background: #000000;
+ font-size: 1.1em;
+ color: #ffffff;
+}
+.mwm-message.mwm-notice a {
+ text-decoration: underline;
+ font-weight: bold;
+ color: #ffffff;
}
\ No newline at end of file
Modified: branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/common.css
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/common.css
2012-01-19 02:31:32 UTC (rev 109479)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/stylesheets/common.css
2012-01-19 02:39:07 UTC (rev 109480)
@@ -287,4 +287,15 @@
table td, table th {
border: 1px solid #cccccc;
padding: 3px;
+}
+
+.mwm-message.mwm-notice {
+ background: #FFFFFF;
+ font-size: 1.1em;
+ color: #000000;
+}
+.mwm-message.mwm-notice a {
+ text-decoration: underline;
+ font-weight: bold;
+ color: #000000;
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
