http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94303
Revision: 94303
Author: preilly
Date: 2011-08-11 23:40:10 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
fix for Bug 29520 - Ability to turn off images on mobile and wap-mobile page
views
Modified Paths:
--------------
trunk/extensions/MobileFrontend/MobileFrontend.i18n.php
trunk/extensions/MobileFrontend/MobileFrontend.php
trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
Modified: trunk/extensions/MobileFrontend/MobileFrontend.i18n.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.i18n.php 2011-08-11
23:24:09 UTC (rev 94302)
+++ trunk/extensions/MobileFrontend/MobileFrontend.i18n.php 2011-08-11
23:40:10 UTC (rev 94303)
@@ -54,6 +54,7 @@
'mobile-frontend-opt-out-no-button' => 'no',
'mobile-frontend-opt-out-title' => 'Opt-Out of Testing',
'mobile-frontend-opt-out-explain' => 'This allows you to leave the
test',
+ 'mobile-frontend-disable-images' => 'Disable images on mobile site',
);
/** Moroccan Spoken Arabic (Maġribi) */
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-11 23:24:09 UTC
(rev 94302)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-11 23:40:10 UTC
(rev 94303)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.18';
+ const VERSION = '0.5.19';
/**
* @var DOMDocument
@@ -153,6 +153,7 @@
self::$messages['mobile-frontend-opt-out-title']
= wfMsg( 'mobile-frontend-opt-out-title' );
self::$messages['mobile-frontend-opt-in-explain']
= wfMsg( 'mobile-frontend-opt-in-explain' );
self::$messages['mobile-frontend-opt-out-explain']
= wfMsg( 'mobile-frontend-opt-out-explain' );
+ self::$messages['mobile-frontend-disable-images']
= wfMsg( 'mobile-frontend-disable-images' );
self::$dir = $wgContLang->getDir();
self::$code = $wgContLang->getCode();
@@ -208,6 +209,18 @@
$mAction = $wgRequest->getText( 'mAction' );
$action = $wgRequest->getText( 'action' );
self::$disableImages = $wgRequest->getText( 'disableImages', 0
);
+
+ if ( self::$disableImages == 1 ) {
+ $wgRequest->response()->setcookie( 'disableImages', 1 );
+ }
+
+ if ( self::$disableImages == 0 ) {
+ $disableImages = $wgRequest->getCookie( 'disableImages'
);
+ if ( $disableImages ) {
+ self::$disableImages = $disableImages;
+ }
+ }
+
self::$useFormat = $wgRequest->getText( 'useFormat' );
self::$format = $wgRequest->getText( 'format' );
self::$requestedSegment = $wgRequest->getText( 'seg', 0 );
@@ -352,7 +365,8 @@
$noButton =
self::$messages['mobile-frontend-opt-in-no-button'];
$htmlTitle =
self::$messages['mobile-frontend-opt-in-title'];
$explainOptIn =
self::$messages['mobile-frontend-opt-in-explain'];
- $optInMessage =
self::$messages['mobile-frontend-opt-in-message'];
+ $disableImages =
self::$messages['mobile-frontend-disable-images'];
+ $optInMessage =
self::$messages['mobile-frontend-opt-in-message'];
$cssFileName = ( isset( self::$device['css_file_name'] ) ) ?
self::$device['css_file_name'] : 'default';
require( 'views/layout/_search_webkit.html.php' );
require( 'views/layout/_footmenu_default.html.php' );
@@ -378,7 +392,8 @@
$noButton =
self::$messages['mobile-frontend-opt-out-no-button'];
$htmlTitle =
self::$messages['mobile-frontend-opt-out-title'];
$explainOptOut =
self::$messages['mobile-frontend-opt-out-explain'];
- $optOutMessage =
self::$messages['mobile-frontend-opt-out-message'];
+ $optOutMessage =
self::$messages['mobile-frontend-opt-out-message'];
+ $disableImages =
self::$messages['mobile-frontend-disable-images'];
$cssFileName = ( isset( self::$device['css_file_name'] ) ) ?
self::$device['css_file_name'] : 'default';
require( 'views/layout/_search_webkit.html.php' );
require( 'views/layout/_footmenu_default.html.php' );
@@ -395,15 +410,16 @@
$this->getMsg();
$dir = self::$dir;
$code = self::$code;
- $regularSite =
self::$messages['mobile-frontend-regular-site'];
- $permStopRedirect =
self::$messages['mobile-frontend-perm-stop-redirect'];
- $copyright =
self::$messages['mobile-frontend-copyright'];
- $homeButton =
self::$messages['mobile-frontend-home-button'];
- $randomButton =
self::$messages['mobile-frontend-random-button'];
- $areYouSure =
self::$messages['mobile-frontend-are-you-sure'];
- $explainDisable =
self::$messages['mobile-frontend-explain-disable'];
- $disableButton =
self::$messages['mobile-frontend-disable-button'];
- $backButton =
self::$messages['mobile-frontend-back-button'];
+ $regularSite =
self::$messages['mobile-frontend-regular-site'];
+ $permStopRedirect =
self::$messages['mobile-frontend-perm-stop-redirect'];
+ $copyright =
self::$messages['mobile-frontend-copyright'];
+ $homeButton =
self::$messages['mobile-frontend-home-button'];
+ $randomButton =
self::$messages['mobile-frontend-random-button'];
+ $areYouSure =
self::$messages['mobile-frontend-are-you-sure'];
+ $explainDisable =
self::$messages['mobile-frontend-explain-disable'];
+ $disableButton =
self::$messages['mobile-frontend-disable-button'];
+ $backButton =
self::$messages['mobile-frontend-back-button'];
+ $disableImages =
self::$messages['mobile-frontend-disable-images'];
$htmlTitle = $areYouSure;
$title = $areYouSure;
$cssFileName = ( isset( self::$device['css_file_name']
) ) ? self::$device['css_file_name'] : 'default';
@@ -637,6 +653,7 @@
$copyright = self::$messages['mobile-frontend-copyright'];
$homeButton = self::$messages['mobile-frontend-home-button'];
$randomButton =
self::$messages['mobile-frontend-random-button'];
+ $disableImages =
self::$messages['mobile-frontend-disable-images'];
$title = htmlspecialchars( self::$title->getText() );
$htmlTitle = htmlspecialchars( self::$htmlTitle );
Modified:
trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
===================================================================
--- trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
2011-08-11 23:24:09 UTC (rev 94302)
+++ trunk/extensions/MobileFrontend/views/layout/_footmenu_default.html.php
2011-08-11 23:40:10 UTC (rev 94303)
@@ -4,7 +4,7 @@
<div id='footer'>
<div class='nav' id='footmenu'>
<div class='mwm-notice'>
- <a href="?mAction=view_normal_site">{$regularSite}</a>
+ <a href="?mAction=view_normal_site">{$regularSite}</a> | <a
href="?disableImages=1">{$disableImages}</a>
<div id="perm">
<a href="?mAction=disable_mobile_site">{$permStopRedirect}</a>
</div>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
