Tpt has uploaded a new change for review. https://gerrit.wikimedia.org/r/132800
Change subject: Make sure that the scan image is displayed in a nice way in mobile skin ...................................................................... Make sure that the scan image is displayed in a nice way in mobile skin Depends on I26efe50af621d136b854f7efe3bb98c380164405 in MobileFrontend bug 65165 Change-Id: I0f9c9caeada27dddfc4fa0565fa814e19c6fbbf5 --- M ProofreadPage.body.php M ProofreadPage.php M includes/page/ProofreadPageViewAction.php A modules/page/ext.proofreadpage.page.edit.mobile.js A modules/page/ext.proofreadpage.page.mobile.css 5 files changed, 46 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/00/132800/1 diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php index b819fc2..1d307c3 100644 --- a/ProofreadPage.body.php +++ b/ProofreadPage.body.php @@ -929,4 +929,10 @@ return $title->getLinkUrl( 'action=edit&redlink=1' ); } } + + public static function onSkinMinervaDefaultModules( Skin $skin, array &$modules ) { + $modules['editor'] = array( 'ext.proofreadpage.page.mobile.edit' ); + + return true; + } } diff --git a/ProofreadPage.php b/ProofreadPage.php index ee108c3..b5cf251 100644 --- a/ProofreadPage.php +++ b/ProofreadPage.php @@ -135,6 +135,11 @@ 'styles' => 'page/ext.proofreadpage.page.css', 'dependencies' => array( 'ext.proofreadpage.base' ) ), + 'ext.proofreadpage.page.mobile' => $prpResourceTemplate + array( + 'styles' => 'page/ext.proofreadpage.page.mobile.css', + 'dependencies' => array( 'ext.proofreadpage.base' ), + 'targets' => array ( 'mobile' ) + ), 'ext.proofreadpage.page.edit' => $prpResourceTemplate + array( 'styles' => 'page/ext.proofreadpage.page.edit.css', 'scripts' => 'page/ext.proofreadpage.page.edit.js', @@ -155,6 +160,11 @@ 'proofreadpage-button-toggle-layout-label', 'proofreadpage-preferences-showheaders-label', ) + ), + 'ext.proofreadpage.page.mobile.edit' => $prpResourceTemplate + array( + 'scripts' => array( 'page/ext.proofreadpage.page.edit.mobile.js', ), + 'dependencies' => array( 'mobile.editor' ), + 'targets' => array ( 'mobile' ) ), 'ext.proofreadpage.page.navigation' => $prpResourceTemplate + array( 'scripts' => 'page/ext.proofreadpage.page.navigation.js', @@ -196,6 +206,7 @@ $wgHooks['EditFormPreloadText'][] = 'ProofreadPage::onEditFormPreloadText'; $wgHooks['ParserTestTables'][] = 'ProofreadPage::onParserTestTables'; $wgHooks['InfoAction'][] = 'ProofreadPage::onInfoAction'; +$wgHooks['SkinMinervaDefaultModules'][] = 'ProofreadPage::onSkinMinervaDefaultModules'; diff --git a/includes/page/ProofreadPageViewAction.php b/includes/page/ProofreadPageViewAction.php index efb5aba..e9f67f4 100644 --- a/includes/page/ProofreadPageViewAction.php +++ b/includes/page/ProofreadPageViewAction.php @@ -59,11 +59,10 @@ $out->addModules( 'ext.proofreadpage.page' ); $out->addModuleStyles( array( 'ext.proofreadpage.base', - 'ext.proofreadpage.page' + 'ext.proofreadpage.page', + 'ext.proofreadpage.page.mobile' ) ); - $out->addJsConfigVars( array( - 'prpPageQuality' => $content->getLevel()->getLevel() - ) ); + $out->addJsConfigVars( 'prpPageQuality', $content->getLevel()->getLevel() ); //custom CSS $css = $page->getCustomCss(); diff --git a/modules/page/ext.proofreadpage.page.edit.mobile.js b/modules/page/ext.proofreadpage.page.edit.mobile.js new file mode 100644 index 0000000..6b46cb5 --- /dev/null +++ b/modules/page/ext.proofreadpage.page.edit.mobile.js @@ -0,0 +1,17 @@ +( function( M, $ ) { + "use strict"; + + function toggleImage( overlay ) { + overlay.$( 'textarea' ).toggle(); + } + + M.on( 'editor.postRender', function( overlay ) { + var $container = $( '<li>' ).appendTo( overlay.$( '.overlay-header ul' ).eq( 0 ) ); + $( '<button>' ).text( 'View' ).on( 'click', function() { + toggleImage( overlay ); + } ).appendTo( $container ); + + var $scanImage = $('.prp-page-image').clone(); + $scanImage.insertAfter( overlay.$( '.content' ) ); + } ); +} ( mw.mobileFrontend, jQuery ) ); \ No newline at end of file diff --git a/modules/page/ext.proofreadpage.page.mobile.css b/modules/page/ext.proofreadpage.page.mobile.css new file mode 100644 index 0000000..45c23c9 --- /dev/null +++ b/modules/page/ext.proofreadpage.page.mobile.css @@ -0,0 +1,9 @@ +.prp-page-image img { + width: 100%; + height: auto; +} + +#prp-page-qualityheader { + width: 100%; + height: auto; +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/132800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f9c9caeada27dddfc4fa0565fa814e19c6fbbf5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Tpt <thoma...@hotmail.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits