https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114004
Revision: 114004
Author: zaran
Date: 2012-03-16 09:08:19 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
Bug 34942 - Add a show Headers preference. Apply ThomasPT's patch
Modified Paths:
--------------
trunk/extensions/ProofreadPage/ProofreadPage.i18n.php
trunk/extensions/ProofreadPage/ProofreadPage.php
trunk/extensions/ProofreadPage/ProofreadPage_body.php
trunk/extensions/ProofreadPage/proofread.js
Modified: trunk/extensions/ProofreadPage/ProofreadPage.i18n.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage.i18n.php 2012-03-16
07:24:46 UTC (rev 114003)
+++ trunk/extensions/ProofreadPage/ProofreadPage.i18n.php 2012-03-16
09:08:19 UTC (rev 114004)
@@ -73,7 +73,8 @@
'proofreadpage-button-zoom-out-label' => 'Zoom out',
'proofreadpage-button-reset-zoom-label' => 'Original size',
'proofreadpage-button-zoom-in-label' => 'Zoom in',
- 'proofreadpage-button-toggle-layout-label' => 'Vertical/horizontal
layout'
+ 'proofreadpage-button-toggle-layout-label' => 'Vertical/horizontal
layout',
+ 'proofreadpage-preferences-showheaders-label' => 'Show header and
footer fields when editing in the Page namespace'
);
/** Message documentation (Message documentation)
@@ -139,6 +140,7 @@
'proofreadpage-button-zoom-out-label' => 'Tooltip text in button for
zoom out, only visible in edit mode.',
'proofreadpage-button-zoom-in-label' => 'Tooltip text in button for
zoom in, only visible in edit mode.',
'proofreadpage-button-toggle-layout-label' => 'Tooltip text in button
for horizontal or vertical layout toggle, only visible in edit mode.',
+ 'proofreadpage-preferences-showheaders-label' => 'Description of the
checkbox preference to show/hide the header and footer fields in the edit form
of the Page namespace.'
);
/** زَوُن ( زَوُن)
Modified: trunk/extensions/ProofreadPage/ProofreadPage.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage.php 2012-03-16 07:24:46 UTC
(rev 114003)
+++ trunk/extensions/ProofreadPage/ProofreadPage.php 2012-03-16 09:08:19 UTC
(rev 114004)
@@ -83,6 +83,7 @@
'proofreadpage-button-reset-zoom-label',
'proofreadpage-button-zoom-in-label',
'proofreadpage-button-toggle-layout-label',
+ 'proofreadpage-preferences-showheaders-label',
)
),
'ext.proofreadpage.article' => $prpResourceTemplate + array(
@@ -107,3 +108,4 @@
$wgHooks['EditPage::importFormData'][] =
'ProofreadPage::onEditPageImportFormData';
$wgHooks['OutputPageParserOutput'][] =
'ProofreadPage::onOutputPageParserOutput';
$wgHooks['wgQueryPages'][] = 'ProofreadPage::onwgQueryPages';
+$wgHooks['GetPreferences'][] = 'ProofreadPage::onGetPreferences';
Modified: trunk/extensions/ProofreadPage/ProofreadPage_body.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage_body.php 2012-03-16
07:24:46 UTC (rev 114003)
+++ trunk/extensions/ProofreadPage/ProofreadPage_body.php 2012-03-16
09:08:19 UTC (rev 114004)
@@ -1644,4 +1644,18 @@
return true;
}
+ /**
+ * Add ProofreadPage preferences to the preferences menu
+ */
+ public static function onGetPreferences( $user, &$preferences ) {
+
+ //Show header and footer fields when editing in the Page
namespace
+ $preferences['proofreadpage-showheaders'] = array(
+ 'type' => 'toggle',
+ 'label-message' =>
'proofreadpage-preferences-showheaders-label',
+ 'section' => 'editing/advancedediting',
+ );
+
+ return true;
+ }
}
Modified: trunk/extensions/ProofreadPage/proofread.js
===================================================================
--- trunk/extensions/ProofreadPage/proofread.js 2012-03-16 07:24:46 UTC (rev
114003)
+++ trunk/extensions/ProofreadPage/proofread.js 2012-03-16 09:08:19 UTC (rev
114004)
@@ -754,10 +754,10 @@
pr_make_edit_area( self.text_container, text.value );
f.insertBefore( table, text.nextSibling ); // Inserts table
after text
f.removeChild( text );
- if ( !self.proofreadpage_show_headers ) {
- hookEvent( 'load', pr_toggle_visibility );
+ if ( mw.user.options.get( 'proofreadpage-showheaders' ) ) {
+ hookEvent( 'load', pr_reset_size );
} else {
- hookEvent( 'load', pr_reset_size );
+ hookEvent( 'load', pr_toggle_visibility );
}
} else {
var new_text = f.removeChild( text );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
