[MediaWiki-commits] [Gerrit] + Disable mobile editing of Page: and Index: namespaces - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/203549

Change subject: + Disable mobile editing of Page: and Index: namespaces
..

+ Disable mobile editing of Page: and Index: namespaces

Bug: T95724
Change-Id: I5adc493c64f75b185c93c4080538b5de0c2c3ca9
---
M ProofreadPage.body.php
M ProofreadPage.php
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/49/203549/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 83714af..e313326 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -844,4 +844,15 @@
return $title->getLinkUrl( 'action=edit&redlink=1' );
}
}
+
+   public static function onSkinMinervaDefaultModules( Skin $skin, array& 
$modules ) {
+   if(
+   $skin->getTitle()->inNamespace( 
self::getIndexNamespaceId() ) ||
+   $skin->getTitle()->inNamespace( 
self::getPageNamespaceId() )
+   ) {
+   $modules['editor'] = array();
+   }
+
+   return true;
+   }
 }
diff --git a/ProofreadPage.php b/ProofreadPage.php
index 2ac7c84..c181961 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -224,6 +224,7 @@
 $wgHooks['EditFormPreloadText'][] = 'ProofreadPage::onEditFormPreloadText';
 $wgHooks['ParserTestTables'][] = 'ProofreadPage::onParserTestTables';
 $wgHooks['InfoAction'][] = 'ProofreadPage::onInfoAction';
+$wgHooks['SkinMinervaDefaultModules'][] = 
'ProofreadPage::onSkinMinervaDefaultModules';
 
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/203549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5adc493c64f75b185c93c4080538b5de0c2c3ca9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improves the range checking of tag - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/235455

Change subject: Improves the range checking of  tag
..

Improves the range checking of  tag

More readable code

Bug: T111035
Change-Id: I84d746b74635e3aea85da33a268cec3c6342d64c
---
M includes/Parser/PagesTagParser.php
M tests/parser/proofreadpage_pages.txt
2 files changed, 24 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/55/235455/1

diff --git a/includes/Parser/PagesTagParser.php 
b/includes/Parser/PagesTagParser.php
index 1f5fd18..4fe4620 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -109,7 +109,7 @@
return $this->formatError( 
'proofreadpage_number_expected' );
}
 
-   if( ($from > $to) || ($from < 1) || 
($to < 1 ) || ($to > $count) ) {
+   if( !( 1 <= $from && $from <= $to && 
$to <= $count ) ) {
return $this->formatError( 
'proofreadpage_invalid_interval' );
}
 
@@ -132,7 +132,7 @@
}
 
ksort( $pagenums ); //we must sort the array 
even if the numerical keys are in a good order.
-   if( reset( $pagenums ) > $count ) {
+   if( end( $pagenums ) > $count ) {
return $this->formatError( 
'proofreadpage_invalid_interval' );
}
 
diff --git a/tests/parser/proofreadpage_pages.txt 
b/tests/parser/proofreadpage_pages.txt
index 2c2fcd8..0640e3e 100644
--- a/tests/parser/proofreadpage_pages.txt
+++ b/tests/parser/proofreadpage_pages.txt
@@ -262,6 +262,28 @@
 !! end
 
 !! test
+pages: with file: Invalid range
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
+pages: with file: Invalid include
+!! options
+djvu
+!! wikitext
+
+!! html
+Error: Invalid interval
+
+!! end
+
+!! test
 pages: with file: Simple transclusion without to
 !! options
 djvu

-- 
To view, visit https://gerrit.wikimedia.org/r/235455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d746b74635e3aea85da33a268cec3c6342d64c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix style issues in Special:IndexPages - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222848

Change subject: Fix style issues in Special:IndexPages
..

Fix style issues in Special:IndexPages

Makes its HTML valid

Bug: T76284
Change-Id: Id397e1bdf1c126344b84a47b8a74432b53aa38e4
---
M SpecialProofreadPages.php
M modules/special/indexpages/ext.proofreadpage.special.indexpages.css
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/48/222848/1

diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php
index 0b0f3c7..85c93f7 100644
--- a/SpecialProofreadPages.php
+++ b/SpecialProofreadPages.php
@@ -214,7 +214,7 @@
$dirmark = $this->getLanguage()->getDirMark();
$pages = $this->msg( 'proofreadpage_pages', $size )->numParams( 
$size )->text();
 
-   return "{$plink} 
{$dirmark}[$pages]{$qualityOutput}";
+   return "{$plink} 
{$dirmark}[$pages]{$qualityOutput}";
}
 
protected function getGroupName() {
diff --git 
a/modules/special/indexpages/ext.proofreadpage.special.indexpages.css 
b/modules/special/indexpages/ext.proofreadpage.special.indexpages.css
index 0b1e2f6..1ce5928 100644
--- a/modules/special/indexpages/ext.proofreadpage.special.indexpages.css
+++ b/modules/special/indexpages/ext.proofreadpage.special.indexpages.css
@@ -1,9 +1,13 @@
 .prp-indexpages-row {
-   display: table;
+   display: inline-table;
border-spacing: 10px 0;
white-space: nowrap;
 }
 
+.prp-indexpages-row > div {
+   display: table-cell;
+}
+
 .prp-indexpages-row > span {
display: table-cell;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/222848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id397e1bdf1c126344b84a47b8a74432b53aa38e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Makes api prop=proofread pass context to its subrequest - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222849

Change subject: Makes api prop=proofread pass context to its subrequest
..

Makes api prop=proofread pass context to its subrequest

Bug: T91912
Change-Id: Iaee21d1da0e4c7e6bf1d3c5cda5b3e9b5f95788b
---
M ApiQueryProofread.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/49/222849/1

diff --git a/ApiQueryProofread.php b/ApiQueryProofread.php
index b5021ea..007ca3a 100644
--- a/ApiQueryProofread.php
+++ b/ApiQueryProofread.php
@@ -54,7 +54,7 @@
$qualityLevels = array_flip( $qualityCategories );
 
//  johnduhart, it'd seem sane rather than duplicating 
the functionality
-   $params = new FauxRequest( array(
+   $params = new DerivativeRequest( $this->getRequest(), array(
'action' => 'query',
'prop' => 'categories',
'pageids' => implode( '|', $pageIds ),

-- 
To view, visit https://gerrit.wikimedia.org/r/222849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaee21d1da0e4c7e6bf1d3c5cda5b3e9b5f95788b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adds Page: pages scan image to imagelinks - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222858

Change subject: Adds Page: pages scan image to imagelinks
..

Adds Page: pages scan image to imagelinks

Bug: T97613
Change-Id: Ie306b921e342963a3cf8339592b4057c704ec214
---
M includes/page/PageContent.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/58/222858/1

diff --git a/includes/page/PageContent.php b/includes/page/PageContent.php
index 6d92bc9..2d2dee4 100644
--- a/includes/page/PageContent.php
+++ b/includes/page/PageContent.php
@@ -251,6 +251,9 @@
//add modules
$parserOutput->addModuleStyles( 'ext.proofreadpage.base' );
 
+   //add scan image to dependencies
+   $parserOutput->addImage( strtok( $title->getDBkey(), '/' ) );
+
return $parserOutput;
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/222858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie306b921e342963a3cf8339592b4057c704ec214
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don’t use 0 as proofreading level for edits from unallowed u... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/107597


Change subject: Don’t use 0 as proofreading level for edits from unallowed users
..

Don’t use 0 as proofreading level for edits from unallowed users

Bug: 60033
Change-Id: I7a57ad9f97f4cf262940a14f8383f95620c7e9f4
---
M includes/page/EditProofreadPagePage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/97/107597/1

diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
index e259747..449647b 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -227,8 +227,8 @@
 * @see EditPage::importContentFormData
 */
protected function importContentFormData( &$request ) {
-   $proofreadingLevel = $request->getInt( 'wpQuality' );
$oldLevel = $this->getCurrentContent()->getLevel();
+   $proofreadingLevel = $request->getInt( 'wpQuality', 
$oldLevel->getLevel() );
$user = ( $oldLevel->getLevel() === $proofreadingLevel )
? $oldLevel->getUser()
: $this->mArticle->getContext()->getUser();

-- 
To view, visit https://gerrit.wikimedia.org/r/107597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a57ad9f97f4cf262940a14f8383f95620c7e9f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Introduce Context - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/108678


Change subject: Introduce Context
..

Introduce Context

Change-Id: I0f3d6c07cd26344a8c566f5bd71fe21ff65e0d5b
---
M ProofreadPage.body.php
M ProofreadPage.php
A includes/Context.php
M includes/FileProvider.php
M includes/page/EditPagePage.php
M includes/page/PageContentBuilder.php
M includes/page/PageEditAction.php
M includes/page/PageSubmitAction.php
M includes/page/ProofreadPagePage.php
A tests/data/media/Test.jpg
M tests/includes/FileProviderMock.php
M tests/includes/FileProviderTest.php
M tests/includes/ProofreadPageTestCase.php
M tests/includes/page/PageContentBuilderTest.php
14 files changed, 197 insertions(+), 94 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/78/108678/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index cced2e5..7d2fe80 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -19,6 +19,8 @@
  * @ingroup ProofreadPage
  */
 
+use ProofreadPage\Context;
+
 /*
  @todo :
  - check unicity of the index page : when index is saved too
@@ -27,29 +29,25 @@
 class ProofreadPage {
 
/**
+* @depreciated use Context::getPageNamespaceId
+*
 * Returns id of Page namespace.
 *
-* @return integer namespace id
+* @return integer
 */
public static function getPageNamespaceId() {
-   static $namespace;
-   if ( $namespace === null ) {
-   $namespace = ProofreadPageInit::getNamespaceId( 'page' 
);
-   }
-   return $namespace;
+   return Context::getDefaultContext()->getPageNamespaceId();
}
 
/**
+* @depreciated use Context::getIndexNamespaceId
+*
 * Returns id of Index namespace.
 *
-* @return integer namespace id
+* @return integer
 */
public static function getIndexNamespaceId() {
-   static $namespace;
-   if ( $namespace === null ) {
-   $namespace = ProofreadPageInit::getNamespaceId( 'index' 
);
-   }
-   return $namespace;
+   return Context::getDefaultContext()->getIndexNamespaceId();
}
 
/**
diff --git a/ProofreadPage.php b/ProofreadPage.php
index 0c19793..6d599c9 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -43,6 +43,7 @@
 $wgExtensionMessagesFiles['ProofreadPageAlias'] = $dir . 
'ProofreadPage.alias.php';
 
 $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
+$wgAutoloadClasses['ProofreadPage\Context'] = $dir . 'includes/Context.php';
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
 $wgAutoloadClasses['ProofreadPageRenderer'] = $dir . 
'includes/ProofreadPageRenderer.php';
 $wgAutoloadClasses['ProofreadDiffFormatterUtils'] = $dir . 
'includes/ProofreadDiffFormatterUtils.php';
@@ -201,8 +202,8 @@
 $wgHooks['UnitTestsList'][] = function( array &$files ) {
$dir = __DIR__ . '/tests/includes/';
 
-   $files[] = $dir . 'ProofreadPageTestCase.php';
$files[] = $dir . 'FileProviderMock.php';
+   $files[] = $dir . 'ProofreadPageTestCase.php';
$files[] = $dir . 'FileProviderTest.php';
 
$files[] = $dir . 'index/ProofreadIndexPageTest.php';
diff --git a/includes/Context.php b/includes/Context.php
new file mode 100644
index 000..2048782
--- /dev/null
+++ b/includes/Context.php
@@ -0,0 +1,76 @@
+pageNamespaceId = ProofreadPageInit::getNamespaceId( 
'page' );
+   $this->indexNamespaceId = ProofreadPageInit::getNamespaceId( 
'index' );
+   $this->fileProvider = $fileProvider;
+   }
+
+   /**
+* @return integer
+*/
+   public function getPageNamespaceId() {
+   return $this->pageNamespaceId;
+   }
+
+   /**
+* @return integer
+*/
+   public function getIndexNamespaceId() {
+   return $this->indexNamespaceId;
+   }
+
+   /**
+* @return FileProvider
+*/
+   public function getFileProvider() {
+   return $this->fileProvider;
+   }
+
+   /**
+* @return Context
+*/
+   public static function getDefaultContext() {
+   static $defaultContext;
+
+   if ( $defaultContext === null ) {
+   $defaultContext = new self(
+   ProofreadPageInit::getNamespaceId( 'page' ),
+   ProofreadPageInit::getNamespaceId( 'index' ),
+   new FileProvider( RepoGroup::singleton() )
+   );
+   }
+
+   return $defaultContext;
+   }
+}
\ No newline at end of file
diff --git a/includes/FileProvider.php b/includes/FileProvider.php
ind

[MediaWiki-commits] [Gerrit] Add support for x3d files - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71991


Change subject: Add support for x3d files
..

Add support for x3d files

Add X3D MIME types detection and fix the block of the upload because of the
filtering of the  tag.

Change-Id: I39712097b505ec1192eb5ab578d23c73b62a7160
---
M includes/DefaultSettings.php
M includes/mime.types
M includes/upload/UploadBase.php
3 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/71991/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 10f2885..162608b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1087,6 +1087,7 @@
'http://www.lysator.liu.se/~alla/dia/:diagram' => 
'application/x-dia-diagram',
'http://www.w3.org/1999/xhtml:html' => 'text/html', // 
application/xhtml+xml?
'html' => 'text/html', // application/xhtml+xml?
+   'X3D' => 'model/x3d+xml',
 );
 
 /**
diff --git a/includes/mime.types b/includes/mime.types
index a89d229..2ae51bc 100644
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -104,6 +104,9 @@
 model/iges igs iges
 model/mesh msh mesh silo
 model/vrml wrl vrml
+model/x3d+xml x3d
+model/x3d+vrml x3dv
+model/x3d+binary x3db
 text/calendar ics ifb
 text/css css
 text/html html htm
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 36e4252..6e1e7e5 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -1038,7 +1038,6 @@
$tags = array(
'https://gerrit.wikimedia.org/r/71991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39712097b505ec1192eb5ab578d23c73b62a7160
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove an unneeded property - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97785


Change subject: Remove an unneeded property
..

Remove an unneeded property

Change-Id: I5594aaeebda375dfd00e7c97151939b2eb1371c7
---
M includes/page/ProofreadPageContent.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/85/97785/1

diff --git a/includes/page/ProofreadPageContent.php 
b/includes/page/ProofreadPageContent.php
index fa26c99..6574dcf 100644
--- a/includes/page/ProofreadPageContent.php
+++ b/includes/page/ProofreadPageContent.php
@@ -40,11 +40,6 @@
protected $footer;
 
/**
-* @var User|null last proofreader of the page
-*/
-   protected $proofreader;
-
-   /**
 * @var ProofreadPageLevel proofreading level of the page
 */
protected $level;

-- 
To view, visit https://gerrit.wikimedia.org/r/97785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5594aaeebda375dfd00e7c97151939b2eb1371c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 57615) Add validation of the content model edited by Ed... - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97835


Change subject: (bug 57615) Add validation of the content model edited by 
EditPage
..

(bug 57615) Add validation of the content model edited by EditPage

Change-Id: I6c1bb9774542e39bfb899a47b7afac516fea4a16
---
M includes/EditPage.php
1 file changed, 30 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/97835/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index ab5856a..25806fc 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -274,6 +274,10 @@
$this->mTitle = $article->getTitle();
 
$this->contentModel = $this->mTitle->getContentModel();
+   if( !$this->isSupportedContentModel( $this->contentModel ) ) {
+   throw new MWException( 'The content model is not 
supported: '
+   . ContentHandler::getLocalizedName( 
$this->contentModel ) );
+   }
 
$handler = ContentHandler::getForModelID( $this->contentModel );
$this->contentFormat = $handler->getDefaultFormat();
@@ -317,6 +321,18 @@
} else {
return $this->mContextTitle;
}
+   }
+
+   /**
+* Returns if the given content model is editable.
+*
+* @param string $modelId The ID of the content model to test. Use 
CONTENT_MODEL_XXX constants.
+* @return bool
+* @throws MWException if $modelId has no known handler
+*/
+   public function isSupportedContentModel( $modelId ) {
+   return $this->allowNonTextContent ||
+   ContentHandler::getForModelID( $modelId ) instanceof 
TextContentHandler;
}
 
function submit() {
@@ -777,12 +793,17 @@
$this->bot = $request->getBool( 'bot', true );
$this->nosummary = $request->getBool( 'nosummary' );
 
-   $content_handler = ContentHandler::getForTitle( $this->mTitle );
-   $this->contentModel = $request->getText( 'model', 
$content_handler->getModelID() ); #may be overridden by revision
-   $this->contentFormat = $request->getText( 'format', 
$content_handler->getDefaultFormat() ); #may be overridden by revision
+   $this->contentModel = $request->getText( 'model', 
$this->contentModel ); #may be overridden by revision
+   $this->contentFormat = $request->getText( 'format', 
$this->contentFormat ); #may be overridden by revision
 
-   #TODO: check if the desired model is allowed in this namespace, 
and if a transition from the page's current model to the new model is allowed
-   #TODO: check if the desired content model supports the given 
content format!
+   if ( !$this->isSupportedContentModel( $this->contentModel ) ) {
+   throw new MWException( 'The content model is not 
supported: '
+   . 
ContentHandler::getLocalizedName( $this->contentModel ) );
+   }
+   if ( !ContentHandler::getForModelID( $this->contentModel 
)->isSupportedFormat( $this->contentFormat ) ) {
+   throw new MWException( 'The content format is not 
supported by the content model' );
+   }
+   #TODO: check if a transition from the page's current model to 
the new model is allowed
 
$this->live = $request->getCheck( 'live' );
$this->editintro = $request->getText( 'editintro',
@@ -2128,8 +2149,8 @@
return $content;
}
 
-   if ( !$this->allowNonTextContent && !( $content instanceof 
TextContent ) ) {
-   throw new MWException( "This content model can not be 
edited as text: "
+   if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
+   throw new MWException( 'This content model is not 
supported: '
. 
ContentHandler::getLocalizedName( $content->getModel() ) );
}
 
@@ -2158,8 +2179,8 @@
$content = ContentHandler::makeContent( $text, 
$this->getTitle(),
$this->contentModel, $this->contentFormat );
 
-   if ( !$this->allowNonTextContent && !( $content instanceof 
TextContent ) ) {
-   throw new MWException( "This content model can not be 
edited as text: "
+   if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
+   throw new MWException( 'This content model is not 
supported:'
. ContentHandler::getLocalizedName( 
$content->getModel() ) );
}
 

-- 
To view, visit https://gerrit.wi

[MediaWiki-commits] [Gerrit] Use new validation system of the content model in EditPage - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97837


Change subject: Use new validation system of the content model in EditPage
..

Use new validation system of the content model in EditPage

Depends on change I6c1bb9774542e39bfb899a47b7afac516fea4a16

Change-Id: I7c26db2ba7f1351201145214d02537453855
---
M includes/page/EditProofreadPagePage.php
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/37/97837/1

diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
index f5e3038..4f45645 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -35,10 +35,6 @@
parent::__construct( $article );
 
$this->pagePage = $pagePage;
-
-   if ( $this->contentModel !== CONTENT_MODEL_PROOFREAD_PAGE ) {
-   throw new MWException( 'EditProofreadPagePage should 
only be called on ProofreadPageContent' );
-   }
}
 
/**
@@ -49,6 +45,13 @@
}
 
/**
+* @see EditPage::isSupportedContentModel
+*/
+   public function isSupportedContentModel( $modelId ) {
+   return $modelId === CONTENT_MODEL_PROOFREAD_PAGE;
+   }
+
+   /**
 * Load the content before edit
 *
 * @see EditPage::showContentForm

-- 
To view, visit https://gerrit.wikimedia.org/r/97837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c26db2ba7f1351201145214d02537453855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Load page module when the navigation is displayed - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97924


Change subject: Load page module when the navigation is displayed
..

Load page module when the navigation is displayed

Change-Id: I53a7f19e1d74f74f097c358a7038ad863f97b278
---
M ProofreadPage.body.php
M ProofreadPage.php
R modules/page/ext.proofreadpage.page.navigation.js
R modules/page/ext.proofreadpage.page.navigation.vector.css
4 files changed, 17 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/24/97924/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 9089369..206eebe 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -184,21 +184,21 @@
 * @param $out OutputPage
 * @return bool
 */
-   public static function onBeforePageDisplay( $out ) {
+   public static function onBeforePageDisplay( OutputPage $out ) {
$action = $out->getRequest()->getVal( 'action' );
-   $isEdit = ( $action == 'submit' || $action == 'edit' );
-
-   if ( ( !$out->isArticle() && !$isEdit ) || isset( 
$out->proofreadPageDone ) ) {
-   return true;
-   }
-   $out->proofreadPageDone = true;
+   $isEdit = ( $action === 'submit' || $action === 'edit' );
$title = $out->getTitle();
 
if ( $title->inNamespace( self::getIndexNamespaceId() ) ) {
-   if( !$isEdit ) {
-   $out->addModuleStyles( 'ext.proofreadpage.base' 
);
-   }
-   } elseif ( $title->inNamespace( NS_MAIN ) ) {
+   $out->addModuleStyles( 'ext.proofreadpage.base' );
+   } elseif ( $title->inNamespace( self::getPageNamespaceId() ) ) {
+   $out->addModules( 'ext.proofreadpage.page.navigation' );
+   } elseif (
+   $title->inNamespace( NS_MAIN ) &&
+   ( $out->isArticle() || $isEdit ) &&
+   !isset( $out->proofreadPageDone )
+   ) {
+   $out->proofreadPageDone = true;
self::prepareArticle( $out );
}
 
diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..a4fb194 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -118,10 +118,6 @@
),
'ext.proofreadpage.page' => $prpResourceTemplate + array(
'styles'  => 'page/ext.proofreadpage.page.css',
-   'scripts' => 'page/ext.proofreadpage.page.js',
-   'skinStyles' => array(
-   'vector' => 'page/ext.proofreadpage.page.vector.css',
-   ),
'dependencies' => array( 'ext.proofreadpage.base' )
),
'ext.proofreadpage.page.edit' => $prpResourceTemplate + array(
@@ -145,6 +141,12 @@
'proofreadpage-preferences-showheaders-label',
)
),
+   'ext.proofreadpage.page.navigation' => $prpResourceTemplate + array(
+   'scripts' => 'page/ext.proofreadpage.page.navigation.js',
+   'skinStyles' => array(
+   'vector' => 
'page/ext.proofreadpage.page.navigation.vector.css',
+   )
+   ),
'ext.proofreadpage.article' => $prpResourceTemplate + array(
'scripts' => 'article/ext.proofreadpage.article.js',
'dependencies' => array( 'ext.proofreadpage.base' )
diff --git a/modules/page/ext.proofreadpage.page.js 
b/modules/page/ext.proofreadpage.page.navigation.js
similarity index 100%
rename from modules/page/ext.proofreadpage.page.js
rename to modules/page/ext.proofreadpage.page.navigation.js
diff --git a/modules/page/ext.proofreadpage.page.vector.css 
b/modules/page/ext.proofreadpage.page.navigation.vector.css
similarity index 100%
rename from modules/page/ext.proofreadpage.page.vector.css
rename to modules/page/ext.proofreadpage.page.navigation.vector.css

-- 
To view, visit https://gerrit.wikimedia.org/r/97924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53a7f19e1d74f74f097c358a7038ad863f97b278
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve ProofreadIndexPage parser management - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97941


Change subject: Improve ProofreadIndexPage parser management
..

Improve ProofreadIndexPage parser management

Change-Id: Id4237b865c0044f8ae564afe7787c1614841a9a8
---
M includes/index/ProofreadIndexPage.php
M tests/includes/index/ProofreadIndexPageTest.php
2 files changed, 23 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/41/97941/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 49bbaa0..86ef9bd 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -265,15 +265,7 @@
 * @return array of array( Title title of the pointed page, the label 
of the link )
 */
public function getLinksToMainNamespace() {
-   // Instanciate a new parser object to avoid side effects of 
$parser->replaceVariables
-   static $indexParser;
-
-   if ( $indexParser === null ) {
-   $indexParser = new Parser();
-   }
-   $text = $this->getText();
-   $options = new ParserOptions();
-   $rtext = $indexParser->preprocess( $text, $this->title, 
$options );
+   $rtext = self::getParser()->preprocess( $this->getText(), 
$this->title, new ParserOptions() );
return $this->getLinksToNamespace( $rtext, NS_MAIN );
}
 
@@ -405,15 +397,15 @@
 * @return string the value with variables replaced
 */
public function replaceVariablesWithIndexEntries( $name, $otherParams ) 
{
-   global $wgParser;
-
$entry = $this->getIndexEntry( $name );
if ( $entry === null ) {
return null;
}
 
$params = $this->getIndexEntriesForHeaderAsTemplateParams() + 
$otherParams;
-   return $wgParser->replaceVariables( $entry->getStringValue(), 
$params, true );
+   $parser = self::getParser();
+   $parser->startExternalParse( $this->title, new ParserOptions(), 
Parser::OT_PREPROCESS );
+   return $parser->replaceVariables( $entry->getStringValue(), 
$params, true );
}
 
/**
@@ -428,4 +420,21 @@
}
return $params;
}
+
+   /**
+* Return the Parser object done to be used for Index pages internal use
+* Needed to avoid side effects of $parser->replaceVariables
+*
+* @return Parser
+*/
+   protected static function getParser() {
+   global $wgParser;
+   static $parser = null;
+
+   if ( $parser === null ) {
+   $parser = clone $wgParser;
+   }
+
+   return $parser;
+   }
 }
diff --git a/tests/includes/index/ProofreadIndexPageTest.php 
b/tests/includes/index/ProofreadIndexPageTest.php
index 47c8408..2ade8bc 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -180,11 +180,8 @@
}
 
public function testReplaceVariablesWithIndexEntries() {
-   $this->markTestIncomplete( 'TODO Parser fails' ); //TODO
-   return;
-
-   $page = self::newIndexPage( 'Test.djvu', "{{\n|Title=Test 
book\n|Header='Page of {{{title}}} by {{{author|}}} number {{{pagenum}}}'\n}}" 
);
-   $this->assertEquals( 'Page of Test book by number 22', 
$page->replaceVariablesWithIndexEntries( 'header', array( 'pagenum' => 22 ) ) );
+   $page = self::newIndexPage( 'Test.djvu', "{{\n|Title=Test 
book\n|Header=Page of {{{title}}} by {{{author|}}} {{number}} 
{{{pagenum}}}\n}}" );
+   $this->assertEquals( 'Page of Test book by  {{number}} 22', 
$page->replaceVariablesWithIndexEntries( 'header', array( 'pagenum' => 22 ) ) );
 
$this->assertNull( $page->replaceVariablesWithIndexEntries( 
'headers', array() ) );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/97941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4237b865c0044f8ae564afe7787c1614841a9a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Should fix an issue where qualityX classes are not add to links - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/98181


Change subject: Should fix an issue where qualityX classes are not add to links
..

Should fix an issue where qualityX classes are not add to links

Change-Id: Ic7b371a9e76d9cc90f04abe32d46838372d35ec2
---
M ProofreadPage.body.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/81/98181/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 9089369..ff098b6 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -226,10 +226,10 @@
 * @param $colours array
 */
private static function getLinkColours( $page_ids, &$colours ) {
-   global $wgTitle;
+   global $wgParser;
 
$page_namespace_id = self::getPageNamespaceId();
-   $in_index_namespace = $wgTitle->inNamespace( 
self::getIndexNamespaceId() );
+   $in_index_namespace = $wgParser->getTitle()->inNamespace( 
self::getIndexNamespaceId() );
 
$values = array();
foreach ( $page_ids as $id => $pdbk ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/98181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7b371a9e76d9cc90f04abe32d46838372d35ec2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adds some beginning of tests for DjVu files - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/98258


Change subject: Adds some beginning of tests for DjVu files
..

Adds some beginning of tests for DjVu files

Change-Id: I453b2b1a1c4999150a570e22170a9c630c2ef265
---
A tests/phpunit/data/media/LoremIpsum.djvu
A tests/phpunit/includes/media/DjVuTest.php
2 files changed, 102 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/98258/1

diff --git a/tests/phpunit/data/media/LoremIpsum.djvu 
b/tests/phpunit/data/media/LoremIpsum.djvu
new file mode 100644
index 000..42f47cd
--- /dev/null
+++ b/tests/phpunit/data/media/LoremIpsum.djvu
Binary files differ
diff --git a/tests/phpunit/includes/media/DjVuTest.php 
b/tests/phpunit/includes/media/DjVuTest.php
new file mode 100644
index 000..73b95b8
--- /dev/null
+++ b/tests/phpunit/includes/media/DjVuTest.php
@@ -0,0 +1,102 @@
+checkIfToolExists( 'ddjvu' ) ||
+   !$this->checkIfToolExists( 'djvutoxml' ) ||
+   !$this->checkIfToolExists( 'djvudump' )
+   ) {
+   $this->markTestSkipped( 'This test needs the 
installation of the ddjvu, djvutoxml and djvudump tools' );
+   }
+   $wgDjvuToXML = 'djvutoxml';
+   $wgDjvuDump = 'djvudump';
+   $wgDjvuRenderer = 'ddjvu';
+
+   //file repo setup
+   $this->filePath = __DIR__ . '/../../data/media/';
+   $backend = new FSFileBackend( array(
+   'name' => 'localtesting',
+   'lockManager' => 'nullLockManager',
+   'containerPaths' => array( 'data' => $this->filePath )
+   ) );
+   $this->repo = new FSRepo( array(
+   'name' => 'temp',
+   'url' => 'http://localhost/thumbtest',
+   'backend' => $backend
+   ) );
+
+   $this->handler = new DjVuHandler();
+   }
+
+   /**
+* Check if a tool exist
+*
+* @param string $tool
+* @return bool
+*/
+   protected function checkIfToolExists( $tool ) {
+   $resultCode = -1;
+   wfShellExecWithStderr( $tool . ' --help', $resultCode );
+   return $resultCode !== 127;
+   }
+
+   protected function dataFile( $name, $type ) {
+   return new UnregisteredLocalFile(
+   false,
+   $this->repo,
+   'mwstore://localtesting/data/' . $name,
+   $type
+   );
+   }
+
+   public function testGetImageSize() {
+   $this->assertArrayEquals(
+   array(  2480, 3508, 'width="2480" height="3508"', 
'DjVu' ),
+   $this->handler->getImageSize( null, $this->filePath . 
'/LoremIpsum.djvu' )
+   );
+   }
+
+   public function testInvalidFile() {
+   $this->assertFalse(
+   $this->handler->getMetadata( null, $this->filePath . 
'/README' )
+   );
+   }
+
+   public function testPageCount() {
+   $file = $this->dataFile( 'LoremIpsum.djvu', 'image/x.djvu' );
+   $this->assertEquals( 5, $this->handler->pageCount( $file ) );
+   }
+
+   public function testGetPageDimensions() {
+   $file = $this->dataFile( 'LoremIpsum.djvu', 'image/x.djvu' );
+   $this->assertArrayEquals( array( 2480, 3508 ), 
$this->handler->getPageDimensions( $file, 1 ) );
+   }
+
+   public function testGetPageText() {
+   $file = $this->dataFile( 'LoremIpsum.djvu', 'image/x.djvu' );
+   $this->assertEquals( 'Lorem ipsum \n1 \n', (string) 
$this->handler->getPageText( $file, 1 ) );
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/98258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I453b2b1a1c4999150a570e22170a9c630c2ef265
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix a failure in API when the page does not exists - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/98898


Change subject: Fix a failure in API when the page does not exists
..

Fix a failure in API when the page does not exists

Change-Id: I270247a20d492e60116c1adf020d01bd965565be
---
M ProofreadPage.body.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/98/98898/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 9089369..5bcecf9 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -691,16 +691,21 @@
return true;
}
 
+   $contentHandler = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE );
$article = $editPage->getArticle();
$user = $article->getContext()->getUser();
$oldContent = $article->getPage()->getContent( 
Revision::FOR_THIS_USER, $user );
-   $newContent = ContentHandler::makeContent( $text, 
$editPage->getTitle(), $editPage->contentModel, $editPage->contentFormat );
+   $newContent = $contentHandler->unserializeContent( $text, 
$editPage->getTitle(), $editPage->contentFormat );
 
if ( !$newContent->isValid() ) {
$resultArr['badpage'] = wfMessage( 
'proofreadpage_badpagetext' )->text();
return false;
}
 
+   if ( $oldContent === null ) {
+   $oldContent = $contentHandler->makeEmptyContent();
+   }
+
$oldLevel = $oldContent->getLevel();
$newLevel = $newContent->getLevel();
//if the user change the level, the change should be allowed 
and the new User should be the editing user

-- 
To view, visit https://gerrit.wikimedia.org/r/98898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I270247a20d492e60116c1adf020d01bd965565be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use as image name the root title of the page - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/98968


Change subject: Use as image name the root title of the page
..

Use as image name the root title of the page

Change-Id: If2de07ef8e55e253bca863a692fb077a8ab955e7
---
M includes/page/ProofreadPagePage.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/68/98968/1

diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index abf95f8..4123b28 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -141,7 +141,8 @@
}
 
//try to get an image with the same name as the file
-   $imageTitle = Title::makeTitle( NS_IMAGE, 
$this->title->getText() );
+   //TODO: tests including the case there it's a page of a DjVu 
file and the index hasn't the name of the DjVu file
+   $imageTitle = Title::makeTitle( NS_IMAGE, strtok( 
$this->title->getRootText(), '/' ) );
$this->image = wfFindFile( $imageTitle );
return $this->image;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/98968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2de07ef8e55e253bca863a692fb077a8ab955e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ProofreadPage to master - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99042


Change subject: Update ProofreadPage to master
..

Update ProofreadPage to master

Fix two major bugs

Change-Id: I1d0d90e72001c0816d45c234f1d855f0e3238045
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/99042/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 0dde253..9c7c30b 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 0dde2537f52f81219870846af31ed3721325d9bb
+Subproject commit 9c7c30b1980cbc5830d948abe488fd7ddbd92fa8

-- 
To view, visit https://gerrit.wikimedia.org/r/99042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d0d90e72001c0816d45c234f1d855f0e3238045
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf5
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix an error in Page content unserialization - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99044


Change subject: Fix an error in Page content unserialization
..

Fix an error in Page content unserialization

Change-Id: Ie728f1186785673c8849db02a8ada4bdcf448e5e
---
M includes/page/ProofreadPageContentHandler.php
M tests/includes/page/ProofreadPageContentHandlerTest.php
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/44/99044/1

diff --git a/includes/page/ProofreadPageContentHandler.php 
b/includes/page/ProofreadPageContentHandler.php
index c6b16d1..dfcada4 100644
--- a/includes/page/ProofreadPageContentHandler.php
+++ b/includes/page/ProofreadPageContentHandler.php
@@ -63,7 +63,7 @@
$proofreader = '';
$level = 1;
 
-   if ( preg_match( 
'/^(.*?)\n\n\n<\/noinclude>(.*?)(.*?)<\/noinclude>$/s', 
$text, $m ) ) {
+   if ( preg_match( 
'/^(.*?)\n\n\n<\/noinclude>(.*)(.*?)<\/noinclude>$/s', 
$text, $m ) ) {
$header = $m[1];
$body = $m[2];
$footer = $this->cleanTrailingDivTag( $m[3] );
diff --git a/tests/includes/page/ProofreadPageContentHandlerTest.php 
b/tests/includes/page/ProofreadPageContentHandlerTest.php
index dd4b38d..099d3a7 100644
--- a/tests/includes/page/ProofreadPageContentHandlerTest.php
+++ b/tests/includes/page/ProofreadPageContentHandlerTest.php
@@ -22,6 +22,7 @@
array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', '{{PageQuality|2|Woot}}Experimental header' . 
"\n\n\n" . 'Experimental body'),
array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n\n\n" . 
'Experimental bodyExperimental footer' 
),
array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', 'Experimental 
header' . "\n\n\n" . 'Experimental body' )
+   array( 'Experimental header', 'Experimental 
body', 'Experimental footer', 2, 'Woot', 
'Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ),
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie728f1186785673c8849db02a8ada4bdcf448e5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] no message - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99045


Change subject: no message
..

no message

Change-Id: I7737041446a4ad711bc638afbee0dfba5ebc5e03
---
M tests/includes/page/ProofreadPageContentHandlerTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/45/99045/1

diff --git a/tests/includes/page/ProofreadPageContentHandlerTest.php 
b/tests/includes/page/ProofreadPageContentHandlerTest.php
index 099d3a7..da22ca9 100644
--- a/tests/includes/page/ProofreadPageContentHandlerTest.php
+++ b/tests/includes/page/ProofreadPageContentHandlerTest.php
@@ -21,7 +21,7 @@
array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, '1.2.3.4', '{{PageQuality|2|1.2.3.4}}Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ),
array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', '{{PageQuality|2|Woot}}Experimental header' . 
"\n\n\n" . 'Experimental body'),
array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n\n\n" . 
'Experimental bodyExperimental footer' 
),
-   array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', 'Experimental 
header' . "\n\n\n" . 'Experimental body' )
+   array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', 'Experimental 
header' . "\n\n\n" . 'Experimental body' ),
array( 'Experimental header', 'Experimental 
body', 'Experimental footer', 2, 'Woot', 
'Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ),
);
}

-- 
To view, visit https://gerrit.wikimedia.org/r/99045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7737041446a4ad711bc638afbee0dfba5ebc5e03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Normalize level title - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99072


Change subject: Normalize level title
..

Normalize level title

Change-Id: I4c43d057b8b1797358f297a1804e646969b047d2
---
M includes/page/ProofreadPageContent.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/72/99072/1

diff --git a/includes/page/ProofreadPageContent.php 
b/includes/page/ProofreadPageContent.php
index fa26c99..e83aea6 100644
--- a/includes/page/ProofreadPageContent.php
+++ b/includes/page/ProofreadPageContent.php
@@ -242,7 +242,10 @@
);
$parserOutput = $wikitextContent->getParserOutput( $title, 
$revId, $options, $generateHtml );
$parserOutput->addCategory(
-   wfMessage( 'proofreadpage_quality' . 
$this->level->getLevel() . '_category' )->inContentLanguage()->text(),
+   Title::makeTitleSafe(
+   NS_CATEGORY,
+   wfMessage( 'proofreadpage_quality' . 
$this->level->getLevel() . '_category' )->inContentLanguage()->text()
+   )->getDBkey(),
$title->getText()
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c43d057b8b1797358f297a1804e646969b047d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Check that the proofreader is not null in API validation - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99098


Change subject: Check that the proofreader is not null in API validation
..

Check that the proofreader is not null in API validation

bug 57984

Change-Id: I8dba0142f9ea4b63c328eeff0554af4c523e00d6
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/98/99098/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 5bcecf9..0dc4382 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -697,7 +697,7 @@
$oldContent = $article->getPage()->getContent( 
Revision::FOR_THIS_USER, $user );
$newContent = $contentHandler->unserializeContent( $text, 
$editPage->getTitle(), $editPage->contentFormat );
 
-   if ( !$newContent->isValid() ) {
+   if ( !$newContent->isValid() || 
$newContent->getLevel()->getUser() === null ) {
$resultArr['badpage'] = wfMessage( 
'proofreadpage_badpagetext' )->text();
return false;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/99098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dba0142f9ea4b63c328eeff0554af4c523e00d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] No indentation to the first paragraph of a Page: page - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99141


Change subject: No indentation to the first paragraph of a Page: page
..

No indentation to the first paragraph of a Page: page

Change-Id: Iad308d6bb6aadb2dbe587fdf5bdc2c90ae164f1d
---
M includes/page/ProofreadPageContent.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/41/99141/1

diff --git a/includes/page/ProofreadPageContent.php 
b/includes/page/ProofreadPageContent.php
index e83aea6..9980eb3 100644
--- a/includes/page/ProofreadPageContent.php
+++ b/includes/page/ProofreadPageContent.php
@@ -238,7 +238,7 @@
 
//create content
$wikitextContent = new WikitextContent(
-   $this->header->getNativeData() . "\n\n\n" . 
$this->body->getNativeData() . $this->footer->getNativeData()
+   $this->header->getNativeData() . "\n\n" . 
$this->body->getNativeData() . $this->footer->getNativeData()
);
$parserOutput = $wikitextContent->getParserOutput( $title, 
$revId, $options, $generateHtml );
$parserOutput->addCategory(

-- 
To view, visit https://gerrit.wikimedia.org/r/99141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad308d6bb6aadb2dbe587fdf5bdc2c90ae164f1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ProofreadPage to master - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99146


Change subject: Update ProofreadPage to master
..

Update ProofreadPage to master

Fix 6 major bugs

Change-Id: I1d0d90e72001c0816d45c234f1d855f0e3238045
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/99146/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 0dde253..32ac099 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 0dde2537f52f81219870846af31ed3721325d9bb
+Subproject commit 32ac09909c09a1e53aff83fa253dd3cc19ebfa00

-- 
To view, visit https://gerrit.wikimedia.org/r/99146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d0d90e72001c0816d45c234f1d855f0e3238045
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix error with extension tags for automatic header and footer - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99373


Change subject: Fix error with extension tags for automatic header and footer
..

Fix error with extension tags for automatic header and footer

Change-Id: Ib142b5ff4a4624a3a90a88e49390279162120fd2
---
M includes/index/ProofreadIndexPage.php
M tests/includes/index/ProofreadIndexPageTest.php
2 files changed, 68 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/73/99373/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 86ef9bd..a0304a3 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -403,9 +403,16 @@
}
 
$params = $this->getIndexEntriesForHeaderAsTemplateParams() + 
$otherParams;
-   $parser = self::getParser();
-   $parser->startExternalParse( $this->title, new ParserOptions(), 
Parser::OT_PREPROCESS );
-   return $parser->replaceVariables( $entry->getStringValue(), 
$params, true );
+   return preg_replace_callback( '/{\{\{(.*)(\|(.*))?\}\}\}/U', 
function( $matches ) use ( $params ) {
+   $paramKey = trim( strtolower( $matches[1] ) );
+   if ( array_key_exists( $paramKey, $params ) ) {
+   return $params[$paramKey];
+   } elseif( array_key_exists( 3, $matches ) ) {
+   return trim( $matches[3] );
+   } else {
+   return $matches[0];
+   }
+   }, $entry->getStringValue() );
}
 
/**
diff --git a/tests/includes/index/ProofreadIndexPageTest.php 
b/tests/includes/index/ProofreadIndexPageTest.php
index 2ade8bc..6d52088 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -179,10 +179,64 @@
$this->assertEquals( $links, $page->getPreviousAndNextPages( 
Title::newFromText( 'Page:Test 2.tiff' ) ) );
}
 
-   public function testReplaceVariablesWithIndexEntries() {
-   $page = self::newIndexPage( 'Test.djvu', "{{\n|Title=Test 
book\n|Header=Page of {{{title}}} by {{{author|}}} {{number}} 
{{{pagenum}}}\n}}" );
-   $this->assertEquals( 'Page of Test book by  {{number}} 22', 
$page->replaceVariablesWithIndexEntries( 'header', array( 'pagenum' => 22 ) ) );
+   public function replaceVariablesWithIndexEntriesProvider() {
+   return array(
+   array(
+   "{{\n|Title=Test book\n|Header={{{title}}}\n}}",
+   'Test book',
+   'header',
+   array()
+   ),
+   array(
+   "{{\n|Title=Test book\n|Header={{{ Pagenum 
}}}\n}}",
+   '22',
+   'header',
+   array( 'pagenum' => 22 )
+   ),
+   array(
+   "{{\n|Title=Test 
book\n|Header={{{authors}}}\n}}",
+   '{{{authors}}}',
+   'header',
+   array()
+   ),
+   array(
+   "{{\n|Title=Test book\n|Header={{{authors 
|a}}}\n}}",
+   'a',
+   'header',
+   array()
+   ),
+   array(
+   "{{\n|Title=Test 
book\n|Header={{template|a=b}}\n}}",
+   '{{template|a=b}}',
+   'header',
+   array()
+   ),
+   array(
+   "{{\n|Title=Test 
book\n|Header={{template|a={{{Title |}\n}}",
+   '{{template|a=Test book}}',
+   'header',
+   array()
+   ),
+   array(
+   "{{\n|Title=Test 
book\n|Header=\n}}",
+   '',
+   'header',
+   array()
+   ),
+   array(
+   "{{\n|Title=Test 
book\n|Header={{{Pagenum}}}\n}}",
+   null,
+   'headers',
+   array()
+   ),
+   );
+   }
 
-   $this->assertNull( $page->replaceVariablesWithIndexEntries( 
'headers

[MediaWiki-commits] [Gerrit] Let contentHandler system add change of level tags in edit s... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99379


Change subject: Let contentHandler system add change of level tags in edit 
summaries
..

Let contentHandler system add change of level tags in edit summaries

Change-Id: I13921119ec04297c4691642edb1fcec9c9507e52
---
M includes/page/EditProofreadPagePage.php
M modules/page/ext.proofreadpage.page.edit.js
2 files changed, 0 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/79/99379/1

diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
index f5e3038..9768e41 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -201,18 +201,6 @@
}
 
/**
-* @see EditPage::getSummaryInput
-*/
-   function getSummaryInput( $summary = '', $labelText = null, $inputAttrs 
= null, $spanLabelAttrs = null ) {
-
-   if ( !$this->mTitle->exists() ) {
-   $summary = '/*' . wfMessage( 
'proofreadpage_quality1_category' )->plain() . '*/ ' . $summary;
-   }
-
-   return parent::getSummaryInput( $summary, $labelText, 
$inputAttrs, $spanLabelAttrs );
-   }
-
-   /**
 * @see EditPage::importContentFormData
 */
protected function importContentFormData( &$request ) {
diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index d6baa1c..0d63ce9 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -88,16 +88,6 @@
}
 
/**
-* Init the automatic fill of the summary input box
-*/
-   function setupPageQuality() {
-   $( 'input[name="wpQuality"]' ).click( function() {
-   var text = mw.msg( 'proofreadpage_quality' + this.value 
+ '_category' );
-   $( '#wpSummary' ).val( '/* ' + text + ' */ ' );
-   } );
-   }
-
-   /**
 * Add some buttons to the toolbar
 */
function addButtons() {
@@ -245,7 +235,6 @@
initEnvironment();
setupWikiEditor();
setupPreferences();
-   setupPageQuality();
addButtons();
} );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13921119ec04297c4691642edb1fcec9c9507e52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix fatal error in ProofreadPageLevel - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99386


Change subject: Fix fatal error in ProofreadPageLevel
..

Fix fatal error in ProofreadPageLevel

Change-Id: I6485a4745be75f3f41139477be3d1e0133171fde
---
M includes/page/ProofreadPageLevel.php
M tests/includes/page/ProofreadPageLevelTest.php
2 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/86/99386/1

diff --git a/includes/page/ProofreadPageLevel.php 
b/includes/page/ProofreadPageLevel.php
index 4346676..c93fce9 100644
--- a/includes/page/ProofreadPageLevel.php
+++ b/includes/page/ProofreadPageLevel.php
@@ -98,7 +98,8 @@
return false;
}
 
-   if ( $to->getLevel() === 4 && ( $this->level < 3 || 
$this->level === 3 && $this->user->getName() === $to->getUser()->getName() ) ) {
+   $fromUser = ( $this->user instanceof User ) ? $this->user : 
$to->getUser();
+   if ( $to->getLevel() === 4 && ( $this->level < 3 || 
$this->level === 3 && $fromUser->getName() === $to->getUser()->getName() ) ) {
return false;
}
 
diff --git a/tests/includes/page/ProofreadPageLevelTest.php 
b/tests/includes/page/ProofreadPageLevelTest.php
index 89ad2aa..d68d52d 100644
--- a/tests/includes/page/ProofreadPageLevelTest.php
+++ b/tests/includes/page/ProofreadPageLevelTest.php
@@ -72,6 +72,11 @@
new ProofreadPageLevel( 4, $test2User ),
false
),
+   array(
+   new ProofreadPageLevel( 1, null ),
+   new ProofreadPageLevel( 4, $testUser ),
+   false
+   ),
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6485a4745be75f3f41139477be3d1e0133171fde
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make Page: pages unserializer more comprehensive - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99406


Change subject: Make Page: pages unserializer more comprehensive
..

Make Page: pages unserializer more comprehensive

Change-Id: I73a1c693e85554f0ea96d2efd98ce183cf99276a
---
M includes/page/ProofreadPageContentHandler.php
M tests/includes/page/ProofreadPageContentHandlerTest.php
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/06/99406/1

diff --git a/includes/page/ProofreadPageContentHandler.php 
b/includes/page/ProofreadPageContentHandler.php
index dfcada4..555aad6 100644
--- a/includes/page/ProofreadPageContentHandler.php
+++ b/includes/page/ProofreadPageContentHandler.php
@@ -63,11 +63,11 @@
$proofreader = '';
$level = 1;
 
-   if ( preg_match( 
'/^(.*?)\n\n\n<\/noinclude>(.*)(.*?)<\/noinclude>$/s', 
$text, $m ) ) {
+   if ( preg_match( 
'/^(.*?)\n{0,3}<\/noinclude>(.*)(.*?)<\/noinclude>$/s', 
$text, $m ) ) {
$header = $m[1];
$body = $m[2];
$footer = $this->cleanTrailingDivTag( $m[3] );
-   } elseif ( preg_match( 
'/^(.*?)\n\n\n<\/noinclude>(.*?)$/s', $text, $m ) ) {
+   } elseif ( preg_match( 
'/^(.*?)\n{0,3}<\/noinclude>(.*?)$/s', $text, $m ) ) {
$header = $m[1];
$body = $this->cleanTrailingDivTag( $m[2] );
} else {
diff --git a/tests/includes/page/ProofreadPageContentHandlerTest.php 
b/tests/includes/page/ProofreadPageContentHandlerTest.php
index da22ca9..e1827b0 100644
--- a/tests/includes/page/ProofreadPageContentHandlerTest.php
+++ b/tests/includes/page/ProofreadPageContentHandlerTest.php
@@ -23,6 +23,7 @@
array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n\n\n" . 
'Experimental bodyExperimental footer' 
),
array( 'Experimental header', 'Experimental body', '', 
2, 'Woot', 'Experimental 
header' . "\n\n\n" . 'Experimental body' ),
array( 'Experimental header', 'Experimental 
body', 'Experimental footer', 2, 'Woot', 
'Experimental header' . "\n\n\n" . 'Experimental 
bodyExperimental footer' ),
+   array( 'Experimental header', 'Experimental body', 
'Experimental footer', 2, 'Woot', 'Experimental header' . "\n" . 
'Experimental bodyExperimental footer' 
)
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73a1c693e85554f0ea96d2efd98ce183cf99276a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Use default header and footer defined in system messages - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99412


Change subject: Use default header and footer defined in system messages
..

Use default header and footer defined in system messages

Bug 57978

Change-Id: Idd8a7c7c07eeb60f9c6275b65cccb4a72c6327b8
---
M includes/index/ProofreadIndexPage.php
1 file changed, 17 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/12/99412/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index a0304a3..9eac5b8 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -131,7 +131,7 @@
}
} else {
$attributes = explode( "\n", wfMessage( 
'proofreadpage_index_attributes' )->inContentLanguage()->text() );
-   $indexAttributes = explode( ' ', wfMessage( 
'proofreadpage_js_attributes' )->inContentLanguage()->text() );
+   $headerAttributes = explode( ' ', wfMessage( 
'proofreadpage_js_attributes' )->inContentLanguage()->text() );
$config = array();
foreach( $attributes as $attribute ) {
$m = explode( '|', $attribute );
@@ -160,7 +160,7 @@
$config[$m[0]] = $params;
}
 
-   foreach( $indexAttributes as $attribute ) {
+   foreach( $headerAttributes as $attribute ) {
if ( isset( $config[$attribute] ) ) {
$config[$attribute]['header'] = true;
} else {
@@ -177,6 +177,21 @@
}
}
 
+   if( !array_key_exists( 'Header', $config ) ) {
+   $config['Header'] = array(
+   'default' => wfMessage( 
'proofreadpage_default_header' )->inContentLanguage()->plain(),
+   'header' => true,
+   'hidden' => true
+   );
+   }
+   if( !array_key_exists( 'Footer', $config ) ) {
+   $config['Footer'] = array(
+   'default' => wfMessage( 
'proofreadpage_default_footer' )->inContentLanguage()->plain(),
+   'header' => true,
+   'hidden' => true
+   );
+   }
+
return $config;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd8a7c7c07eeb60f9c6275b65cccb4a72c6327b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] no message - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99413


Change subject: no message
..

no message

Change-Id: Icc2a3a39db8471a630229fcb699416475295865d
---
M includes/index/ProofreadIndexPage.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/13/99413/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index a0304a3..94b4ddd 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -402,6 +402,7 @@
return null;
}
 
+   //we can't use the parser here because it replace tags like 
 by strange UIDs
$params = $this->getIndexEntriesForHeaderAsTemplateParams() + 
$otherParams;
return preg_replace_callback( '/{\{\{(.*)(\|(.*))?\}\}\}/U', 
function( $matches ) use ( $params ) {
$paramKey = trim( strtolower( $matches[1] ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/99413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc2a3a39db8471a630229fcb699416475295865d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix link to not existing thumb for mono page files - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99414


Change subject: Fix link to not existing thumb for mono page files
..

Fix link to not existing thumb for mono page files

Change-Id: Id78d8c44cb88bf03a29ab87f812e89aecb0196ef
---
M ProofreadPage.body.php
1 file changed, 15 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/14/99414/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 0dc4382..f672dd5 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -793,23 +793,30 @@
//Image link
$image = $page->getImage();
if ( $image ) {
-   $transformAttributes = array(
-   'width' => $image->getWidth()
-   );
+   $imageUrl = null;
if ( $image->isMultipage() ) {
+   $transformAttributes = array(
+   'width' => $image->getWidth()
+   );
$pageNumber = $page->getPageNumber();
if ( $pageNumber !== null ) {
$transformAttributes['page'] = 
$pageNumber;
}
+   $handler = $image->getHandler();
+   if ( $handler && $handler->normaliseParams( 
$image, $transformAttributes ) ) {
+   $thumbName = $image->thumbName( 
$transformAttributes );
+   $imageUrl = $image->getThumbUrl( 
$thumbName );
+   }
+   } else {
+   //The thumb returned is invalid for not 
multipage pages when the width requested is the image width
+   $imageUrl = $image->getViewURL();
}
-   $handler = $image->getHandler();
-   if ( $handler && $handler->normaliseParams( $image, 
$transformAttributes ) ) {
-   $thumbName = $image->thumbName( 
$transformAttributes );
-   $imageUrl = $image->getThumbUrl( $thumbName );
+
+   if ( $imageUrl !== null ) {
$links['namespaces']['proofreadPageScanLink'] = 
array(
'class' => '',
'href' => $imageUrl,
-   'text' => wfMessage( 
'proofreadpage_image' )->plain()
+   'text' => wfMessage( 'proofreadpage_image' 
)->plain()
);
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/99414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id78d8c44cb88bf03a29ab87f812e89aecb0196ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve text areas - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99415


Change subject: Improve text areas
..

Improve text areas

Change-Id: I0aea160330213a2a715e5fb42e361261f0e3dd90
---
M includes/page/EditProofreadPagePage.php
1 file changed, 44 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/15/99415/1

diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
index f5e3038..a770688 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -93,7 +93,6 @@
 */
protected function showContentForm() {
$out = $this->mArticle->getContext()->getOutput();
-   $pageLang = $this->mTitle->getPageLanguage();
 
//custom CSS for preview
$css = $this->pagePage->getCustomCss();
@@ -101,55 +100,60 @@
$out->addInlineStyle( $css );
}
 
-   $inputAttributes = array(
-   'lang' => $pageLang->getCode(),
-   'dir' => $pageLang->getDir(),
-   'cols' => '70'
-   );
-
+   $inputAttributes = array();
if ( wfReadOnly() ) {
$inputAttributes['readonly'] = '';
}
 
-   $headerAttributes = $inputAttributes + array(
-   'id' => 'wpHeaderTextbox',
-   'rows' => '2',
-   'tabindex' => '1'
-   );
-   $bodyAttributes = $inputAttributes + array(
-   'tabindex' => '1',
-   'accesskey' =>',',
-   'id' => 'wpTextbox1',
-   'rows' => '51',
-   'style' =>''
-   );
-   $footerAttributes = $inputAttributes + array(
-   'id' => 'wpFooterTextbox',
-   'rows' => '2',
-   'tabindex' => '1'
-   );
-
$content = $this->toEditContent( $this->textbox1 );
-   $out->addHTML(
-   $this->pagePage->getPageContainerBegin() .
-   Html::openElement( 'div', array( 'class' => 
'prp-page-edit-header' ) ) .
-   Html::element( 'label', array( 'for' => 
'wpHeaderTextbox' ), wfMessage( 'proofreadpage_header' )->text() ) .
-   Html::textarea( 'wpHeaderTextbox', 
$content->getHeader()->serialize(), $headerAttributes ) .
-   Html::closeElement( 'div' ) .
-   Html::openElement( 'div', array( 'class' => 
'prp-page-edit-body' ) ) .
-   Html::element( 'label', array( 'for' => 'wpTextbox1' ), 
wfMessage( 'proofreadpage_body' )->text() ) .
-   Html::textarea( 'wpTextbox1', 
$content->getBody()->serialize(), $bodyAttributes ) .
-   Html::closeElement( 'div' ) .
-   Html::openElement( 'div', array( 'class' => 
'prp-page-edit-footer' ) ) .
-   Html::element( 'label', array( 'for' => 
'wpFooterTextbox' ), wfMessage( 'proofreadpage_footer' )->text() ) .
-   Html::textarea( 'wpFooterTextbox', 
$content->getFooter()->serialize(), $footerAttributes ) .
-   Html::closeElement( 'div' ) .
-   $this->pagePage->getPageContainerEnd()
+
+   $out->addHTML( $this->pagePage->getPageContainerBegin() );
+   $this->showEditArea(
+   'wpHeaderTextbox',
+   'prp-page-edit-header',
+   'proofreadpage_header',
+   $content->getHeader()->serialize(),
+   $inputAttributes + array( 'rows' => '2' )
);
+   $this->showEditArea(
+   'wpTextbox1',
+   'prp-page-edit-body',
+   'proofreadpage_body',
+   $content->getBody()->serialize(),
+   $inputAttributes
+   );
+   $this->showEditArea(
+   'wpFooterTextbox',
+   'prp-page-edit-footer',
+   'proofreadpage_footer',
+   $content->getFooter()->serialize(),
+   $inputAttributes + array( 'rows' => '2' )
+   );
+   $out->addHTML( $this->pagePage->getPageContainerEnd() );
+
$out->addModules( 'ext.proofreadpage.page.edit' );
}
 
/**
+* Outputs an edit area to edition
+*
+* @param $textareaName string the name of the textarea node (used also 
as id)
+* @param $areaClass string the class of the div container
+* @param $lab

[MediaWiki-commits] [Gerrit] Adds the capacity to zoom by mouse wheel - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99428


Change subject: Adds the capacity to zoom by mouse wheel
..

Adds the capacity to zoom by mouse wheel

Change-Id: Ia3e0cdf1e28dfb3a6153f32d707864e5e88a46c6
---
M ProofreadPage.php
A modules/jquery/jquery.mousewheel.js
M modules/jquery/jquery.prpZoom.js
3 files changed, 165 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/28/99428/1

diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..2e62ef1 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -108,9 +108,12 @@
'remoteExtPath' => 'ProofreadPage/modules'
 );
 $wgResourceModules += array(
+   'jquery.mousewheel' => $prpResourceTemplate + array(
+   'scripts' => 'jquery/jquery.mousewheel.js'
+   ),
'jquery.prpZoom' => $prpResourceTemplate + array(
'scripts' => 'jquery/jquery.prpZoom.js',
-   'dependencies' => array( 'jquery.ui.widget', 
'jquery.ui.draggable' )
+   'dependencies' => array( 'jquery.ui.widget', 
'jquery.ui.draggable', 'jquery.mousewheel' )
),
'ext.proofreadpage.base' => $prpResourceTemplate + array(
'styles'  => 'ext.proofreadpage.base.css',
diff --git a/modules/jquery/jquery.mousewheel.js 
b/modules/jquery/jquery.mousewheel.js
new file mode 100755
index 000..ad013e9
--- /dev/null
+++ b/modules/jquery/jquery.mousewheel.js
@@ -0,0 +1,129 @@
+/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
+ * Licensed under the MIT License.
+ *
+ * Version: 3.1.6
+ *
+ * Requires: jQuery 1.2.2+
+ */
+
+(function ($) {
+
+var toFix  = ['wheel', 'mousewheel', 'DOMMouseScroll', 
'MozMousePixelScroll'],
+toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+['wheel'] : ['mousewheel', 'DomMouseScroll', 
'MozMousePixelScroll'],
+slice  = Array.prototype.slice,
+nullLowestDeltaTimeout, lowestDelta;
+
+if ( $.event.fixHooks ) {
+for ( var i = toFix.length; i; ) {
+$.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
+}
+}
+
+$.event.special.mousewheel = {
+version: '3.1.6',
+
+setup: function() {
+if ( this.addEventListener ) {
+for ( var i = toBind.length; i; ) {
+this.addEventListener( toBind[--i], handler, false );
+}
+} else {
+this.onmousewheel = handler;
+}
+},
+
+teardown: function() {
+if ( this.removeEventListener ) {
+for ( var i = toBind.length; i; ) {
+this.removeEventListener( toBind[--i], handler, false );
+}
+} else {
+this.onmousewheel = null;
+}
+}
+};
+
+$.fn.extend({
+mousewheel: function(fn) {
+return fn ? this.bind('mousewheel', fn) : 
this.trigger('mousewheel');
+},
+
+unmousewheel: function(fn) {
+return this.unbind('mousewheel', fn);
+}
+});
+
+
+function handler(event) {
+var orgEvent   = event || window.event,
+args   = slice.call(arguments, 1),
+delta  = 0,
+deltaX = 0,
+deltaY = 0,
+absDelta   = 0;
+event = $.event.fix(orgEvent);
+event.type = 'mousewheel';
+
+// Old school scrollwheel delta
+if ( 'detail'  in orgEvent ) { deltaY = orgEvent.detail * -1;  
}
+if ( 'wheelDelta'  in orgEvent ) { deltaY = orgEvent.wheelDelta;   
}
+if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY;  
}
+if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; 
}
+
+// Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS 
) {
+deltaX = deltaY * -1;
+deltaY = 0;
+}
+
+// Set delta to be deltaY or deltaX if deltaY is 0 for backwards 
compatabilitiy
+delta = deltaY === 0 ? deltaX : deltaY;
+
+// New school wheel delta (wheel event)
+if ( 'deltaY' in orgEvent ) {
+  deltaY = orgEvent.deltaY * -1;
+  delta  = deltaY;
+}
+if ( 'deltaX' in orgEvent ) {
+  deltaX = orgEvent.deltaX;
+  if ( deltaY === 0 ) { delta  = deltaX * -1; }
+}
+
+// No change actually happened, no reason to go any further
+if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+// Store lowest absolute delta to normalize the delta values
+absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+if ( !lowestDelta || absDelta < lowestDelta ) {
+  lowestDelta = absDelta;
+   

[MediaWiki-commits] [Gerrit] Add validation of the content model edited by EditPage - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99518


Change subject: Add validation of the content model edited by EditPage
..

Add validation of the content model edited by EditPage

Bug: 57615
Change-Id: I6c1bb9774542e39bfb899a47b7afac516fea4a16
---
M includes/EditPage.php
1 file changed, 22 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/99518/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index be350cb..32abf18 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -319,6 +319,18 @@
}
}
 
+   /**
+* Returns if the given content model is editable.
+*
+* @param string $modelId The ID of the content model to test. Use 
CONTENT_MODEL_XXX constants.
+* @return bool
+* @throws MWException if $modelId has no known handler
+*/
+   public function isSupportedContentModel( $modelId ) {
+   return $this->allowNonTextContent ||
+   ContentHandler::getForModelID( $modelId ) instanceof 
TextContentHandler;
+   }
+
function submit() {
$this->edit();
}
@@ -777,12 +789,13 @@
$this->bot = $request->getBool( 'bot', true );
$this->nosummary = $request->getBool( 'nosummary' );
 
-   $content_handler = ContentHandler::getForTitle( $this->mTitle );
-   $this->contentModel = $request->getText( 'model', 
$content_handler->getModelID() ); #may be overridden by revision
-   $this->contentFormat = $request->getText( 'format', 
$content_handler->getDefaultFormat() ); #may be overridden by revision
+   $this->contentModel = $request->getText( 'model', 
$this->contentModel ); #may be overridden by revision
+   $this->contentFormat = $request->getText( 'format', 
$this->contentFormat ); #may be overridden by revision
 
+   if ( !ContentHandler::getForModelID( $this->contentModel 
)->isSupportedFormat( $this->contentFormat ) ) {
+   throw new MWException( 'The content format is not 
supported by the content model' );
+   }
#TODO: check if the desired model is allowed in this namespace, 
and if a transition from the page's current model to the new model is allowed
-   #TODO: check if the desired content model supports the given 
content format!
 
$this->live = $request->getCheck( 'live' );
$this->editintro = $request->getText( 'editintro',
@@ -2128,9 +2141,9 @@
return $content;
}
 
-   if ( !$this->allowNonTextContent && !( $content instanceof 
TextContent ) ) {
-   throw new MWException( "This content model can not be 
edited as text: "
-   . 
ContentHandler::getLocalizedName( $content->getModel() ) );
+   if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
+   throw new MWException( 'This content model is not 
supported: '
+   . ContentHandler::getLocalizedName( 
$content->getModel() ) );
}
 
return $content->serialize( $this->contentFormat );
@@ -2158,8 +2171,8 @@
$content = ContentHandler::makeContent( $text, 
$this->getTitle(),
$this->contentModel, $this->contentFormat );
 
-   if ( !$this->allowNonTextContent && !( $content instanceof 
TextContent ) ) {
-   throw new MWException( "This content model can not be 
edited as text: "
+   if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
+   throw new MWException( 'This content model is not 
supported: '
. ContentHandler::getLocalizedName( 
$content->getModel() ) );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c1bb9774542e39bfb899a47b7afac516fea4a16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf5
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add validation of the content model edited by EditPage - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99519


Change subject: Add validation of the content model edited by EditPage
..

Add validation of the content model edited by EditPage

Bug: 57615
Change-Id: I6c1bb9774542e39bfb899a47b7afac516fea4a16
---
M includes/EditPage.php
1 file changed, 22 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/99519/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f86cae4..cf64992 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -319,6 +319,18 @@
}
}
 
+   /**
+* Returns if the given content model is editable.
+*
+* @param string $modelId The ID of the content model to test. Use 
CONTENT_MODEL_XXX constants.
+* @return bool
+* @throws MWException if $modelId has no known handler
+*/
+   public function isSupportedContentModel( $modelId ) {
+   return $this->allowNonTextContent ||
+   ContentHandler::getForModelID( $modelId ) instanceof 
TextContentHandler;
+   }
+
function submit() {
$this->edit();
}
@@ -777,12 +789,13 @@
$this->bot = $request->getBool( 'bot', true );
$this->nosummary = $request->getBool( 'nosummary' );
 
-   $content_handler = ContentHandler::getForTitle( $this->mTitle );
-   $this->contentModel = $request->getText( 'model', 
$content_handler->getModelID() ); #may be overridden by revision
-   $this->contentFormat = $request->getText( 'format', 
$content_handler->getDefaultFormat() ); #may be overridden by revision
+   $this->contentModel = $request->getText( 'model', 
$this->contentModel ); #may be overridden by revision
+   $this->contentFormat = $request->getText( 'format', 
$this->contentFormat ); #may be overridden by revision
 
+   if ( !ContentHandler::getForModelID( $this->contentModel 
)->isSupportedFormat( $this->contentFormat ) ) {
+   throw new MWException( 'The content format is not 
supported by the content model' );
+   }
#TODO: check if the desired model is allowed in this namespace, 
and if a transition from the page's current model to the new model is allowed
-   #TODO: check if the desired content model supports the given 
content format!
 
$this->live = $request->getCheck( 'live' );
$this->editintro = $request->getText( 'editintro',
@@ -2128,9 +2141,9 @@
return $content;
}
 
-   if ( !$this->allowNonTextContent && !( $content instanceof 
TextContent ) ) {
-   throw new MWException( "This content model can not be 
edited as text: "
-   . 
ContentHandler::getLocalizedName( $content->getModel() ) );
+   if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
+   throw new MWException( 'This content model is not 
supported: '
+   . ContentHandler::getLocalizedName( 
$content->getModel() ) );
}
 
return $content->serialize( $this->contentFormat );
@@ -2158,8 +2171,8 @@
$content = ContentHandler::makeContent( $text, 
$this->getTitle(),
$this->contentModel, $this->contentFormat );
 
-   if ( !$this->allowNonTextContent && !( $content instanceof 
TextContent ) ) {
-   throw new MWException( "This content model can not be 
edited as text: "
+   if ( !$this->isSupportedContentModel( $content->getModel() ) ) {
+   throw new MWException( 'This content model is not 
supported: '
. ContentHandler::getLocalizedName( 
$content->getModel() ) );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/99519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c1bb9774542e39bfb899a47b7afac516fea4a16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf6
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Backport bug fixed in ProofreadPage - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99522


Change subject: Backport bug fixed in ProofreadPage
..

Backport bug fixed in ProofreadPage

Change-Id: I2bbfff09bf7f69b35574f3d03a756cda7aa4ef81
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/99522/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 32ac099..5026f35 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 32ac09909c09a1e53aff83fa253dd3cc19ebfa00
+Subproject commit 5026f35e146986c8d3021365052e523aec795ceb

-- 
To view, visit https://gerrit.wikimedia.org/r/99522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bbfff09bf7f69b35574f3d03a756cda7aa4ef81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf5
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ProofreadPage to master - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99627


Change subject: Update ProofreadPage to master
..

Update ProofreadPage to master

Change-Id: Iac8f802e7bb8d2f606b718dbab39ae78e8a6f218
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/99627/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 6018f0f..7f886e8 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 6018f0fd38728b0bd4df7af82c30e2702bf021d5
+Subproject commit 7f886e8d6d95e7a4eafed665c901c805d623b18d

-- 
To view, visit https://gerrit.wikimedia.org/r/99627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac8f802e7bb8d2f606b718dbab39ae78e8a6f218
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf6
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add the level change summary tag even if there is an edit su... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/99634


Change subject: Add the level change summary tag even if there is an edit 
summary
..

Add the level change summary tag even if there is an edit summary

Change-Id: I877d118a151fe599218b605d68f090c7caba9390
---
M includes/page/ProofreadPageContentHandler.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/34/99634/1

diff --git a/includes/page/ProofreadPageContentHandler.php 
b/includes/page/ProofreadPageContentHandler.php
index 5d0f825..780db24 100644
--- a/includes/page/ProofreadPageContentHandler.php
+++ b/includes/page/ProofreadPageContentHandler.php
@@ -174,11 +174,10 @@
$summary = parent::getAutosummary( $oldContent, $newContent, 
$flags );
 
if (
-   $summary === '' &&
$newContent instanceof ProofreadPageContent &&
( $oldContent === null || $oldContent instanceof 
ProofreadPageContent && !$newContent->getLevel()->equals( 
$oldContent->getLevel() ) )
) {
-   $summary = '/*' . wfMessage( 'proofreadpage_quality' . 
$newContent->getLevel()->getLevel() . '_category' )->plain() . '*/';
+   $summary = '/*' . wfMessage( 'proofreadpage_quality' . 
$newContent->getLevel()->getLevel() . '_category' )->plain() . '*/ ' . $summary;
}
 
return $summary;

-- 
To view, visit https://gerrit.wikimedia.org/r/99634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I877d118a151fe599218b605d68f090c7caba9390
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improves JavaScript code quality - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114463

Change subject: Improves JavaScript code quality
..

Improves JavaScript code quality

Change-Id: I720b613f48ce29d4b63e4a4cd5c1c38bc351c4de
---
M modules/article/ext.proofreadpage.article.js
M modules/jquery/jquery.prpZoom.js
M modules/page/ext.proofreadpage.page.edit.js
3 files changed, 11 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/63/114463/1

diff --git a/modules/article/ext.proofreadpage.article.js 
b/modules/article/ext.proofreadpage.article.js
index 18737ed..11c6e50 100644
--- a/modules/article/ext.proofreadpage.article.js
+++ b/modules/article/ext.proofreadpage.article.js
@@ -1,8 +1,9 @@
-// Author : ThomasV - License : GPL
+( function ( mw, $ ) {
+   'use strict';
 
-/* add backlink to index page */
-function prAddSource() {
-   $( '#ca-nstab-main' ).after( '' + 
proofreadpage_source_href + '' );
-}
+   $( document ).ready( function() {
+   /* add backlink to index page */
+   $( '#ca-nstab-main' ).after( '' + mw.config.get( 'proofreadpage_source_href' ) 
+ '' );
+   } );
 
-jQuery( prAddSource );
+} ( mediaWiki, jQuery ) );
\ No newline at end of file
diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index 4423c81..52c40af 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -114,7 +114,7 @@
}
event.preventDefault(); //Don't scroll 
while zooming
}
-   }
+   };
},
 
reset: function() {
diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 0009a02..969c852 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -92,10 +92,10 @@
 */
function setupPageQuality() {
$( 'input[name="wpQuality"]' ).click( function() {
+   var $summary = $( '#wpSummary' );
var pageQuality = mw.message( 'proofreadpage_quality' + 
this.value + '_category').plain();
-   var currentSummary = $( '#wpSummary' ).val();
-   currentSummary = currentSummary.replace( 
/\/\*.*\*\/\s?/, '' );
-   $( '#wpSummary' ).val( '/* ' + pageQuality + ' */ '  + 
currentSummary );
+   var summary = $summary.val().replace( /\/\*.*\*\/\s?/, 
'' );
+   $summary.val( '/* ' + pageQuality + ' */ ' + summary );
} );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/114463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I720b613f48ce29d4b63e4a4cd5c1c38bc351c4de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Implements the "other project" section in sidebar - change (mediawiki...Wikibase)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114979

Change subject: Implements the "other project" section in sidebar
..

Implements the "other project" section in sidebar

Change-Id: If8706343136ca25c0967aad3a8451283330d636f
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/config/WikibaseClient.default.php
A client/includes/OtherProjectsSidebarGenerator.php
4 files changed, 137 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/79/114979/1

diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index d92fab2..5f4f8a8 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -26,6 +26,7 @@
 use User;
 use Wikibase\Client\Hooks\InfoActionHookHandler;
 use Wikibase\Client\MovePageNotice;
+use Wikibase\Client\OtherProjectsSidebarGenerator;
 use Wikibase\Client\WikibaseClient;
 
 /**
@@ -596,6 +597,39 @@
}
 
/**
+* Displays a sidebar section for other project links.
+*
+* @since 0.5
+*
+* @param Skin $skin
+* @param array $bar
+*
+* @return bool
+*/
+   public static function onSkinBuildSidebar( Skin $skin, &$bar ) {
+   $settings = WikibaseClient::getDefaultInstance()->getSettings();
+
+   $siteIdsToOutput = $settings->getSetting( 'otherProjetsLinks' );
+   if ( count( $siteIdsToOutput ) === 0 ) {
+   return true;
+   }
+
+   $generator = new OtherProjectsSidebarGenerator(
+   $settings->getSetting( 'siteGlobalID' ),
+   
WikibaseClient::getDefaultInstance()->getStore()->getSiteLinkTable(),
+   Sites::singleton(),
+   $siteIdsToOutput
+   );
+
+   $otherProjectsSidebar = $generator->buildProjectLinkSidebar( 
$skin->getContext()->getTitle() );
+   if ( count( $otherProjectsSidebar ) !== 0 ) {
+   $bar['wb-other-projects'] = $otherProjectsSidebar;
+   }
+
+   return true;
+   }
+
+   /**
 * Adds a toggle for showing/hiding Wikidata entries in recent changes
 *
 * @param SpecialRecentChanges $special
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index b009543..41416a1 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -76,6 +76,7 @@
$wgHooks['MagicWordwgVariableIDs'][]= 
'\Wikibase\ClientHooks::onMagicWordwgVariableIDs';
$wgHooks['ParserGetVariableValueSwitch'][]  = 
'\Wikibase\ClientHooks::onParserGetVariableValueSwitch';
$wgHooks['SkinTemplateOutputPageBeforeExec'][]  = 
'\Wikibase\ClientHooks::onSkinTemplateOutputPageBeforeExec';
+   $wgHooks['SkinBuildSidebar'][]  = 
'\Wikibase\ClientHooks::onSkinBuildSidebar';
$wgHooks['SpecialMovepageAfterMove'][]  = 
'\Wikibase\ClientHooks::onSpecialMovepageAfterMove';
$wgHooks['SpecialWatchlistQuery'][] = 
'\Wikibase\ClientHooks::onSpecialWatchlistQuery';
$wgHooks['SpecialRecentChangesQuery'][] = 
'\Wikibase\ClientHooks::onSpecialRecentChangesQuery';
diff --git a/client/config/WikibaseClient.default.php 
b/client/config/WikibaseClient.default.php
index 488b3c3..4c6578c 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -39,6 +39,7 @@
'allowDataTransclusion' => true,
'enableSiteLinkWidget' => true,
'propagateChangesToRepo' => true,
+   'otherProjetsLinks' => array(),
 
/**
 * @todo this is a bit wikimedia-specific and need to find a 
better place for this stuff,
diff --git a/client/includes/OtherProjectsSidebarGenerator.php 
b/client/includes/OtherProjectsSidebarGenerator.php
new file mode 100644
index 000..616f0ae
--- /dev/null
+++ b/client/includes/OtherProjectsSidebarGenerator.php
@@ -0,0 +1,101 @@
+localSiteId = $localSiteId;
+   $this->siteLinkLookup = $siteLinkLookup;
+   $this->sites = $sites;
+   $this->siteIdsToOutput = $siteIdsToOutput;
+   }
+
+   /**
+* @param Title $title
+*
+* @return array
+*/
+   public function buildProjectLinkSidebar( Title $title ) {
+   $siteLinks = $this->getSiteLinks( $title );
+
+   $result = array();
+
+   foreach ( $siteLinks as $siteLink ) {
+   if ( !in_array( $siteLink->getSiteId(), 
$this->siteIdsToOutput ) ) {
+   continue;
+   }
+
+   $result[] = $this->buildSidebarLi

[MediaWiki-commits] [Gerrit] Increases size of the Special:IndexPages input - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115197

Change subject: Increases size of the Special:IndexPages input
..

Increases size of the Special:IndexPages input

Bug: 61818
Change-Id: I5233ee2a0fea5972f8821d4ae34afaa9c2dfebda
---
M SpecialProofreadPages.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/97/115197/1

diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php
index 3d8033a..204cd3d 100644
--- a/SpecialProofreadPages.php
+++ b/SpecialProofreadPages.php
@@ -57,11 +57,11 @@
Html::openElement('fieldset', array() ) .
Html::element('legend', null, $this->msg( 
'proofreadpage_specialpage_legend' )->text() ) .
Html::openElement( 'p' ) .
-   Xml::label( $this->msg( 
'proofreadpage_specialpage_label_key' )->text(), 'key' )  . ' ' .
-   Html::input( 'key', $this->searchTerm ) .
+   Html::element( 'label', array( 'for' => 'key' 
), $this->msg( 'proofreadpage_specialpage_label_key' )->text() )  . ' ' .
+   Html::input( 'key', $this->searchTerm, 
'search', array( 'id' => 'key', 'size' => '50' ) ) .
Html::closeElement( 'p' ) .
Html::openElement( 'p' ) .
-   Xml::label( $this->msg( 
'proofreadpage_specialpage_label_orderby' )->text(), 'order' ) . ' ' . 
$orderSelect->getHtml() . ' ' .
+   Html::element( 'label', array( 'for' => 'order' 
), $this->msg( 'proofreadpage_specialpage_label_orderby' )->text() ) . ' ' . 
$orderSelect->getHtml() . ' ' .
Xml::checkLabel( $this->msg( 
'proofreadpage_specialpage_label_sortascending' )->text(), 'sortascending', 
'sortascending', $this->sortAscending ) . ' ' .
Xml::submitButton( $this->msg( 'ilsubmit' 
)->text() ) .
Html::closeElement( 'p' ) .

-- 
To view, visit https://gerrit.wikimedia.org/r/115197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5233ee2a0fea5972f8821d4ae34afaa9c2dfebda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix fatal error when usebetatoolbar option was activated and... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115205

Change subject: Fix fatal error when usebetatoolbar option was activated and 
not showtoolbar
..

Fix fatal error when usebetatoolbar option was activated and not showtoolbar

Users in this configuration will still have a degraded but working editing 
experience

Bug: 61220
Change-Id: Ic9d638f29dcd8fb9c56c04b08e4ed27fb5f31f43
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/05/115205/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 969c852..28c428e 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -185,7 +185,7 @@
}
} );
} );
-   } else {
+   } else if( mw.user.options.get( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.action.edit', function() {
var $toolbar = $( '#toolbar' );
 
@@ -212,7 +212,7 @@
 * Improve the WikiEditor interface
 */
function setupWikiEditor() {
-   if( !mw.user.options.get( 'usebetatoolbar' ) ) {
+   if( !mw.user.options.get( 'showtoolbar' ) || 
!mw.user.options.get( 'usebetatoolbar' ) ) {
return;
}
mw.loader.using( 'ext.wikiEditor', function() {

-- 
To view, visit https://gerrit.wikimedia.org/r/115205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d638f29dcd8fb9c56c04b08e4ed27fb5f31f43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adds a beginning of parser tests - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/115356

Change subject: Adds a beginning of parser tests
..

Adds a beginning of parser tests

Change-Id: I5518ae938faca86449c202d720b65f945f7db05c
---
M ProofreadPage.body.php
M ProofreadPage.php
A tests/parser/pages.txt
3 files changed, 187 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/56/115356/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 46fca8e..3bd8889 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -797,6 +797,16 @@
}
 
/**
+* @param array $tables
+* @return bool
+*/
+   public static function onParserTestTables( array &$tables ) {
+   $tables[] = 'pr_index';
+
+   return true;
+   }
+
+   /**
 * Add the links to previous, next, index page and scan image to Page: 
pages.
 * @param $skin SkinTemplate object
 * @param $links array structured navigation links
diff --git a/ProofreadPage.php b/ProofreadPage.php
index 9434478..ad80840 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -193,6 +193,8 @@
 $wgHooks['ContentHandlerDefaultModelFor'][] = 
'ProofreadPage::onContentHandlerDefaultModelFor';
 $wgHooks['APIEditBeforeSave'][] = 'ProofreadPage::onAPIEditBeforeSave';
 $wgHooks['EditFormPreloadText'][] = 'ProofreadPage::onEditFormPreloadText';
+$wgHooks['ParserTestTables'][] = 'ProofreadPage::onParserTestTables';
+
 
 
 /**
@@ -219,6 +221,9 @@
return true;
 };
 
+//Parser tests
+$wgParserTestFiles[] = __DIR__ . '/tests/parser/pages.txt';
+
 //Handlers
 $wgContentHandlers[CONTENT_MODEL_PROOFREAD_PAGE] = 
'ProofreadPageContentHandler';
 
diff --git a/tests/parser/pages.txt b/tests/parser/pages.txt
new file mode 100644
index 000..caede83
--- /dev/null
+++ b/tests/parser/pages.txt
@@ -0,0 +1,172 @@
+!! hooks
+pages
+!! endhooks
+
+!!article
+MediaWiki:Proofreadpage pagenum template
+!!text
+[[{{{page}}}|{{{num}}}]]
+!!endarticle
+
+!!article
+MediaWiki:Proofreadpage header template
+!!text
+{{{title}}} -- {{{author}}}
+{{{from}}} -- {{{to}}}
+{{{prev}}} -- {{{next}}}
+!!endarticle
+
+!!article
+Index:Test
+!!text
+{{
+|Title=Title
+|Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] [[Page:Test 3.png|2]]
+|Author=[[Author:Me]]
+|TOC=* [[Test/Chapter 1]]
+* [[Test/Chapter 2|Chapter 2]]
+* [[Test/Chapter 3|Chapter 3]]
+}}
+!!endarticle
+
+!!article
+Page:Test 1.jpg
+!!text
+Test 1
+!!endarticle
+
+!!article
+Page:Test 2.tiff
+!!text
+Test 2
+!!endarticle
+
+!!article
+Page:Test 3.png
+!!text
+
+
+Test 3
+!!endarticle
+
+!!article
+Author:Me
+!!text
+!!endarticle
+
+!!article
+Test/Chapter 1
+!!text
+!!endarticle
+
+!!article
+Test/Chapter 2
+!!text
+!!endarticle
+
+!!article
+Test/Chapter 3
+!!text
+!!endarticle
+
+!! test
+pages: without index
+!! input
+
+!! result
+Error: Index expected
+
+!! end
+
+!! test
+pages: with non existing index
+!! input
+
+!! result
+Error: No such index
+
+!! end
+
+!! test
+pages: without file: Simple transclusion
+!! input
+
+!! result
+
+TOCTest 1 1Test 2 2
+Test 3 
+
+
+
+!! end
+
+!! test
+pages: without file: Simple transclusion without from
+!! input
+
+!! result
+
+TOCTest 1 1Test 2 
+
+
+
+!! end
+
+!! test
+pages: without file: Simple transclusion without to
+!! input
+
+!! result
+
+1Test 2 2
+Test 3 
+
+
+
+!! end
+
+!! test
+pages: without file: Header
+!! options
+title=Test/Chapter 2
+!! input
+
+!! result
+
+Title -- Author:Me
+TOC -- 1
+Chapter 3 -- 
{{{next}}}TOCTest 1 1Test 2 
+
+
+
+!! end
+
+!! test
+pages: without file: TOC
+!! options
+title=Test
+!! input
+
+!! result
+
+Title -- Author:Me
+{{{from}}} -- {{{to}}}
+Chapter 3 -- 
{{{next}}}
+
+
+
+!! end
+
+!! test
+pages: recursion
+!! input
+
+!! result
+
+Title -- Author:Me
+{{{from}}} -- {{{to}}}
+Chapter 3 -- 
{{{next}}}
+
+
+
+!! end
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/115356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5518ae938faca86449c202d720b65f945f7db05c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make code site relative - change (apps...wikipedia)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/95801


Change subject: Make code site relative
..

Make code site relative

Allows to open and brows non default site pages

Change-Id: I45e1526e9a6a34c59e1a98dc64c908aa99bb0fb2
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/WikipediaApp.java
3 files changed, 12 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/01/95801/1

diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
index b71a1e1..6083ceb 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
@@ -16,13 +16,13 @@
 private final Context context;
 private final CommunicationBridge bridge;
 private final Bus bus;
-private final WikipediaApp app;
+private final Site currentSite;
 
-public LinkHandler(Context context, CommunicationBridge bridge) {
+public LinkHandler(Context context, CommunicationBridge bridge, Site 
currentSite) {
 this.context = context;
 this.bridge = bridge;
-this.app = ((WikipediaApp)context.getApplicationContext());
-this.bus = app.getBus();
+this.bus = ((WikipediaApp)context.getApplicationContext()).getBus();
+this.currentSite = currentSite;
 
 this.bridge.addListener("linkClicked", this);
 }
@@ -45,7 +45,7 @@
 Log.d("Wikipedia", "Link clicked was " + href);
 if (href.startsWith("/wiki/")) {
 // TODO: Handle fragments
-bus.post(new 
NewWikiPageNavigationEvent(app.getPrimarySite().titleForInternalLink(href)));
+bus.post(new 
NewWikiPageNavigationEvent(currentSite.titleForInternalLink(href)));
 } else {
 // Assume everything else is an external link... for now!
 handleExternalLink(href);
diff --git 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
index 38d6eb5..ed20533 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageViewFragment.java
@@ -83,7 +83,7 @@
 webView.getSettings().setDisplayZoomControls(false);
 
 bridge = new CommunicationBridge(webView, 
"file:///android_asset/index.html");
-linkHandler = new LinkHandler(getActivity(), bridge);
+linkHandler = new LinkHandler(getActivity(), bridge, title.getSite());
 
 if (savedInstanceState != null && 
savedInstanceState.containsKey(KEY_TITLE)) {
 title = savedInstanceState.getParcelable(KEY_TITLE);
@@ -96,7 +96,7 @@
 }
 
 if (page == null) {
-Api api = 
((WikipediaApp)getActivity().getApplicationContext()).getPrimarySiteAPI();
+Api api = 
((WikipediaApp)getActivity().getApplicationContext()).getAPIForSite(title.getSite());
 new PageFetchTask(api, title) {
 @Override
 public void onFinish(Page result) {
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/WikipediaApp.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/WikipediaApp.java
index 621d9d9..ad071b5 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/WikipediaApp.java
@@ -27,10 +27,6 @@
 return bus;
 }
 
-public Api getPrimarySiteAPI() {
-return getAPIForSite(getPrimarySite());
-}
-
 private HashMap apis = new HashMap();
 public Api getAPIForSite(Site site) {
 if (!apis.containsKey(site.getDomain()))  {
@@ -40,6 +36,11 @@
 }
 
 private Site primarySite;
+
+/**
+ * Default site of the application
+ * You should use PageTitle.getSite() to get the currently browsed site
+ */
 public Site getPrimarySite() {
 if (primarySite == null) {
 // FIXME: Actually read from SharedPreferences or something

-- 
To view, visit https://gerrit.wikimedia.org/r/95801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45e1526e9a6a34c59e1a98dc64c908aa99bb0fb2
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allows to remain in the app while going to an other language... - change (apps...wikipedia)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/95819


Change subject: Allows to remain in the app while going to an other language 
wikipedia
..

Allows to remain in the app while going to an other language wikipedia

Change-Id: I728d86bcf7787d48cd45773eebaf81ce3fc7155d
---
D wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java
M wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
A wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/LinkHandler.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/Site.java
5 files changed, 62 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/19/95819/1

diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java
deleted file mode 100644
index f2da0ef..000
--- a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.wikimedia.wikipedia.test;
-
-import junit.framework.TestCase;
-import org.wikimedia.wikipedia.PageTitle;
-import org.wikimedia.wikipedia.Site;
-
-public class EqualityTests extends TestCase {
-public void testPageTitle() throws Exception {
-assertTrue(new PageTitle(null, "India", new 
Site("en.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
-assertTrue(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
-
-assertFalse(new PageTitle(null, "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
-assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
-assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals("Something else"));
-}
-
-public void testSite() throws Exception {
-assertTrue(new Site("en.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
-
-assertFalse(new Site("ta.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
-assertFalse(new Site("ta.wikipedia.org").equals("ta.wikipedia.org"));
-}
-}
diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
index b4a70fd..f367466 100644
--- 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
+++ 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
@@ -5,6 +5,16 @@
 import org.wikimedia.wikipedia.Site;
 
 public class PageTitleTests extends TestCase {
+
+public void testEquals() throws Exception {
+assertTrue(new PageTitle(null, "India", new 
Site("en.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
+assertTrue(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
+
+assertFalse(new PageTitle(null, "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
+assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
+assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals("Something else"));
+}
+
 public void testPrefixedText() throws Exception {
 Site enwiki = new Site("en.wikipedia.org");
 
diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
new file mode 100644
index 000..ad8ed87
--- /dev/null
+++ b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
@@ -0,0 +1,27 @@
+package org.wikimedia.wikipedia.test;
+
+import junit.framework.TestCase;
+import org.wikimedia.wikipedia.Site;
+
+public class SiteTests extends TestCase {
+
+public void testEquals() throws Exception {
+assertTrue(new Site("en.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
+
+assertFalse(new Site("ta.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
+assertFalse(new Site("ta.wikipedia.org").equals("ta.wikipedia.org"));
+}
+
+public void testNormalization() throws Exception {
+assertEquals(new Site("en.wikipedia.org"), new 
Site("en.m.wikipedia.org"));
+assertEquals("bm.wikipedia.org", (new 
Site("bm.wikipedia.org")).getDomain());
+}
+
+public void testIsSupportedSite() throws Exception {
+assertTrue(Site.isSupportedSite("fr.

[MediaWiki-commits] [Gerrit] Split EqualityTests inside of classes tests - change (apps...wikipedia)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/95844


Change subject: Split EqualityTests inside of classes tests
..

Split EqualityTests inside of classes tests

Change-Id: Ie081b7f91f62fa52503304643a1f57324d9c9d6d
---
D wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java
M wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
M wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
3 files changed, 17 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/44/95844/1

diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java
deleted file mode 100644
index f2da0ef..000
--- a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/EqualityTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.wikimedia.wikipedia.test;
-
-import junit.framework.TestCase;
-import org.wikimedia.wikipedia.PageTitle;
-import org.wikimedia.wikipedia.Site;
-
-public class EqualityTests extends TestCase {
-public void testPageTitle() throws Exception {
-assertTrue(new PageTitle(null, "India", new 
Site("en.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
-assertTrue(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
-
-assertFalse(new PageTitle(null, "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
-assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
-assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals("Something else"));
-}
-
-public void testSite() throws Exception {
-assertTrue(new Site("en.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
-
-assertFalse(new Site("ta.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
-assertFalse(new Site("ta.wikipedia.org").equals("ta.wikipedia.org"));
-}
-}
diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
index b4a70fd..f367466 100644
--- 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
+++ 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/PageTitleTests.java
@@ -5,6 +5,16 @@
 import org.wikimedia.wikipedia.Site;
 
 public class PageTitleTests extends TestCase {
+
+public void testEquals() throws Exception {
+assertTrue(new PageTitle(null, "India", new 
Site("en.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
+assertTrue(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
+
+assertFalse(new PageTitle(null, "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle(null, "India", new 
Site("en.wikipedia.org";
+assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals(new PageTitle("Talk", "India", new 
Site("en.wikipedia.org";
+assertFalse(new PageTitle("Talk", "India", new 
Site("ta.wikipedia.org")).equals("Something else"));
+}
+
 public void testPrefixedText() throws Exception {
 Site enwiki = new Site("en.wikipedia.org");
 
diff --git 
a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java 
b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
index b536a62..ad8ed87 100644
--- a/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
+++ b/wikipedia-it/src/main/java/org/wikimedia/wikipedia/test/SiteTests.java
@@ -5,6 +5,13 @@
 
 public class SiteTests extends TestCase {
 
+public void testEquals() throws Exception {
+assertTrue(new Site("en.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
+
+assertFalse(new Site("ta.wikipedia.org").equals(new 
Site("en.wikipedia.org")));
+assertFalse(new Site("ta.wikipedia.org").equals("ta.wikipedia.org"));
+}
+
 public void testNormalization() throws Exception {
 assertEquals(new Site("en.wikipedia.org"), new 
Site("en.m.wikipedia.org"));
 assertEquals("bm.wikipedia.org", (new 
Site("bm.wikipedia.org")).getDomain());

-- 
To view, visit https://gerrit.wikimedia.org/r/95844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie081b7f91f62fa52503304643a1f57324d9c9d6d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___

[MediaWiki-commits] [Gerrit] Improve example of prop=proofread API - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/95856


Change subject: Improve example of prop=proofread API
..

Improve example of prop=proofread API

Change-Id: I80d872c8babf1aa393b6e988502fe210aed2c2aa
---
M ApiQueryProofread.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/56/95856/1

diff --git a/ApiQueryProofread.php b/ApiQueryProofread.php
index 19e1f89..ae2a36e 100644
--- a/ApiQueryProofread.php
+++ b/ApiQueryProofread.php
@@ -105,7 +105,7 @@
 
public function getExamples() {
return array(
-   
'api.php?action=query&generator=allpages&gapnamespace=250&prop=proofread'
+   'api.php?action=query&generator=allpages&gapnamespace=' 
. ProofreadPage::getPageNamespaceId() . '&prop=proofread'
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/95856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80d872c8babf1aa393b6e988502fe210aed2c2aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove buttons to move in the image - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/96764


Change subject: Remove buttons to move in the image
..

Remove buttons to move in the image

Change-Id: I521dc44a8820a1de2826defc452bf1fafc73b4ac
---
M modules/page/ext.proofreadpage.page.edit.js
D modules/page/images/Button_pan_down.png
D modules/page/images/Button_pan_left.png
D modules/page/images/Button_pan_right.png
D modules/page/images/Button_pan_up.png
5 files changed, 0 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/64/96764/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 8465f9a..8aea502 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -132,50 +132,6 @@

$zoomImage.prpZoom( 'reset' );
}
}
-   },
-   'move-up': {
-   labelMsg: 
'proofreadpage-button-pan-up-label',
-   type: 'button',
-   icon: iconPath + 
'Button_pan_up.png',
-   action: {
-   type: 'callback',
-   execute: function() {
-   
$zoomImage.prpZoom( 'moveUp' );
-   }
-   }
-   },
-   'move-down': {
-   labelMsg: 
'proofreadpage-button-pan-down-label',
-   type: 'button',
-   icon: iconPath + 
'Button_pan_down.png',
-   action: {
-   type: 'callback',
-   execute: function() {
-   
$zoomImage.prpZoom( 'moveDown' );
-   }
-   }
-   },
-   'move-left': {
-   labelMsg: 
'proofreadpage-button-pan-left-label',
-   type: 'button',
-   icon: iconPath + 
'Button_pan_left.png',
-   action: {
-   type: 'callback',
-   execute: function() {
-   
$zoomImage.prpZoom( 'moveLeft' );
-   }
-   }
-   },
-   'move-right': {
-   labelMsg: 
'proofreadpage-button-pan-right-label',
-   type: 'button',
-   icon: iconPath + 
'Button_pan_right.png',
-   action: {
-   type: 'callback',
-   execute: function() {
-   
$zoomImage.prpZoom( 'moveRight' );
-   }
-   }
}
}
},
diff --git a/modules/page/images/Button_pan_down.png 
b/modules/page/images/Button_pan_down.png
deleted file mode 100644
index 2c4e279..000
--- a/modules/page/images/Button_pan_down.png
+++ /dev/null
Binary files differ
diff --git a/modules/page/images/Button_pan_left.png 
b/modules/page/images/Button_pan_left.png
deleted file mode 100644
index 5dc6967..000
--- a/modules/page/images/Button_pan_left.png
+++ /dev/null
Binary files differ
diff --git a/modules/page/images/Button_pan_right.png 
b/modules/page/images/Button_pan_right.png
deleted file mode 100644
index b1a1819..000
--- a/modules/page/images/Button_pan_right.png
+++ /dev/null
Binary files differ
diff --git a/modules/page/imag

[MediaWiki-commits] [Gerrit] Merge pagePagesRefactoring branch - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/96765


Change subject: Merge pagePagesRefactoring branch
..

Merge pagePagesRefactoring branch

Change-Id: I1df8fcb30f545802ef8af92338f9ea078f23306b
---
M ProofreadPage.body.php
M includes/index/ProofreadIndexPage.php
2 files changed, 1 insertion(+), 556 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/65/96765/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 8ea69d6..9089369 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -201,120 +201,6 @@
} elseif ( $title->inNamespace( NS_MAIN ) ) {
self::prepareArticle( $out );
}
-<<< HEAD   (3fb361 Improve example of prop=proofread API)
-
-   return true;
-   }
-
-   /**
-* @param $out OutputPage
-* @param $m
-* @param $isEdit
-* @return bool
-*/
-   private static function preparePage( $out, $m, $isEdit ) {
-   global $wgUser, $wgExtensionAssetsPath, $wgContLang;
-
-   $pageTitle = $out->getTitle();
-
-   if ( !isset( $pageTitle->prpIndexPage ) ) {
-   self::loadIndex( $pageTitle );
-   }
-
-   $imageTitle = Title::makeTitleSafe( NS_IMAGE, $m[1] );
-   if ( !$imageTitle ) {
-   return true;
-   }
-
-   $fileName = null;
-   $filePage = null;
-
-   $image = wfFindFile( $imageTitle );
-   if ( $image && $image->exists() ) {
-   $fileName = $imageTitle->getPrefixedText();
-
-   $width = $image->getWidth();
-   $height = $image->getHeight();
-   if ( $m[2] ) {
-   $filePage = $wgContLang->parseFormattedNumber( 
$m[3] );
-
-   $params = array( 'width' => $width, 'page' => 
$filePage );
-   $handler = $image->getHandler();
-   if ( $handler && $handler->normaliseParams( 
$image, $params ) ) {
-   $thumbName = $image->thumbName( $params 
);
-   $fullURL = $image->getThumbUrl( 
$thumbName );
-   } else {
-   $fullURL = $image->getViewURL();
-   }
-   } else {
-   $fullURL = $image->getViewURL();
-   }
-   $scan_link = Html::element( 'a',
-   array(
-   'href' => $fullURL,
-   'title' =>  $out->msg( 
'proofreadpage_image' )->text()
-   ),
-   $out->msg( 'proofreadpage_image' )->text()
-   );
-   } else {
-   $width = 0;
-   $height = 0;
-   $fullURL = '';
-   $scan_link = '';
-   }
-
-   $path = $wgExtensionAssetsPath . '/ProofreadPage';
-   $jsVars = array(
-   'proofreadPageWidth' => intval( $width ),
-   'proofreadPageHeight' => intval( $height ),
-   'proofreadPageURL' => $fullURL,
-   'proofreadPageFileName' => $fileName,
-   'proofreadPageFilePage' => $filePage,
-   'proofreadPageIsEdit' => intval( $isEdit ),
-   'proofreadPageScanLink' => $scan_link,
-   'proofreadPageAddButtons' => $wgUser->isAllowed( 
'pagequality' ),
-   'proofreadPageUserName' => $wgUser->getName(),
-   'proofreadPageIndexLink' => '',
-   'proofreadPageNextLink' => '',
-   'proofreadPagePrevLink' => '',
-   'proofreadPageEditWidth' => '',
-   'proofreadPageHeader' => '',
-   'proofreadPageFooter' => '',
-   'proofreadPageCss' => ''
-   );
-
-   $indexPage = $out->getTitle()->prpIndexPage;
-   if ( $indexPage !== null ) {
-   list( $prevTitle, $nextTitle ) = 
$indexPage->getPreviousAndNextPages( $out->getTitle() );
-   if ( $prevTitle !== null ) {
-   $jsVars['proofreadPagePrevLink'] = 
Linker::link( $prevTitle,
-   Html::element( 'img', array( 'src' => 
$path . '/leftarrow.png',
-   'alt' => $out->msg( 
'proofreadpage_nextpage' )->text(), 

[MediaWiki-commits] [Gerrit] Add custom DifferenceEngine for Page: pages - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97210


Change subject: Add custom DifferenceEngine for Page: pages
..

Add custom DifferenceEngine for Page: pages

Change-Id: I813fb2f56dd6057f4b87a53fa5f3945f4772875c
---
M ProofreadPage.php
A includes/ProofreadDiffFormatterUtils.php
M includes/page/ProofreadPageContentHandler.php
A includes/page/ProofreadPageDifferenceEngine.php
A tests/includes/ProofreadDiffFormatterUtilsTest.php
5 files changed, 229 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/10/97210/1

diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..f08edcf 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -45,6 +45,7 @@
 $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
 $wgAutoloadClasses['ProofreadPageRenderer'] = $dir . 
'includes/ProofreadPageRenderer.php';
+$wgAutoloadClasses['ProofreadDiffFormatterUtils'] = $dir . 
'includes/ProofreadDiffFormatterUtils.php';
 
 $wgAutoloadClasses['EditProofreadIndexPage'] = $dir . 
'includes/index/EditProofreadIndexPage.php';
 $wgAutoloadClasses['ProofreadIndexEntry'] = $dir . 
'includes/index/ProofreadIndexEntry.php';
@@ -61,6 +62,7 @@
 $wgAutoloadClasses['ProofreadPageEditAction'] = $dir . 
'includes/page/ProofreadPageEditAction.php';
 $wgAutoloadClasses['ProofreadPageSubmitAction'] = $dir . 
'includes/page/ProofreadPageSubmitAction.php';
 $wgAutoloadClasses['ProofreadPageViewAction'] = $dir . 
'includes/page/ProofreadPageViewAction.php';
+$wgAutoloadClasses['ProofreadPageDifferenceEngine'] = $dir . 
'includes/page/ProofreadPageDifferenceEngine.php';
 
 $wgExtensionCredits['other'][] = array(
'path'   => __FILE__,
@@ -194,6 +196,7 @@
$files[] = $dir . 'page/ProofreadPageContentTest.php';
$files[] = $dir . 'page/ProofreadPageContentHandlerTest.php';
$files[] = $dir . 'page/ProofreadPagePageTest.php';
+   $files[] = $dir . 'ProofreadDiffFormatterUtilsTest.php';
 
return true;
 };
diff --git a/includes/ProofreadDiffFormatterUtils.php 
b/includes/ProofreadDiffFormatterUtils.php
new file mode 100644
index 000..b567c54
--- /dev/null
+++ b/includes/ProofreadDiffFormatterUtils.php
@@ -0,0 +1,82 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup ProofreadPage
+ */
+
+/**
+ * Utility functions to format diffs
+ */
+class ProofreadDiffFormatterUtils {
+
+   /**
+* Create an header in the two columns
+*
+* @param $text string the header text
+* @return string
+*/
+   public function createHeader( $text ) {
+   return Html::openElement( 'tr' ) .
+   Html::element( 'td', array( 'colspan' => '2', 'class' => 
'diff-lineno' ), $text ) .
+   Html::element( 'td', array( 'colspan' => '2', 'class' => 
'diff-lineno' ), $text ) .
+   Html::closeElement( 'tr' );
+   }
+
+   /**
+* Output an added line
+*
+* @param $content string the content of the line
+* @return string
+*/
+   public function createAddedLine( $content ) {
+   return $this->createLineWrapper(
+   Html::element( 'ins',  array( 'class' => 'diffchange 
diffchange-inline' ), $content ),
+   'diff-addedline',
+   '+'
+   );
+   }
+
+   /**
+* Output a deleted line
+*
+* @param $content string the content of the line
+* @return string
+*/
+   public function createDeletedLine( $content ) {
+   return $this->createLineWrapper(
+   Html::element( 'del',  array( 'class' => 
'diffchange diffchange-inline' ), $content ),
+   'diff-deletedline',
+   '-'
+   );
+   }
+
+   /**
+* Create the container for a line
+*
+* @param $line string the line
+* @param $class string the container class (diff-deletedline or 
diff-addedline)
+* @param $marker string the diff marker (+ or -)
+* @return string
+*/
+   protected function createLineWrapper( $line, $class, $marker ) {
+   return Html::element( 'td', array( 'class' => 'diff-marker' ), 
$marker ) .
+   Html::openElement( 'td', array( 'class' => $class ) ).
+   Html::rawelement( 'div', array(), $line ) .
+   Html::closeElement( 'td' );
+   }
+}
\ No newline at end of file
diff --git a/includes/page/ProofreadPageContentHandler.php 
b/includes/page/ProofreadPageContentHandler.php
index c6b16d1..38f3cb6 100644
--- a/includes/page/ProofreadPageContentHandler.php
+++ b/includes/pag

[MediaWiki-commits] [Gerrit] Add @covers annotation - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97234


Change subject: Add @covers annotation
..

Add @covers annotation

Change-Id: I050679e9b29fadb59bc20257b2959dbd9c9bff40
---
M tests/includes/index/ProofreadIndexPageTest.php
M tests/includes/page/ProofreadPageContentHandlerTest.php
M tests/includes/page/ProofreadPageContentTest.php
M tests/includes/page/ProofreadPageLevelTest.php
M tests/includes/page/ProofreadPagePageTest.php
5 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/34/97234/1

diff --git a/tests/includes/index/ProofreadIndexPageTest.php 
b/tests/includes/index/ProofreadIndexPageTest.php
index 47c8408..882930b 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group ProofreadPage
+ * @covers ProofreadIndexPage
  */
 class ProofreadIndexPageTest extends ProofreadPageTestCase {
 
diff --git a/tests/includes/page/ProofreadPageContentHandlerTest.php 
b/tests/includes/page/ProofreadPageContentHandlerTest.php
index dd4b38d..a3dc432 100644
--- a/tests/includes/page/ProofreadPageContentHandlerTest.php
+++ b/tests/includes/page/ProofreadPageContentHandlerTest.php
@@ -2,13 +2,14 @@
 
 /**
  * @group ProofreadPage
+ * @covers ProofreadPageContentHandler
  */
 class ProofreadPageContentHandlerTest extends ProofreadPageTestCase {
 
/**
 * @var ContentHandler
 */
-   var $handler;
+   protected $handler;
 
public function setUp() {
parent::setUp();
diff --git a/tests/includes/page/ProofreadPageContentTest.php 
b/tests/includes/page/ProofreadPageContentTest.php
index d213520..6d4a5be 100644
--- a/tests/includes/page/ProofreadPageContentTest.php
+++ b/tests/includes/page/ProofreadPageContentTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group ProofreadPage
+ * @covers ProofreadPageContent
  */
 class ProofreadPageContentTest extends ProofreadPageTestCase {
 
diff --git a/tests/includes/page/ProofreadPageLevelTest.php 
b/tests/includes/page/ProofreadPageLevelTest.php
index 89ad2aa..5da473a 100644
--- a/tests/includes/page/ProofreadPageLevelTest.php
+++ b/tests/includes/page/ProofreadPageLevelTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group ProofreadPage
+ * @covers ProofreadPageLevel
  */
 class ProofreadPageLevelTest extends ProofreadPageTestCase {
 
diff --git a/tests/includes/page/ProofreadPagePageTest.php 
b/tests/includes/page/ProofreadPagePageTest.php
index 483a848..c1b1347 100644
--- a/tests/includes/page/ProofreadPagePageTest.php
+++ b/tests/includes/page/ProofreadPagePageTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group ProofreadPage
+ * @covers ProofreadPagePage
  */
 class ProofreadPagePageTest extends ProofreadPageTestCase {
 

-- 
To view, visit https://gerrit.wikimedia.org/r/97234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I050679e9b29fadb59bc20257b2959dbd9c9bff40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove unneeded use of global variables - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97294


Change subject: Remove unneeded use of global variables
..

Remove unneeded use of global variables

Change-Id: If486cafcf7bba3ed43839d7e400f88d741aa945b
---
M ProofreadPage.body.php
M includes/ProofreadPageInit.php
M includes/ProofreadPageRenderer.php
M includes/index/EditProofreadIndexPage.php
M includes/index/ProofreadIndexPage.php
5 files changed, 29 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/94/97294/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 9089369..1b72a4e 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -774,12 +774,10 @@
/**
 * Add the links to previous, next, index page and scan image to Page: 
pages.
 * @param $skin SkinTemplate object
-* @param $links Structured navigation links
+* @param $links array structured navigation links
 */
public static function onSkinTemplateNavigation( &$skin, &$links ) {
-   global $wgOut;
-
-   $title = $wgOut->getTitle();
+   $title = $skin->getTitle();
if( !$title->inNamespace( self::getPageNamespaceId() ) ) {
return true;
}
diff --git a/includes/ProofreadPageInit.php b/includes/ProofreadPageInit.php
index 380c2e8..3155162 100644
--- a/includes/ProofreadPageInit.php
+++ b/includes/ProofreadPageInit.php
@@ -116,10 +116,9 @@
 * @return array
 */
protected static function getNamespaceName( $key, $lang = '' ) {
-   global $proofreadPageNamespacesNames;
+   global $proofreadPageNamespacesNames, $wgLanguageCode;
 
if ( $lang === '' ) {
-   global $wgLanguageCode;
$lang = $wgLanguageCode;
}
return isset( $proofreadPageNamespacesNames[$lang][$key] )
diff --git a/includes/ProofreadPageRenderer.php 
b/includes/ProofreadPageRenderer.php
index a812a13..690c8bd 100644
--- a/includes/ProofreadPageRenderer.php
+++ b/includes/ProofreadPageRenderer.php
@@ -30,8 +30,6 @@
 * @return string
 */
public static function renderPageList( $input, $args, $parser ) {
-   global $wgContLang;
-
$title = $parser->getTitle();
if ( !$title->inNamespace( ProofreadPage::getIndexNamespaceId() 
) ) {
return '';
@@ -69,9 +67,10 @@
}
 
$n = strlen( $count ) - mb_strlen( $view );
+   $language = $parser->getTargetLanguage();
if ( $n && ( $mode == 'normal' || $mode == 'empty' ) ) {
$txt = '';
-   $pad = $wgContLang->formatNum( 0, true );
+   $pad = $language->formatNum( 0, true );
for ( $j = 0; $j < $n; $j++ ) {
$txt = $txt . $pad;
}
@@ -98,8 +97,6 @@
 * @return string
 */
public static function renderPages( $input, $args, $parser ) {
-   global $wgContLang;
-
$pageNamespaceId = ProofreadPage::getPageNamespaceId();
 
// abort if this is nested  call
@@ -144,6 +141,7 @@
$parser->getOutput()->addTemplate( $index_title, 
$index_title->getArticleID(), $index_title->getLatestRevID() );
 
$out = '';
+   $language = $parser->getTargetLanguage();
 
list( $links, $params ) = $indexPage->getPages();
 
@@ -151,9 +149,9 @@
$pages = array();
 
if( empty( $links ) ) {
-   $from = ( $from === null ) ? null : 
$wgContLang->parseFormattedNumber( $from );
-   $to = ( $to === null ) ? null : 
$wgContLang->parseFormattedNumber( $to );
-   $step = ( $step === null ) ? null : 
$wgContLang->parseFormattedNumber( $step );
+   $from = ( $from === null ) ? null : 
$language->parseFormattedNumber( $from );
+   $to = ( $to === null ) ? null : 
$language->parseFormattedNumber( $to );
+   $step = ( $step === null ) ? null : 
$language->parseFormattedNumber( $step );
 
$imageTitle = Title::makeTitleSafe( NS_IMAGE, 
$index );
if ( !$imageTitle ) {
diff --git a/includes/index/EditProofreadIndexPage.php 
b/includes/index/EditProofreadIndexPage.php
index 21a50d6..41785ba 100644
--- a/includes/index/EditProofreadIndexPage.php
+++ b/includes/index/EditProofreadIndexPage.php
@@ -29,9 +29,8 @@
 * Add cust

[MediaWiki-commits] [Gerrit] Explode ProofreadPageRenderer into smaller not static classes - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/97295


Change subject: Explode ProofreadPageRenderer into smaller not static classes
..

Explode ProofreadPageRenderer into smaller not static classes

Change-Id: I92819deffa9c9579ae26e58fe67c737dc1c888f8
---
M ProofreadPage.body.php
M ProofreadPage.php
A includes/parser/ProofreadPagelistTagParser.php
R includes/parser/ProofreadPagesTagParser.php
A includes/parser/ProofreadParser.php
A includes/parser/ProofreadTagParser.php
6 files changed, 215 insertions(+), 95 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/95/97295/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 1b72a4e..9554bdd 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -139,9 +139,9 @@
 * @param Parser $parser
 * @return boolean hook return value
 */
-   public static function onParserFirstCallInit( $parser ) {
-   $parser->setHook( 'pagelist', array( 'ProofreadPageRenderer', 
'renderPageList' ) );
-   $parser->setHook( 'pages', array( 'ProofreadPageRenderer', 
'renderPages' ) );
+   public static function onParserFirstCallInit( Parser $parser ) {
+   $parser->setHook( 'pagelist', array( 'ProofreadParser', 
'renderPagelistTag' ) );
+   $parser->setHook( 'pages', array( 'ProofreadParser', 
'renderPagesTag' ) );
return true;
}
 
diff --git a/ProofreadPage.php b/ProofreadPage.php
index f32e9a1..0657619 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -44,7 +44,6 @@
 
 $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
-$wgAutoloadClasses['ProofreadPageRenderer'] = $dir . 
'includes/ProofreadPageRenderer.php';
 
 $wgAutoloadClasses['EditProofreadIndexPage'] = $dir . 
'includes/index/EditProofreadIndexPage.php';
 $wgAutoloadClasses['ProofreadIndexEntry'] = $dir . 
'includes/index/ProofreadIndexEntry.php';
@@ -62,6 +61,11 @@
 $wgAutoloadClasses['ProofreadPageSubmitAction'] = $dir . 
'includes/page/ProofreadPageSubmitAction.php';
 $wgAutoloadClasses['ProofreadPageViewAction'] = $dir . 
'includes/page/ProofreadPageViewAction.php';
 
+$wgAutoloadClasses['ProofreadParser'] = $dir . 
'includes/parser/ProofreadParser.php';
+$wgAutoloadClasses['ProofreadTagParser'] = $dir . 
'includes/parser/ProofreadTagParser.php';
+$wgAutoloadClasses['ProofreadPagelistTagParser'] = $dir . 
'includes/parser/ProofreadPagelistTagParser.php';
+$wgAutoloadClasses['ProofreadPagesTagParser'] = $dir . 
'includes/parser/ProofreadPagesTagParser.php';
+
 $wgExtensionCredits['other'][] = array(
'path'   => __FILE__,
'name'   => 'ProofreadPage',
diff --git a/includes/parser/ProofreadPagelistTagParser.php 
b/includes/parser/ProofreadPagelistTagParser.php
new file mode 100644
index 000..577de45
--- /dev/null
+++ b/includes/parser/ProofreadPagelistTagParser.php
@@ -0,0 +1,88 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup ProofreadPage
+ */
+
+/**
+ * Parser for the  tag
+ */
+class ProofreadPagelistTagParser extends ProofreadTagParser {
+
+   /**
+* @see ProofreadParser::render
+*/
+   public function render( $input, array $args ) {
+   $title = $this->parser->getTitle();
+   if ( !$title->inNamespace( ProofreadPage::getIndexNamespaceId() 
) ) {
+   return '';
+   }
+   $imageTitle = Title::makeTitleSafe( NS_IMAGE, $title->getText() 
);
+   if ( !$imageTitle ) {
+   return '' . wfMessage( 
'proofreadpage_nosuch_file' )->inContentLanguage()->escaped() . '';
+   }
+
+   $image = wfFindFile( $imageTitle );
+   if ( !( $image && $image->isMultipage() && $image->pageCount() 
) ) {
+   return '' . wfMessage( 
'proofreadpage_nosuch_file' )->inContentLanguage()->escaped() . '';
+   }
+
+   $return = '';
+
+   $name = $imageTitle->getDBkey();
+   $count = $image->pageCount();
+
+   $from = array_key_exists( 'from', $args ) ? $args['from'] : 1;
+   $to = array_key_exists( 'to', $args ) ? $args['to'] : $count;
+
+   if( !is_numeric( $from ) || !is_numeric( $to ) ) {
+   return '' . wfMessage( 
'proofreadpage_number_expected' )->inContentLanguage()->escaped() . '';
+   }
+   if( ( $from > $to ) || ( $from < 1 ) || ( $to < 1 ) || ( $to > 
$count ) ) {
+   return '' . wfMessage( 
'proofreadpage_invalid_interval' )->inContentLanguage()->escaped() . 
'';
+   }
+
+   for ( $i = $from; $i < $to + 1; $i++ ) {
+   list( $view, $link

[MediaWiki-commits] [Gerrit] Makes zoom system work with IE 8 - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102401


Change subject: Makes zoom system work with IE 8
..

Makes zoom system work with IE 8

Change-Id: I8837a60c88b63313acf91bfe4e39571d033bfb17
---
M modules/jquery/jquery.prpZoom.js
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/01/102401/1

diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index 6134fb8..79b1ef6 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -28,7 +28,7 @@
animationDuration: 10
},
 
-   'default': { //quotes needed for IE
+   defaultDimensions: {
width: 0,
height: 0
},
@@ -58,20 +58,20 @@
 
_create: function() {
//config params
-   this.default = {
+   this.defaultDimensions = {
width: this.element.width(),
height: this.element.height()
};
this.zoomStep = {
-   width: this.options.zoomStep * 
this.default.width / 100,
-   height: this.options.zoomStep * 
this.default.height / 100
+   width: this.options.zoomStep * 
this.defaultDimensions.width / 100,
+   height: this.options.zoomStep * 
this.defaultDimensions.height / 100
};
 
//setup area
this.element.parent().css( {
position: 'relative',
overflow: 'auto',
-   height: this.default.height,
+   height: this.defaultDimensions.height,
cursor: 'move'
} );
 
@@ -115,8 +115,8 @@
this._applyPosition( {
top: 0,
left: 0,
-   width: this.default.width,
-   height: this.default.height
+   width: this.defaultDimensions.width,
+   height: this.defaultDimensions.height
} );
},
 

-- 
To view, visit https://gerrit.wikimedia.org/r/102401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8837a60c88b63313acf91bfe4e39571d033bfb17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Addition of a parser test for page= parameter of image inclu... - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102475


Change subject: Addition of a parser test for page= parameter of image inclusion
..

Addition of a parser test for page= parameter of image inclusion

Change-Id: I53fd7b54e765d5f349abe74481bbc6f62f2b349e
---
M tests/TestsAutoLoader.php
M tests/parser/parserTest.inc
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/NewParserTest.php
A tests/phpunit/mocks/media/MockDjVuHandler.php
5 files changed, 129 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/75/102475/1

diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 46a894c..efd80c1 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -91,6 +91,7 @@
'MockBitmapHandler' => 
"$testDir/phpunit/mocks/media/MockBitmapHandler.php",
'MockImageHandler' => 
"$testDir/phpunit/mocks/media/MockImageHandler.php",
'MockSvgHandler' => "$testDir/phpunit/mocks/media/MockSvgHandler.php",
+   'MockDjVuHandler' => "$testDir/phpunit/mocks/media/MockDjVuHandler.php",
 
# tests/phpunit/languages
'LanguageClassesTestCase' => 
"$testDir/phpunit/languages/LanguageClassesTestCase.php",
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 39fa09e..76e93dc 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -979,6 +979,44 @@
'sha1' => wfBaseConvert( '3', 16, 36, 31 ),
'fileExists' => true
), $this->db->timestamp( '20010115123500' ), $user );
+
+   # A DjVu file
+   $image = wfLocalFile( Title::makeTitle( NS_FILE, 
'LoremIpsum.djvu' ) );
+   $image->recordUpload2( '', 'Upload a DjVu', 'A DjVu', array(
+   'size' => 3249,
+   'width' => 2480,
+   'height' => 3508,
+   'media_type' => MEDIATYPE_BITMAP,
+   'mime' => 'image/vnd.djvu',
+   'metadata' => '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+',
+   'sha1' => 
'613762766a7175787334383033726b7a323464353334347868706b30337632',
+   'fileExists' => true
+   ), $this->db->timestamp( '20010115123600' ), $user );
}
 
public function teardownDatabase() {
@@ -1057,6 +1095,8 @@
file_put_contents( "$dir/f/ff/Foobar.svg",
'' .
'http://www.w3.org/2000/svg"; />' );
+   wfMkdirParents( $dir . '/5/5f', null, __METHOD__ );
+   copy( "$IP/tests/phpunit/data/media/LoremIpsum.djvu", 
"$dir/5/5f/LoremIpsum.djvu" );
return $dir;
}
 
@@ -1106,6 +1146,8 @@
 
"$dir/0/09/Bad.jpg",
 
+   "$dir/5/5f/LoremIpsum.svg",
+
"$dir/f/ff/Foobar.svg",

"$dir/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png",

"$dir/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png",
@@ -1136,6 +1178,8 @@
"$dir/thumb/f/",
"$dir/0/09/",
"$dir/0/",
+   "$dir/5/5f",
+   "$dir/5",
"$dir/thumb",
"$dir/math/f/a/5",
"$dir/math/f/a",
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index cc935da..5ec98c7 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -14115,6 +14115,15 @@
 !!end
 
 !! test
+Image with page parameter
+!! input
+[[File:LoremIpsum.djvu|page=2]]
+!! result
+http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-2480px-LoremIpsum.djvu.jpg";
 width="2480" height="3508" 
srcset="http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-3720px-LoremIpsum.djvu.jpg
 1.5x, 
http://example.com/images/thumb/5/5f/LoremIpsum.djvu/page2-4960px-LoremIpsum.djvu.jpg
 2x" />
+
+!! end
+
+!! test
 Another italics / bold test
 !! input
  ''' ''x'
diff --git a/tests/phpunit/includes/parser/NewParserTest.php 
b/tests/phpunit/includes/parser/NewParserTest.php
index 124b477..dd2cd25 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -130,6 +130,9 @@
// Vector images have to be handled slightly differently
$tmpGlobals['wgMediaHandlers']['image/svg+xml'] = 
'MockSvgHandler';
 
+   // DjVu images have to be handled slightly differently
+   $tmpGlobals['wgMediaHandlers']['image/vnd.djvu'] = 
'MockDjVuHandler';
+
$tmpHooks = $wgHooks;
$tmpHooks['ParserTestParser'][] = 'P

[MediaWiki-commits] [Gerrit] (bug 58870) Add the level tag even if an other autosummary i... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/103349


Change subject: (bug 58870) Add the level tag even if an other autosummary is 
created
..

(bug 58870) Add the level tag even if an other autosummary is created

Change-Id: Icc14fc0d06aa9fbdced64436185a4f510b2aff26
---
M includes/page/ProofreadPageContent.php
M includes/page/ProofreadPageContentHandler.php
M includes/page/ProofreadPageLevel.php
M tests/includes/page/ProofreadPageContentHandlerTest.php
M tests/includes/page/ProofreadPageLevelTest.php
5 files changed, 17 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/49/103349/1

diff --git a/includes/page/ProofreadPageContent.php 
b/includes/page/ProofreadPageContent.php
index 8217bfc..739ffc8 100644
--- a/includes/page/ProofreadPageContent.php
+++ b/includes/page/ProofreadPageContent.php
@@ -239,7 +239,7 @@
$parserOutput->addCategory(
Title::makeTitleSafe(
NS_CATEGORY,
-   wfMessage( 'proofreadpage_quality' . 
$this->level->getLevel() . '_category' )->inContentLanguage()->text()
+   $this->level->getLevelCategoryName()
)->getDBkey(),
$title->getText()
);
diff --git a/includes/page/ProofreadPageContentHandler.php 
b/includes/page/ProofreadPageContentHandler.php
index 5d0f825..223b90c 100644
--- a/includes/page/ProofreadPageContentHandler.php
+++ b/includes/page/ProofreadPageContentHandler.php
@@ -174,11 +174,10 @@
$summary = parent::getAutosummary( $oldContent, $newContent, 
$flags );
 
if (
-   $summary === '' &&
$newContent instanceof ProofreadPageContent &&
( $oldContent === null || $oldContent instanceof 
ProofreadPageContent && !$newContent->getLevel()->equals( 
$oldContent->getLevel() ) )
) {
-   $summary = '/*' . wfMessage( 'proofreadpage_quality' . 
$newContent->getLevel()->getLevel() . '_category' )->plain() . '*/';
+   $summary = trim( '/*' . 
$newContent->getLevel()->getLevelCategoryName() . '*/ ' . $summary );
}
 
return $summary;
diff --git a/includes/page/ProofreadPageLevel.php 
b/includes/page/ProofreadPageLevel.php
index c93fce9..0aaf51a 100644
--- a/includes/page/ProofreadPageLevel.php
+++ b/includes/page/ProofreadPageLevel.php
@@ -122,4 +122,11 @@
return ( $user === false ) ? null : $user;
}
}
+
+   /**
+* @return string
+*/
+   public function getLevelCategoryName() {
+   return wfMessage( 'proofreadpage_quality' . $this->level . 
'_category' )->inContentLanguage()->plain();
+   }
 }
\ No newline at end of file
diff --git a/tests/includes/page/ProofreadPageContentHandlerTest.php 
b/tests/includes/page/ProofreadPageContentHandlerTest.php
index 836d8bb..d0f08bb 100644
--- a/tests/includes/page/ProofreadPageContentHandlerTest.php
+++ b/tests/includes/page/ProofreadPageContentHandlerTest.php
@@ -105,7 +105,7 @@
),
array(
null,
-   ProofreadPageContentTest::newContent( '', '', 
'', 1 ),
+   ProofreadPageContentTest::newContent( '', 
'aaa', '', 1 ),
'/*Not proofread*/'
),
array(
diff --git a/tests/includes/page/ProofreadPageLevelTest.php 
b/tests/includes/page/ProofreadPageLevelTest.php
index 7d5229f..aed0632 100644
--- a/tests/includes/page/ProofreadPageLevelTest.php
+++ b/tests/includes/page/ProofreadPageLevelTest.php
@@ -104,4 +104,11 @@
$this->assertEquals( $user, 
ProofreadPageLevel::getUserFromUserName( $name ) );
}
 
+   /**
+* @dataProvider nameProvider
+*/
+   public function testGetLevelCategoryName() {
+   $level = new ProofreadPageLevel( 1, null );
+   $this->assertEquals( 'Not proofread', 
$level->getLevelCategoryName() );
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/103349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc14fc0d06aa9fbdced64436185a4f510b2aff26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add limitation to the zoom scale factor - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/104313


Change subject: Add limitation to the zoom scale factor
..

Add limitation to the zoom scale factor

Change-Id: I8a9e6059dfa13506b12b878c279ca6192918fde9
---
M modules/jquery/jquery.prpZoom.js
1 file changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/13/104313/1

diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index 79b1ef6..4423c81 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -25,7 +25,9 @@
 
options: {
zoomStep: 6,
-   animationDuration: 10
+   animationDuration: 10,
+   minScaleFactor: 0.2,
+   maxScaleFactor: 10
},
 
defaultDimensions: {
@@ -54,6 +56,10 @@
width: Math.round( position.width ),
height: Math.round( position.height )
}, this.options.animationDuration );
+   },
+
+   _getScaleFactor: function( position ) {
+   return position.width / this.defaultDimensions.width;
},
 
_create: function() {
@@ -134,6 +140,12 @@
position.top -=  proportion * this.zoomStep.height;
position.width += 2 *  proportion * this.zoomStep.width;
position.height += 2 *  proportion * 
this.zoomStep.height;
+
+   var scaleFactor = this._getScaleFactor( position );
+   if( this.options.minScaleFactor > scaleFactor || 
scaleFactor > this.options.maxScaleFactor ) {
+   return;
+   }
+
this._applyPosition( position );
},
 

-- 
To view, visit https://gerrit.wikimedia.org/r/104313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a9e6059dfa13506b12b878c279ca6192918fde9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add redlink=1 to previous and next page links if needed - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/104403


Change subject: Add redlink=1 to previous and next page links if needed
..

Add redlink=1 to previous and next page links if needed

Bug 59097
Change-Id: If7fe5d096308ed382ceccab9ed557360a25375b3
---
M ProofreadPage.body.php
1 file changed, 11 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/03/104403/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index a59b511..4b135f3 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -829,39 +829,36 @@
list( $prevTitle, $nextTitle ) = 
$indexPage->getPreviousAndNextPages( $page->getTitle() );
 
if ( $prevTitle !== null ) {
-   if ( !$prevTitle->exists() ) {
-   $prevLink = $prevTitle->getEditURL();
-   } else {
-   $prevLink = $prevTitle->getLinkUrl();
-   }
$links['namespaces']['proofreadPagePrevLink'] = 
array(
'class' => ( $skin->skinname === 
'vector' ) ? 'icon' : '',
-   'href' => $prevLink,
+   'href' => self::getLinkUrlForTitle( 
$prevTitle ),
'text' => wfMessage( 
'proofreadpage_prevpage' )->plain()
);
}
 
if ( $nextTitle !== null ) {
-   if ( !$nextTitle->exists() ) {
-   $nextLink = $nextTitle->getEditURL();
-   } else {
-   $nextLink = $nextTitle->getLinkUrl();
-   }
$links['namespaces']['proofreadPageNextLink'] = 
array(
'class' => ( $skin->skinname === 
'vector' ) ? 'icon' : '',
-   'href' => $nextLink,
+   'href' => self::getLinkUrlForTitle( 
$nextTitle ),
'text' => wfMessage( 
'proofreadpage_nextpage' )->plain()
);
}
 
-   $indexLink = $indexPage->getTitle()->getLinkUrl();
$links['namespaces']['proofreadPageIndexLink'] = array(
'class' => ( $skin->skinname === 'vector' ) ? 
'icon' : '',
-   'href' => $indexLink,
+   'href' => $indexPage->getTitle()->getLinkUrl(),
'text' => wfMessage( 'proofreadpage_index' 
)->plain()
);
}
 
return true;
}
+
+   protected static function getLinkUrlForTitle( Title $title ) {
+   if ( $title->exists() ) {
+   return $title->getLinkUrl();
+   } else {
+   return $title->getLinkUrl( 'action=edit&redlink=1' );
+   }
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/104403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7fe5d096308ed382ceccab9ed557360a25375b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Prevent the browser to scroll while zooming with mouse - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100122


Change subject: Prevent the browser to scroll while zooming with mouse
..

Prevent the browser to scroll while zooming with mouse

Removes the laggy effect

Change-Id: I06c312255f47042f3a3c81e01830cfaf42153c3f
---
M modules/jquery/jquery.prpZoom.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/22/100122/1

diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index cbde94c..84ea913 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -26,7 +26,7 @@
options: {
zoomStep: 6,
moveStep: 6,
-   animationDuration: 200
+   animationDuration: 10
},
 
default: {
@@ -105,6 +105,7 @@
} else if( event.deltaY < 0 ) {
$( this ).prpZoom( 'zoomIn' );
}
+   event.preventDefault(); //Don't scroll while 
zooming
}
},
 

-- 
To view, visit https://gerrit.wikimedia.org/r/100122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06c312255f47042f3a3c81e01830cfaf42153c3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make pages without index use text layer extraction and defau... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100138


Change subject: Make pages without index use text layer extraction and default 
header and footer
..

Make pages without index use text layer extraction and default header and footer

Change-Id: I7535683ae40c42891864d2b9e4e4054010d88fe5
---
M includes/page/EditProofreadPagePage.php
1 file changed, 35 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/38/100138/1

diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
index d2c9d26..b83994e 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -63,38 +63,47 @@
 * @see EditPage::showContentForm
 */
protected function getContentObject( $def_content = null ) {
+   if ( $this->mTitle->exists() ) {
+   return parent::getContentObject( $def_content );
+   }
+
//preload content
-   if ( !$this->mTitle->exists() ) {
-   $index = $this->pagePage->getIndex();
-   if ( $index ) {
-   $params = array(
-   'pagenum' => 
$index->getDisplayedPageNumber( $this->getTitle() )
-   );
-   $header = 
$index->replaceVariablesWithIndexEntries( 'header', $params );
-   $body = '';
-   $footer = 
$index->replaceVariablesWithIndexEntries( 'footer', $params );
+   $index = $this->pagePage->getIndex();
+   $body = '';
 
-   //Extract text layer
-   $image = $index->getImage();
-   $pageNumber = $this->pagePage->getPageNumber();
-   if ( $image && $pageNumber !== null && 
$image->exists() ) {
-   $text = 
$image->getHandler()->getPageText( $image, $pageNumber );
-   if ( $text ) {
-   $text = preg_replace( 
"/(n)/", "\n", $text );
-   $body = preg_replace( 
"/(\d*)/", '', $text );
-   }
-   }
+   //default header and footer
+   if ( $index ) {
+   $params = array(
+   'pagenum' => $index->getDisplayedPageNumber( 
$this->getTitle() )
+   );
+   $header = $index->replaceVariablesWithIndexEntries( 
'header', $params );
+   $footer = $index->replaceVariablesWithIndexEntries( 
'footer', $params );
+   } else {
+   $header = wfMessage( 'proofreadpage_default_header' 
)->inContentLanguage()->plain();
+   $footer = wfMessage( 'proofreadpage_default_footer' 
)->inContentLanguage()->plain();
+   }
 
-   return new ProofreadPageContent(
-   new WikitextContent( $header ),
-   new WikitextContent( $body ),
-   new WikitextContent( $footer ),
-   new ProofreadPageLevel()
-   );
+   //Extract text layer
+   $image = $this->pagePage->getImage();
+   $pageNumber = $this->pagePage->getPageNumber();
+   if ( $image && $image->exists() ) {
+   if ( $pageNumber !== null && $image->isMultipage() ) {
+   $text = $image->getHandler()->getPageText( 
$image, $pageNumber );
+   } else {
+   $text = $image->getHandler()->getPageText( 
$image, 1 );
+   }
+   if ( $text ) {
+   $text = preg_replace( "/(n)/", "\n", $text 
);
+   $body = preg_replace( "/(\d*)/", '', $text 
);
}
}
 
-   return parent::getContentObject( $def_content );
+   return new ProofreadPageContent(
+   new WikitextContent( $header ),
+   new WikitextContent( $body ),
+   new WikitextContent( $footer ),
+   new ProofreadPageLevel()
+   );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/100138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7535683ae40c42891864d2b9e4e4054010d88fe5
Gerrit-PatchSe

[MediaWiki-commits] [Gerrit] Use JavaScript to add the level change tag in order to keep ... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100152


Change subject: Use JavaScript to add the level change tag in order to keep the 
existing process
..

Use JavaScript to add the level change tag in order to keep the existing process

Change-Id: I55d17817d80be8af675796d9f4bbac9db4480a03
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/52/100152/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index 0d63ce9..a4b8e38 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -88,6 +88,16 @@
}
 
/**
+* Init the automatic fill of the summary input box
+*/
+   function setupPageQuality() {
+   $( 'input[name="wpQuality"]' ).click( function() {
+   var text = mw.message( 'proofreadpage_quality' + 
this.value + '_category').plain();
+   $( '#wpSummary' ).val( '/* ' + text + ' */ ' );
+   } );
+   }
+
+   /**
 * Add some buttons to the toolbar
 */
function addButtons() {
@@ -235,6 +245,7 @@
initEnvironment();
setupWikiEditor();
setupPreferences();
+   setupPageQuality();
addButtons();
} );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/100152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55d17817d80be8af675796d9f4bbac9db4480a03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix failure in IE 8 - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100407


Change subject: Fix failure in IE 8
..

Fix failure in IE 8

Change-Id: Ia0accba2f41006b38d4bae1a3d65922433129882
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/07/100407/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index a4b8e38..f7fe78f 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -196,7 +196,7 @@
src: def.icon,
alt: mw.msg( 
def.labelMsg ),
title: mw.msg( 
def.labelMsg ),
-   class: 
'mw-toolbar-editbutton'
+   'class': 
'mw-toolbar-editbutton' //quotes needed for IE
} )
.click( 
def.action.execute )
.appendTo( $toolbar );

-- 
To view, visit https://gerrit.wikimedia.org/r/100407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0accba2f41006b38d4bae1a3d65922433129882
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ProofreadPage to master - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100408


Change subject: Update ProofreadPage to master
..

Update ProofreadPage to master

Change-Id: Id59ddba0ab662444eaf26ec7da64dc9886e8b709
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/100408/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 7f886e8..3b55cd8 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 7f886e8d6d95e7a4eafed665c901c805d623b18d
+Subproject commit 3b55cd8fcd43423f35e8b3bcb7f99141fe4442e4

-- 
To view, visit https://gerrit.wikimedia.org/r/100408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id59ddba0ab662444eaf26ec7da64dc9886e8b709
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf6
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add tabindex to wpTextbox1 in Page: pages editor - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100562


Change subject: Add tabindex to wpTextbox1 in Page: pages editor
..

Add tabindex to wpTextbox1 in Page: pages editor

Change-Id: Id38030b1600ca1810b310796e117adc8f0104d80
---
M includes/page/EditProofreadPagePage.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/62/100562/1

diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
index b83994e..997bb6a 100644
--- a/includes/page/EditProofreadPagePage.php
+++ b/includes/page/EditProofreadPagePage.php
@@ -138,7 +138,7 @@
'prp-page-edit-body',
'proofreadpage_body',
$content->getBody()->serialize(),
-   $inputAttributes
+   $inputAttributes + array( 'tabindex' => '1' )
);
$this->showEditArea(
'wpFooterTextbox',

-- 
To view, visit https://gerrit.wikimedia.org/r/100562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id38030b1600ca1810b310796e117adc8f0104d80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix yet another issue with old IE and Safari versions - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100791


Change subject: Fix yet another issue with old IE and Safari versions
..

Fix yet another issue with old IE and Safari versions

Change-Id: I243b8445d96ff5d510f5f43b61bab20e54492251
---
M modules/jquery/jquery.prpZoom.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/91/100791/1

diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index 84ea913..8ce2506 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -29,7 +29,7 @@
animationDuration: 10
},
 
-   default: {
+   'default': { //quotes needed for IE
width: 0,
height: 0
},

-- 
To view, visit https://gerrit.wikimedia.org/r/100791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I243b8445d96ff5d510f5f43b61bab20e54492251
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allows to keep user as null throw API edit - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/100793


Change subject: Allows to keep user as null throw API edit
..

Allows to keep user as null throw API edit

Change-Id: I77385c4ee3115ad83fc4d1d6753049cf30fcdf8b
---
M ProofreadPage.body.php
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/93/100793/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index cd43f36..a59b511 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -697,13 +697,15 @@
$oldContent = $article->getPage()->getContent( 
Revision::FOR_THIS_USER, $user );
$newContent = $contentHandler->unserializeContent( $text, 
$editPage->getTitle(), $editPage->contentFormat );
 
-   if ( !$newContent->isValid() || 
$newContent->getLevel()->getUser() === null ) {
-   $resultArr['badpage'] = wfMessage( 
'proofreadpage_badpagetext' )->text();
-   return false;
-   }
-
if ( $oldContent === null ) {
$oldContent = $contentHandler->makeEmptyContent();
+   }
+   $oldLevel = $oldContent->getLevel();
+   $newLevel = $newContent->getLevel();
+
+   if ( !$newContent->isValid() || $newLevel->getUser() === null 
&& $oldLevel->getUser() !== null ) {
+   $resultArr['badpage'] = wfMessage( 
'proofreadpage_badpagetext' )->text();
+   return false;
}
 
$oldLevel = $oldContent->getLevel();
@@ -711,7 +713,7 @@
//if the user change the level, the change should be allowed 
and the new User should be the editing user
if (
!$newLevel->equals( $oldLevel ) &&
-   ( $newLevel->getUser()->getName() !== $user->getName() 
|| !$oldLevel->isChangeAllowed( $newLevel ) )
+   ( $newLevel->getUser() === null || 
$newLevel->getUser()->getName() !== $user->getName() || 
!$oldLevel->isChangeAllowed( $newLevel ) )
) {
$resultArr['notallowed'] = wfMessage( 
'proofreadpage_notallowedtext' )->text();
return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/100793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77385c4ee3115ad83fc4d1d6753049cf30fcdf8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Increase scan size on horizontal edit mode - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/101481


Change subject: Increase scan size on horizontal edit mode
..

Increase scan size on horizontal edit mode

Change-Id: I14c2728ed77ceb62ee7d02341faa9a8f0f1586ff
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/81/101481/1

diff --git a/modules/page/ext.proofreadpage.page.edit.js 
b/modules/page/ext.proofreadpage.page.edit.js
index f7fe78f..92f5e3f 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -60,7 +60,7 @@
$container.css( {
width: '100%',
overflow: 'auto',
-   height: $( window ).height() / 3 + 'px'
+   height: $( window ).height() / 2.7 + 'px'
} );
$editForm.find( '.prp-page-content' ).css( {
width: '100%'

-- 
To view, visit https://gerrit.wikimedia.org/r/101481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14c2728ed77ceb62ee7d02341faa9a8f0f1586ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove dead code in zoom system - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/101482


Change subject: Remove dead code in zoom system
..

Remove dead code in zoom system

Change-Id: Ia2d36a8962348190b604dee71c798a79a06fd4e2
---
M modules/jquery/jquery.prpZoom.js
1 file changed, 0 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/82/101482/1

diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index 8ce2506..ca0c4ac 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -25,7 +25,6 @@
 
options: {
zoomStep: 6,
-   moveStep: 6,
animationDuration: 10
},
 
@@ -35,11 +34,6 @@
},
 
zoomStep: {
-   width: 0,
-   height: 0
-   },
-
-   moveStep: {
width: 0,
height: 0
},
@@ -69,10 +63,6 @@
this.zoomStep = {
width: this.options.zoomStep * 
this.default.width / 100,
height: this.options.zoomStep * 
this.default.height / 100
-   };
-   this.moveStep = {
-   width: this.options.moveStep * 
this.default.width / 100,
-   height: this.options.moveStep * 
this.default.height / 100
};
 
//setup area
@@ -132,30 +122,6 @@
position.top -=  proportion * this.zoomStep.height;
position.width += 2 *  proportion * this.zoomStep.width;
position.height += 2 *  proportion * 
this.zoomStep.height;
-   this._applyPosition( position );
-   },
-
-   moveLeft: function () {
-   var position = this._getPosition();
-   position.left -= this.moveStep.width;
-   this._applyPosition( position );
-   },
-
-   moveRight: function () {
-   var position = this._getPosition();
-   position.left += this.moveStep.width;
-   this._applyPosition( position );
-   },
-
-   moveUp: function () {
-   var position = this._getPosition();
-   position.top -= this.moveStep.height;
-   this._applyPosition( position );
-   },
-
-   moveDown: function () {
-   var position = this._getPosition();
-   position.top += this.moveStep.height;
this._applyPosition( position );
},
 

-- 
To view, visit https://gerrit.wikimedia.org/r/101482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2d36a8962348190b604dee71c798a79a06fd4e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adds a label for Page: pages content - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/101678


Change subject: Adds a label for Page: pages content
..

Adds a label for Page: pages content

Change-Id: Iad9aac252b9e525cbae28e725c44591115208043
---
M ProofreadPage.i18n.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/78/101678/1

diff --git a/ProofreadPage.i18n.php b/ProofreadPage.i18n.php
index 6f1f70c..28311ee 100644
--- a/ProofreadPage.i18n.php
+++ b/ProofreadPage.i18n.php
@@ -90,6 +90,7 @@
'proofreadpage-indexoai-error-schemanotfound' => 'Schema not found',
'proofreadpage-indexoai-error-schemanotfound-text' => 'The $1 schema 
have not been found.',
'proofreadpage-disambiguationspage' => 'Template:disambig',
+   'content-model-proofread-page' => 'Page: page',
 );
 
 /** Message documentation (Message documentation)
@@ -194,6 +195,7 @@
 
 {{doc-important|Don\'t translate the "Template:" part!}}
 {{Identical|Template:disambig}}',
+   'content-model-proofread-page' => 'The name for Page: pages item 
content model, used when describing what type of content a page contains.',
 );
 
 /** Achinese (Acèh)

-- 
To view, visit https://gerrit.wikimedia.org/r/101678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9aac252b9e525cbae28e725c44591115208043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Activate zoom on mouse wheel only when the user have double-... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/101679


Change subject: Activate zoom on mouse wheel only when the user have 
double-clicked
..

Activate zoom on mouse wheel only when the user have double-clicked

Change-Id: I9c58ad45a141e03c1bde3d681d6b11c75e45
---
M modules/jquery/jquery.prpZoom.js
1 file changed, 22 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/79/101679/1

diff --git a/modules/jquery/jquery.prpZoom.js b/modules/jquery/jquery.prpZoom.js
index 8ce2506..7937058 100644
--- a/modules/jquery/jquery.prpZoom.js
+++ b/modules/jquery/jquery.prpZoom.js
@@ -44,6 +44,8 @@
height: 0
},
 
+   zoomOnMouseWheelActivated: false,
+
_getPosition: function() {
var position = this.element.position();
position.width = this.element.width();
@@ -92,20 +94,30 @@
this.reset();
 
var element = this.element;
-   $.each( this._events, function( event, handler ) {
+   $.each( this._events(), function( event, handler ) {
element.bind( event, handler );
} );
},
 
-   _events: {
-   //depends on jquery.mousewheel.js
-   'mousewheel': function( event ) {
-   if( event.deltaY > 0 ) {
-   $( this ).prpZoom( 'zoomOut' );
-   } else if( event.deltaY < 0 ) {
-   $( this ).prpZoom( 'zoomIn' );
+   _events: function() {
+   var prpZoom = this;
+   return {
+   'dblclick': function( event ) {
+   prpZoom.zoomOnMouseWheelActivated = 
!prpZoom.zoomOnMouseWheelActivated;
+   },
+   //depends on jquery.mousewheel.js
+   'mousewheel': function( event ) {
+   if( !prpZoom.zoomOnMouseWheelActivated 
) {
+   return;
+   }
+
+   if( event.deltaY > 0 ) {
+   prpZoom.zoomOut();
+   } else if( event.deltaY < 0 ) {
+   prpZoom.zoomIn();
+   }
+   event.preventDefault(); //Don't scroll 
while zooming
}
-   event.preventDefault(); //Don't scroll while 
zooming
}
},
 
@@ -177,7 +189,7 @@
} );
 
var element = this.element;
-   $.each( this._events, function( event, handler ) {
+   $.each( this._events(), function( event, handler ) {
element.unbind( event, handler );
} );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/101679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c58ad45a141e03c1bde3d681d6b11c75e45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add FileProvider - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106507


Change subject: Add FileProvider
..

Add FileProvider

Change-Id: Iddde2458c4eddc97f5f8c2febf632cc6454086e0
---
M ProofreadPage.php
A includes/FileNotFoundException.php
A includes/FileProvider.php
M includes/index/ProofreadIndexPage.php
M includes/page/ProofreadPagePage.php
A tests/includes/FileProviderTest.php
6 files changed, 250 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/07/106507/1

diff --git a/ProofreadPage.php b/ProofreadPage.php
index 3bbb36a..76e9ceb 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -46,6 +46,8 @@
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
 $wgAutoloadClasses['ProofreadPageRenderer'] = $dir . 
'includes/ProofreadPageRenderer.php';
 $wgAutoloadClasses['ProofreadDiffFormatterUtils'] = $dir . 
'includes/ProofreadDiffFormatterUtils.php';
+$wgAutoloadClasses['ProofreadPage\FileNotFoundException'] = $dir . 
'includes/FileNotFoundException.php';
+$wgAutoloadClasses['ProofreadPage\FileProvider'] = $dir . 
'includes/FileProvider.php';
 
 $wgAutoloadClasses['EditProofreadIndexPage'] = $dir . 
'includes/index/EditProofreadIndexPage.php';
 $wgAutoloadClasses['ProofreadIndexEntry'] = $dir . 
'includes/index/ProofreadIndexEntry.php';
@@ -194,6 +196,7 @@
$dir = __DIR__ . '/tests/includes/';
 
$files[] = $dir . 'ProofreadPageTestCase.php';
+   $files[] = $dir . 'FileProviderTest.php';
 
$files[] = $dir . 'index/ProofreadIndexPageTest.php';
 
diff --git a/includes/FileNotFoundException.php 
b/includes/FileNotFoundException.php
new file mode 100644
index 000..a8cbf09
--- /dev/null
+++ b/includes/FileNotFoundException.php
@@ -0,0 +1,13 @@
+repoGroup = $repoGroup;
+   }
+
+   /**
+* @param ProofreadIndexPage $page
+* @return File
+* @throws FileNotFoundException
+*/
+   public function getForIndexPage( ProofreadIndexPage $page ) {
+   return $this->getFileFromTitle(
+   Title::makeTitle( NS_IMAGE, 
$page->getTitle()->getText() )
+   );
+   }
+
+   /**
+* @param ProofreadIndexPage $page
+* @return File
+* @throws FileNotFoundException
+*/
+   public function getForPagePage( ProofreadPagePage $page ) {
+   //try to get an image with the same name as the file
+   return $this->getFileFromTitle(
+   Title::makeTitle( NS_IMAGE, strtok( 
$page->getTitle()->getText(), '/' ) ) //use the base name as file name
+   );
+   }
+
+   /**
+* @param Title $title
+* @return File
+* @throws FileNotFoundException
+*/
+   protected function getFileFromTitle( Title $title ) {
+   $result = $this->repoGroup->findFile( $title );
+   if ( $result === false ) {
+   throw new FileNotFoundException();
+   }
+   return $result;
+   }
+}
\ No newline at end of file
diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 03c39c7..1362608 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -19,6 +19,9 @@
  * @ingroup ProofreadPage
  */
 
+use ProofreadPage\FileNotFoundException;
+use ProofreadPage\FileProvider;
+
 /**
  * An index page
  */
@@ -45,7 +48,6 @@
protected $config = array();
 
/**
-* Constructor
 * @param $title Title Reference to a Title object.
 * @param $config array the configuration array (see 
ProofreadIndexPage::getDataConfig)
 * @param $text string content of the page. Warning: only done for 
EditProofreadIndexPage use.
@@ -75,11 +77,15 @@
 
/**
 * Return Scan of the book if it exist or false.
-* @return Image|false
+* @return File|false
 */
public function getImage() {
-   $imageTitle = Title::makeTitle( NS_IMAGE, 
$this->title->getText() );
-   return wfFindFile( $imageTitle );
+   try {
+   $provider = new FileProvider( RepoGroup::singleton() );
+   return $provider->getForIndexPage( $this );
+   } catch( FileNotFoundException $e ) {
+   return false;
+   }
}
 
/**
diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
index 437a6fd..8633ead 100644
--- a/includes/page/ProofreadPagePage.php
+++ b/includes/page/ProofreadPagePage.php
@@ -19,6 +19,9 @@
  * @ingroup ProofreadPage
  */
 
+use ProofreadPage\FileNotFoundException;
+use ProofreadPage\FileProvider;
+
 /**
  * The content of a page page
  */
@@ -39,12 +42,6 @@
protected $index;
 

[MediaWiki-commits] [Gerrit] Refactoring of Page: pages edition PHP code - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106524


Change subject: Refactoring of Page: pages edition PHP code
..

Refactoring of Page: pages edition PHP code

Change-Id: Ibe8f1d37d8a8d9cf99d96e67dbd7c464103a6e02
---
M ProofreadPage.php
A includes/page/EditPagePage.php
D includes/page/EditProofreadPagePage.php
A includes/page/PageContentBuilder.php
A includes/page/PageEditAction.php
A includes/page/PageSubmitAction.php
M includes/page/ProofreadPageContentHandler.php
D includes/page/ProofreadPageEditAction.php
D includes/page/ProofreadPageSubmitAction.php
M tests/includes/index/ProofreadIndexPageTest.php
A tests/includes/page/PageContentBuilderTest.php
11 files changed, 479 insertions(+), 356 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/24/106524/1

diff --git a/ProofreadPage.php b/ProofreadPage.php
index 3bbb36a..39ab6c8 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -54,13 +54,14 @@
 $wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir . 
'includes/index/ProofreadIndexDbConnector.php';
 
 $wgAutoloadClasses['ProofreadPageDbConnector'] = $dir . 
'includes/page/ProofreadPageDbConnector.php';
-$wgAutoloadClasses['EditProofreadPagePage'] = $dir . 
'includes/page/EditProofreadPagePage.php';
+$wgAutoloadClasses['ProofreadPage\Page\EditPagePage'] = $dir . 
'includes/page/EditPagePage.php';
+$wgAutoloadClasses['ProofreadPage\Page\PageContentBuilder'] = $dir . 
'includes/page/PageContentBuilder.php';
 $wgAutoloadClasses['ProofreadPagePage'] = 
$dir.'includes/page/ProofreadPagePage.php';
 $wgAutoloadClasses['ProofreadPageContent'] = 
$dir.'includes/page/ProofreadPageContent.php';
 $wgAutoloadClasses['ProofreadPageLevel'] = 
$dir.'includes/page/ProofreadPageLevel.php';
 $wgAutoloadClasses['ProofreadPageContentHandler'] = 
$dir.'includes/page/ProofreadPageContentHandler.php';
-$wgAutoloadClasses['ProofreadPageEditAction'] = $dir . 
'includes/page/ProofreadPageEditAction.php';
-$wgAutoloadClasses['ProofreadPageSubmitAction'] = $dir . 
'includes/page/ProofreadPageSubmitAction.php';
+$wgAutoloadClasses['ProofreadPage\Page\PageEditAction'] = $dir . 
'includes/page/PageEditAction.php';
+$wgAutoloadClasses['ProofreadPage\Page\PageSubmitAction'] = $dir . 
'includes/page/PageSubmitAction.php';
 $wgAutoloadClasses['ProofreadPageViewAction'] = $dir . 
'includes/page/ProofreadPageViewAction.php';
 $wgAutoloadClasses['ProofreadPageDifferenceEngine'] = $dir . 
'includes/page/ProofreadPageDifferenceEngine.php';
 
@@ -201,6 +202,7 @@
$files[] = $dir . 'page/ProofreadPageContentTest.php';
$files[] = $dir . 'page/ProofreadPageContentHandlerTest.php';
$files[] = $dir . 'page/ProofreadPagePageTest.php';
+   $files[] = $dir . 'page/PageContentBuilderTest.php';
$files[] = $dir . 'ProofreadDiffFormatterUtilsTest.php';
 
return true;
diff --git a/includes/page/EditPagePage.php b/includes/page/EditPagePage.php
new file mode 100644
index 000..9815f08
--- /dev/null
+++ b/includes/page/EditPagePage.php
@@ -0,0 +1,229 @@
+pagePage = $pagePage;
+   $this->pageContentBuilder = new PageContentBuilder( 
$this->mArticle->getContext() );
+
+   if ( !$this->isSupportedContentModel( $this->contentModel ) ) {
+   throw new MWException(
+   'The content model ' . 
ContentHandler::getLocalizedName( $this->contentModel ) . ' is not supported'
+   );
+   }
+   }
+
+   /**
+* @see EditPage::isSectionEditSupported
+*/
+   protected function isSectionEditSupported() {
+   return false; // sections and forms don't mix
+   }
+
+   /**
+* @see EditPage::isSupportedContentModel
+*/
+   public function isSupportedContentModel( $modelId ) {
+   return $modelId === CONTENT_MODEL_PROOFREAD_PAGE;
+   }
+
+   /**
+* Load the content before edit
+*
+* @see EditPage::showContentForm
+*/
+   protected function getContentObject( $def_content = null ) {
+   if ( !$this->mTitle->exists() ) {
+   return 
$this->pageContentBuilder->buildDefaultContentForPage( $this->pagePage );
+   }
+   return parent::getContentObject( $def_content );
+   }
+
+   /**
+* @see EditPage::showContentForm
+*/
+   protected function showContentForm() {
+   $out = $this->mArticle->getContext()->getOutput();
+
+   //custom CSS for preview
+   $css = $this->pagePage->getCustomCss();
+   if ( $css !== '' ) {
+   $out->addInlineStyle( $css );
+   }
+
+   $inputAttributes = array();
+   if ( wfReadOnly() ) {
+   $inputAttributes['readonly'] = '';
+

[MediaWiki-commits] [Gerrit] Fix i18n message error in Page: pages diff - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/106674


Change subject: Fix i18n message error in Page: pages diff
..

Fix i18n message error in Page: pages diff

Change-Id: Ib785296ac3520036873853dfd227e5e3b790ac42
---
M includes/page/ProofreadPageDifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/74/106674/1

diff --git a/includes/page/ProofreadPageDifferenceEngine.php 
b/includes/page/ProofreadPageDifferenceEngine.php
index f19ae3d..4e74bba 100644
--- a/includes/page/ProofreadPageDifferenceEngine.php
+++ b/includes/page/ProofreadPageDifferenceEngine.php
@@ -64,7 +64,7 @@
return '';
}
 
-   return $this->diffFormatterUtils->createHeader( $this->msg( 
'pproofreadpage_page_status' )->text() ) .
+   return $this->diffFormatterUtils->createHeader( $this->msg( 
'proofreadpage_page_status' )->text() ) .
Html::openElement( 'tr' ) .
$this->diffFormatterUtils->createDeletedLine(
$this->msg( 'proofreadpage_quality' . 
$old->getLevel() . '_category' )->plain(),

-- 
To view, visit https://gerrit.wikimedia.org/r/106674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib785296ac3520036873853dfd227e5e3b790ac42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve tags parser code - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/113165

Change subject: Improve tags parser code
..

Improve tags parser code

Removes a duplicate file

Change-Id: Ib44682281a7fb2d473c07e7cec7852b4755b15d8
---
M includes/Parser/PagelistTagParser.php
M includes/Parser/PagesTagParser.php
M includes/Parser/ParserEntryPoint.php
M includes/Parser/TagParser.php
D includes/parser/ParserEntryPoint.php
5 files changed, 38 insertions(+), 61 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/65/113165/1

diff --git a/includes/Parser/PagelistTagParser.php 
b/includes/Parser/PagelistTagParser.php
index a3939e3..1c9de85 100644
--- a/includes/Parser/PagelistTagParser.php
+++ b/includes/Parser/PagelistTagParser.php
@@ -17,17 +17,17 @@
 */
public function render( $input, array $args ) {
$title = $this->parser->getTitle();
-   if ( !$title->inNamespace( ProofreadPage::getIndexNamespaceId() 
) ) {
+   if ( !$title->inNamespace( 
$this->context->getIndexNamespaceId() ) ) {
return '';
}
$imageTitle = Title::makeTitleSafe( NS_IMAGE, $title->getText() 
);
if ( !$imageTitle ) {
-   return '' . wfMessage( 
'proofreadpage_nosuch_file' )->inContentLanguage()->escaped() . '';
+   return $this->formatError( 'proofreadpage_nosuch_file' 
);
}
 
$image = wfFindFile( $imageTitle );
if ( !( $image && $image->isMultipage() && $image->pageCount() 
) ) {
-   return '' . wfMessage( 
'proofreadpage_nosuch_file' )->inContentLanguage()->escaped() . '';
+   return $this->formatError( 'proofreadpage_nosuch_file' 
);
}
 
$return = '';
@@ -39,10 +39,10 @@
$to = array_key_exists( 'to', $args ) ? $args['to'] : $count;
 
if( !is_numeric( $from ) || !is_numeric( $to ) ) {
-   return '' . wfMessage( 
'proofreadpage_number_expected' )->inContentLanguage()->escaped() . '';
+   return $this->formatError( 
'proofreadpage_number_expected' );
}
if( ( $from > $to ) || ( $from < 1 ) || ( $to < 1 ) || ( $to > 
$count ) ) {
-   return '' . wfMessage( 
'proofreadpage_invalid_interval' )->inContentLanguage()->escaped() . 
'';
+   return $this->formatError( 
'proofreadpage_invalid_interval' );
}
 
for ( $i = $from; $i < $to + 1; $i++ ) {
diff --git a/includes/Parser/PagesTagParser.php 
b/includes/Parser/PagesTagParser.php
index cd6efff..a527f9b 100644
--- a/includes/Parser/PagesTagParser.php
+++ b/includes/Parser/PagesTagParser.php
@@ -18,7 +18,7 @@
 * @see TagParser::render
 */
public function render( $input, array $args ) {
-   $pageNamespaceId = ProofreadPage::getPageNamespaceId();
+   $pageNamespaceId = $this->context->getPageNamespaceId();
 
// abort if this is nested  call
if ( isset( $this->parser->proofreadRenderingPages ) && 
$this->parser->proofreadRenderingPages ) {
@@ -37,7 +37,7 @@
$onlysection = array_key_exists( 'onlysection', $args ) ? 
$args['onlysection'] : null;
 
// abort if the tag is on an index page
-   if ( $this->parser->getTitle()->inNamespace( 
ProofreadPage::getIndexNamespaceId() ) ) {
+   if ( $this->parser->getTitle()->inNamespace( 
$this->context->getIndexNamespaceId() ) ) {
return '';
}
// abort too if the tag is in the page namespace
@@ -51,11 +51,11 @@
}
 
if( !$index ) {
-   return '' . wfMessage( 
'proofreadpage_index_expected' )->inContentLanguage()->escaped() . '';
+   return $this->formatError( 
'proofreadpage_index_expected' );
}
-   $index_title = Title::makeTitleSafe( 
ProofreadPage::getIndexNamespaceId(), $index );
+   $index_title = Title::makeTitleSafe( 
$this->context->getIndexNamespaceId(), $index );
if( !$index_title || !$index_title->exists() ) {
-   return '' . wfMessage( 
'proofreadpage_nosuch_index' )->inContentLanguage()->escaped() . '';
+   return $this->formatError( 'proofreadpage_nosuch_index' 
);
}
$indexPage = ProofreadIndexPage::newFromTitle( $index_title );
 
@@ -76,11 +76,11 @@
 
$imageTitle = Title::makeTitleSafe( NS_IMAGE, 
$index );
if ( !$imageTitle ) {
-   return '' . 
wfMessage( 'proofreadpage_nosuch_file' )->inCon

[MediaWiki-commits] [Gerrit] Adds inprop=preload support - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/113166

Change subject: Adds inprop=preload support
..

Adds inprop=preload support

Bug 58963
Change-Id: Ic68d9be120d23386cb0e95849a850ae6eada0e64
---
M ProofreadPage.body.php
M ProofreadPage.php
2 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/66/113166/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 7d2fe80..46fca8e 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -20,6 +20,7 @@
  */
 
 use ProofreadPage\Context;
+use ProofreadPage\Page\PageContentBuilder;
 
 /*
  @todo :
@@ -721,6 +722,25 @@
}
 
/**
+* Provides text for preload API
+*
+* @param string $text
+* @param Title $title
+* @return bool
+*/
+   public static function onEditFormPreloadText( &$text, Title $title ) {
+   if ( !$title->inNamespace( self::getPageNamespaceId() ) ) {
+   return true;
+   }
+
+   $pageContentBuilder = new PageContentBuilder( 
RequestContext::getMain(), Context::getDefaultContext() );
+   $content = $pageContentBuilder->buildDefaultContentForPage( new 
ProofreadPagePage( $title ) );
+   $text = $content->serialize();
+
+   return true;
+   }
+
+   /**
 * Add ProofreadPage preferences to the preferences menu
 * @param $user
 * @param $preferences array
diff --git a/ProofreadPage.php b/ProofreadPage.php
index 6d599c9..9434478 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -192,6 +192,7 @@
 $wgHooks['SkinTemplateNavigation'][] = 
'ProofreadPage::onSkinTemplateNavigation';
 $wgHooks['ContentHandlerDefaultModelFor'][] = 
'ProofreadPage::onContentHandlerDefaultModelFor';
 $wgHooks['APIEditBeforeSave'][] = 'ProofreadPage::onAPIEditBeforeSave';
+$wgHooks['EditFormPreloadText'][] = 'ProofreadPage::onEditFormPreloadText';
 
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/113166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic68d9be120d23386cb0e95849a850ae6eada0e64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Separated data fetching from presentation in function load_i... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: Separated data fetching from presentation in function 
load_index in ProofreadPage.body.php
..


Separated data fetching from presentation in function load_index in 
ProofreadPage.body.php

Will do the same for other functions also.
Change-Id: I9e067185529af2d259cfbeb84c3c3db66d2ddd95
---
M .gitignore
M ProofreadPage.body.php
M ProofreadPage.php
A includes/index/ProofreadIndexDbConnector.php
4 files changed, 45 insertions(+), 28 deletions(-)

Approvals:
  Tpt: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/.gitignore b/.gitignore
index 98b092a..f610f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *~
 *.kate-swp
 .*.swp
+.htaccess
+
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 4d37b7f..7e763b2 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -136,22 +136,6 @@
}
 
/**
-* @param $updater DatabaseUpdater
-* @return bool
-*/
-   public static function onLoadExtensionSchemaUpdates( $updater = null ) {
-   $base = dirname( __FILE__ );
-   if ( $updater === null ) {
-   global $wgExtNewTables;
-   $wgExtNewTables[] = array( 'pr_index', 
"$base/ProofreadPage.sql" );
-   } else {
-   $updater->addExtensionUpdate( array( 'addTable', 
'pr_index',
-   "$base/ProofreadPage.sql", true ) );
-   }
-   return true;
-   }
-
-   /**
 * Query the database to find if the current page is referred in an 
Index page.
 * @param $title Title
 */
@@ -159,17 +143,7 @@
list( $page_namespace, $index_namespace ) = 
self::getPageAndIndexNamespace();
 
$title->pr_index_title = null;
-   $dbr = wfGetDB( DB_SLAVE );
-   $result = $dbr->select(
-   array( 'page', 'pagelinks' ),
-   array( 'page_namespace', 'page_title' ),
-   array(
-   'pl_namespace' => $title->getNamespace(),
-   'pl_title' => $title->getDBkey(),
-   'pl_from=page_id'
-   ),
-   __METHOD__
-   );
+   $result = ProofreadIndexDbConnector::getRowsFromTitle( $title );
 
foreach ( $result as $x ) {
$ref_title = Title::makeTitle( $x->page_namespace, 
$x->page_title );
diff --git a/ProofreadPage.php b/ProofreadPage.php
index e066366..359f986 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -40,6 +40,7 @@
 $wgExtensionMessagesFiles['ProofreadPageAlias'] = $dir . 
'ProofreadPage.alias.php';
 
 $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
+$wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir . 
'includes/index/ProofreadIndexDbConnector.php';
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
 
 
@@ -143,7 +144,7 @@
 $wgHooks['EditFormPreloadText'][] = 'ProofreadPage::onEditFormPreloadText';
 $wgHooks['ArticlePurge'][] = 'ProofreadPage::onArticlePurge';
 $wgHooks['SpecialMovepageAfterMove'][] = 
'ProofreadPage::onSpecialMovepageAfterMove';
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'ProofreadPage::onLoadExtensionSchemaUpdates';
+$wgHooks['LoadExtensionSchemaUpdates'][] = 
'ProofreadIndexDbConnector::onLoadExtensionSchemaUpdates';
 $wgHooks['EditPage::importFormData'][] = 
'ProofreadPage::onEditPageImportFormData';
 $wgHooks['OutputPageParserOutput'][] = 
'ProofreadPage::onOutputPageParserOutput';
 $wgHooks['wgQueryPages'][] = 'ProofreadPage::onwgQueryPages';
diff --git a/includes/index/ProofreadIndexDbConnector.php 
b/includes/index/ProofreadIndexDbConnector.php
new file mode 100644
index 000..7453102
--- /dev/null
+++ b/includes/index/ProofreadIndexDbConnector.php
@@ -0,0 +1,40 @@
+addExtensionUpdate( array( 'addTable', 
'pr_index',
+   "$base/ProofreadPage.sql", true ) );
+   }
+   return true;
+   }
+
+   /**
+* Query the database to find if the current page is referred in an 
Index page.
+* @param $title Title
+* @return ResultWrapper
+*/
+   public static function getRowsFromTitle( $title ) {
+   $dbr = wfGetDB( DB_SLAVE );
+   $result = $dbr->select(
+   array( 'page', 'pagelinks' ),
+   array( 'page_namespace', 'page_title' ),
+   array(
+   'pl_namespace' => $title->getNamespace(),
+   'pl_title' => $title->getDBkey(),
+   'pl_from=page_id'
+   ),
+   __METHOD__
+ 

[MediaWiki-commits] [Gerrit] (bug 49386) Add support for ′ and ″ to the globeCoordinate p... - change (mediawiki...DataValues)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/67966


Change subject: (bug 49386) Add support for ′ and ″ to the globeCoordinate 
parser
..

(bug 49386) Add support for ′ and ″ to the globeCoordinate parser

Change-Id: I1da162d5892de0498faaa1fc3bab97431398b297
---
M DataValues/resources/globeCoordinate.js/src/globeCoordinate.parser.js
M DataValues/resources/globeCoordinate.js/tests/globeCoordinate.parser.tests.js
2 files changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/66/67966/1

diff --git 
a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.parser.js 
b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.parser.js
index 3b7387c..52f4ab7 100644
--- a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.parser.js
+++ b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.parser.js
@@ -451,7 +451,7 @@
if (result3 !== null) {
result4 = 
parse_integer();
if (result4 !== 
null) {
-   if 
(input.charCodeAt(pos) === 39) {
+   if 
(input.charCodeAt(pos) === 39 || input.charCodeAt(pos) === 8242) { //' and ′

result5 = "'";

pos++;
} else {
@@ -490,24 +490,27 @@

result8 = parse_postdot();

if (result8 !== null) {

result9 = [];
-   
if (/^['"]/.test(input.charAt(pos))) {
+   
var quoteIds = [34, 39, 8242, 8243]; //", ', ′ and ″
+   
if (quoteIds.indexOf(input.charCodeAt(pos)) !== -1) {
+console.log(input.charAt(pos));

result10 = input.charAt(pos);

pos++;

} else {

result10 = null;

if (reportFailures === 0) {
-   
matchFailed("['\"]");
+   
matchFailed("['\"′″]");

}

}

while (result10 !== null) {

result9.push(result10);
-   
if (/^['"]/.test(input.charAt(pos))) {
+   
if (quoteIds.indexOf(input.charCodeAt(pos)) !== 
-1) {
+console.log(input.charAt(pos));

result10 = input.charAt(pos);

pos++;

} else {

r

[MediaWiki-commits] [Gerrit] Set "Index" and "Page" as canonical names for Index and Page... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: Set "Index" and "Page" as canonical names for Index and Page 
namespaces.
..


Set "Index" and "Page" as canonical names for Index and Page namespaces.

Change-Id: Ie0800246e7b995ec4f3e9d19b0f6705fb72afa1c
---
M ProofreadPage.body.php
M ProofreadPage.php
M includes/ProofreadPageInit.php
3 files changed, 13 insertions(+), 2 deletions(-)

Approvals:
  Tpt: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 4d37b7f..b2f3e85 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -1823,4 +1823,16 @@
}
return true;
}
+
+
+   /**
+* Adds canonical namespaces.
+*/
+   public static function addCanonicalNamespaces( &$list ) {
+   $list[self::getPageNamespaceId()] = 'Page';
+   $list[self::getPageNamespaceId() + 1] = 'Page_talk';
+   $list[self::getIndexNamespaceId()] = 'Index';
+   $list[self::getIndexNamespaceId() + 1] = 'Index_talk';
+   return true;
+   }
 }
diff --git a/ProofreadPage.php b/ProofreadPage.php
index e066366..e2790a2 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -150,6 +150,7 @@
 $wgHooks['GetPreferences'][] = 'ProofreadPage::onGetPreferences';
 $wgHooks['LinksUpdateConstructed'][] = 
'ProofreadPage::onLinksUpdateConstructed';
 $wgHooks['CustomEditor'][] = 'ProofreadPage::onCustomEditor';
+$wgHooks['CanonicalNamespaces'][] = 'ProofreadPage::addCanonicalNamespaces';
 
 
 //inclusion of i18n file. $wgExtensionMessagesFiles[] doesn't works
diff --git a/includes/ProofreadPageInit.php b/includes/ProofreadPageInit.php
index 40beed8..7ea37fa 100644
--- a/includes/ProofreadPageInit.php
+++ b/includes/ProofreadPageInit.php
@@ -105,8 +105,6 @@
$wgExtraNamespaces[$id + 1] = self::getNamespaceName( $key . 
'_talk' );
$wgCanonicalNamespaceNames[$id] = $wgExtraNamespaces[$id]; 
//Very hugly but needed because initNamespaces() is called after the add of 
$wgExtraNamespaces into $wgCanonicalNamespaceNames
$wgCanonicalNamespaceNames[$id + 1] = $wgExtraNamespaces[$id + 
1];
-   $wgNamespaceAliases[$id] = self::getNamespaceName( $key, 'en' );
-   $wgNamespaceAliases[$id + 1] = self::getNamespaceName( $key . 
'_talk', 'en' );
return true;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/66106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0800246e7b995ec4f3e9d19b0f6705fb72afa1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix a message that is not client name free - change (mediawiki...Wikibase)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/69321


Change subject: Fix a message that is not client name free
..

Fix a message that is not client name free

Change-Id: I659e4650f445c8f8d666df3ed8f49ad252a1f7a6
---
M lib/WikibaseLib.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/21/69321/1

diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index dc5d086..4c14310 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -35,7 +35,7 @@
'wikibase-error-remove-connection' => 'A connection error occurred 
while trying to perform remove, and because of this your changes could not be 
completed. Please check your Internet connection.',
'wikibase-error-save-timeout' => 'We are experiencing technical 
difficulties, and because of this your "save" could not be completed.',
'wikibase-error-remove-timeout' => 'We are experiencing technical 
difficulties, and because of this your "remove" could not be completed.',
-   'wikibase-error-autocomplete-connection' => 'Could not query Wikipedia 
API. Please try again later.',
+   'wikibase-error-autocomplete-connection' => 'Could not query site API. 
Please try again later.',
'wikibase-error-autocomplete-response' => 'Server responded: $1',
'wikibase-error-ui-client-error' => 'The connection to the client page 
failed. Please try again later.',
'wikibase-error-ui-no-external-page' => 'The specified article could 
not be found on the corresponding site.',
@@ -114,7 +114,7 @@
'wikibase-sitelinks-sitename-columnheading' => 'Site links table column 
heading for the column containing the language names.
 {{Identical|Language}}',
'wikibase-sitelinks-siteid-columnheading' => 'Site links table column 
heading for the column containing the language codes.',
-   'wikibase-sitelinks-link-columnheading' => 'Site links table column 
heading for the column containg the title/link of/to the referenced (Wikipedia) 
page.',
+   'wikibase-sitelinks-link-columnheading' => 'Site links table column 
heading for the column containg the title/link of/to the referenced (wiki) 
page.',
'wikibase-tooltip-error-details' => 'Link within an error tooltip that 
will unfold additional information regarding the error (i.e. the more specific 
error message returned from the underlying API).
 {{Identical|Details}}',
'datatypes-type-wikibase-item' => 'The name of a data type for items in 
Wikibase.

-- 
To view, visit https://gerrit.wikimedia.org/r/69321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I659e4650f445c8f8d666df3ed8f49ad252a1f7a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Set "Index" and "Page" as canonical names for Index and Page... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/66106


Change subject: Set "Index" and "Page" as canonical names for Index and Page 
namespaces.
..

Set "Index" and "Page" as canonical names for Index and Page namespaces.

Change-Id: Ie0800246e7b995ec4f3e9d19b0f6705fb72afa1c
---
M ProofreadPage.body.php
M ProofreadPage.php
M includes/ProofreadPageInit.php
3 files changed, 13 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/06/66106/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 4d37b7f..b2f3e85 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -1823,4 +1823,16 @@
}
return true;
}
+
+
+   /**
+* Adds canonical namespaces.
+*/
+   public static function addCanonicalNamespaces( &$list ) {
+   $list[self::getPageNamespaceId()] = 'Page';
+   $list[self::getPageNamespaceId() + 1] = 'Page_talk';
+   $list[self::getIndexNamespaceId()] = 'Index';
+   $list[self::getIndexNamespaceId() + 1] = 'Index_talk';
+   return true;
+   }
 }
diff --git a/ProofreadPage.php b/ProofreadPage.php
index e066366..e2790a2 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -150,6 +150,7 @@
 $wgHooks['GetPreferences'][] = 'ProofreadPage::onGetPreferences';
 $wgHooks['LinksUpdateConstructed'][] = 
'ProofreadPage::onLinksUpdateConstructed';
 $wgHooks['CustomEditor'][] = 'ProofreadPage::onCustomEditor';
+$wgHooks['CanonicalNamespaces'][] = 'ProofreadPage::addCanonicalNamespaces';
 
 
 //inclusion of i18n file. $wgExtensionMessagesFiles[] doesn't works
diff --git a/includes/ProofreadPageInit.php b/includes/ProofreadPageInit.php
index 40beed8..7ea37fa 100644
--- a/includes/ProofreadPageInit.php
+++ b/includes/ProofreadPageInit.php
@@ -105,8 +105,6 @@
$wgExtraNamespaces[$id + 1] = self::getNamespaceName( $key . 
'_talk' );
$wgCanonicalNamespaceNames[$id] = $wgExtraNamespaces[$id]; 
//Very hugly but needed because initNamespaces() is called after the add of 
$wgExtraNamespaces into $wgCanonicalNamespaceNames
$wgCanonicalNamespaceNames[$id + 1] = $wgExtraNamespaces[$id + 
1];
-   $wgNamespaceAliases[$id] = self::getNamespaceName( $key, 'en' );
-   $wgNamespaceAliases[$id + 1] = self::getNamespaceName( $key . 
'_talk', 'en' );
return true;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/66106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0800246e7b995ec4f3e9d19b0f6705fb72afa1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 47071) Allow use of the Lua API on a Wikibase repository - change (mediawiki...Wikibase)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62321


Change subject: (bug 47071)  Allow use of the Lua API on a Wikibase repository
..

(bug 47071)  Allow use of the Lua API on a Wikibase repository

Implement a lua API for repositories with only one method
mw.wikibase.getEntityFromId

Change-Id: I689a188e2374ab09d81c60e7edb99646b9472c3a
---
M repo/Wikibase.classes.php
M repo/Wikibase.hooks.php
M repo/Wikibase.php
A repo/includes/WikibaseRepoLibrary.php
A repo/resources/mw.wikibase.lua
5 files changed, 151 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/21/62321/1

diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index 20394f4..e0a5672 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -51,6 +51,7 @@
'Wikibase\PropertyView' => 'includes/PropertyView.php',
'Wikibase\Summary' => 'includes/Summary.php',
'Wikibase\Repo\WikibaseRepo' => 'includes/WikibaseRepo.php',
+   'Scribunto_LuaWikibaseRepoLibrary' => 
'includes/WikibaseRepoLibrary.php',
 
// includes/actions
'Wikibase\HistoryEntityAction' => 
'includes/actions/HistoryEntityAction.php',
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 16501ab..36a1fc3 100755
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -1001,4 +1001,19 @@
 
return false;
}
+
+   /**
+* External library for Scribunto
+*
+* @since 0.4
+*
+* @param $engine
+* @param array $extraLibraries
+* @return bool
+*/
+   public static function onScribuntoExternalLibraries ( $engine, array 
&$extraLibraries ) {
+   $extraLibraries['mw.wikibase'] = 
'Scribunto_LuaWikibaseRepoLibrary';
+
+   return true;
+   }
 }
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index b299d85..c962858 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -163,6 +163,7 @@
 $wgHooks['TitleGetRestrictionTypes'][] = 
'Wikibase\RepoHooks::onTitleGetRestrictionTypes';
 $wgHooks['AbuseFilter-contentToString'][]  = 
'Wikibase\RepoHooks::onAbuseFilterContentToString';
 $wgHooks['SpecialPage_reorderPages'][] = 
'Wikibase\RepoHooks::onSpecialPage_reorderPages';
+$wgHooks['ScribuntoExternalLibraries'][]   = 
'Wikibase\RepoHooks::onScribuntoExternalLibraries';
 
 // Resource Loader Modules:
 $wgResourceModules = array_merge( $wgResourceModules, include( __DIR__ . 
"/resources/Resources.php" ) );
diff --git a/repo/includes/WikibaseRepoLibrary.php 
b/repo/includes/WikibaseRepoLibrary.php
new file mode 100644
index 000..cb6a51c
--- /dev/null
+++ b/repo/includes/WikibaseRepoLibrary.php
@@ -0,0 +1,94 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.4
+ *
+ * @licence GNU GPL v2+
+ * @author Thomas Pellissier Tanon
+ */
+
+use ValueParsers\ParseException;
+use Wikibase\Repo\WikibaseRepo;
+use Wikibase\EntityContentFactory;
+
+
+class Scribunto_LuaWikibaseRepoLibrary extends Scribunto_LuaLibraryBase {
+
+   /**
+* Register mw.wikibase.lua library
+*
+* @since 0.4
+*/
+   public function register() {
+   $lib = array(
+   'getEntity' => array( $this, 'getEntity' )
+   );
+   $this->getEngine()->registerInterface( dirname( __FILE__ ) . 
'/../resources/' . 'mw.wikibase.lua', $lib, array() );
+   }
+
+   /**
+* Get entity from prefixed ID (e.g. "Q23") and return it as serialized 
array.
+*
+* @since 0.4
+*
+* @param string $prefixedEntityId
+*
+* @return array $entityArr
+*/
+   public function getEntity( $prefixedEntityId = null ) {
+   $this->checkType( 'getEntity', 1, $prefixedEntityId, 'string' );
+   $prefixedEntityId = trim( $prefixedEntityId );
+
+   $entityIdParser = 
WikibaseRepo::getDefaultInstance()->getEntityIdParser();
+
+   try {
+   $entityId = $entityIdParser->parse( $prefixedEntityId );
+   }
+   catch ( ParseException $parseException ) {
+   throw $this->getEngine()->newException( 
'wikibase-error-invalid-entity-id' );
+   }
+
+   $entityContent = EntityContentFactory::singleton()->getFromId( 
$entityId );
+
+   if ( $entityContent == null ) {
+   return array( null );
+   }
+
+   $entityTitle = $entityContent->getTitle();
+
+   // Record in templatelinks, so edits cause the page to be 
refreshed
+   if ( $entityTitle !== false ) {
+   $this->getParser()->getOutput()

[MediaWiki-commits] [Gerrit] Update code to match MWSearch updates, fixing fatal - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: Update code to match MWSearch updates, fixing fatal
..


Update code to match MWSearch updates, fixing fatal

PHP Fatal error:  Call to undefined method Status::next() in 
/usr/local/apache/common-local/php-1.22wmf3/extensions/ProofreadPage/SpecialProofreadPages.php
 on line 83

Change-Id: I0b6a49ae8008351ff0c86110009766a36b8dd778
---
M SpecialProofreadPages.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Tpt: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php
index 4143a06..0df6cd6 100644
--- a/SpecialProofreadPages.php
+++ b/SpecialProofreadPages.php
@@ -75,7 +75,9 @@
$searchEngine->setNamespaces( array( 
$indexNamespaceId ) );
$searchEngine->showRedirects = false;
$textMatches = $searchEngine->searchText( 
$this->searchTerm );
-   if( $textMatches === null) {
+   if( !( $textMatches instanceof SearchResultSet 
) ) {
+   // TODO: $searchEngine->searchText() 
can return status objects
+   // Might want to extract some 
information from them
global $wgOut;
$wgOut->showErrorPage( 
'proofreadpage_specialpage_searcherror', 
'proofreadpage_specialpage_searcherrortext' );
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/62440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b6a49ae8008351ff0c86110009766a36b8dd778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 49897) Fix a failure in Wiki with message caching - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/69754


Change subject: (bug 49897) Fix a failure in Wiki with message caching
..

(bug 49897) Fix a failure in Wiki with message caching

This removes retrocompatiblity with namespaces configuration using the messages

Change-Id: I0037f74ea3a0624d90508ba0c271445231807b11
---
M ProofreadPage.body.php
M includes/ProofreadPageInit.php
2 files changed, 7 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/54/69754/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index b3aa1d2..0d2ed5d 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -34,7 +34,7 @@
public static function getPageNamespaceId() {
static $namespace;
if ( $namespace === null ) {
-   $namespace = ProofreadPageInit::getNamespaceId( 'page', 
'proofreadpage_namespace' );
+   $namespace = ProofreadPageInit::getNamespaceId( 'page' 
);
}
return $namespace;
}
@@ -47,7 +47,7 @@
public static function getIndexNamespaceId() {
static $namespace;
if ( $namespace === null ) {
-   $namespace = ProofreadPageInit::getNamespaceId( 
'index', 'proofreadpage_index_namespace' );
+   $namespace = ProofreadPageInit::getNamespaceId( 'index' 
);
}
return $namespace;
}
diff --git a/includes/ProofreadPageInit.php b/includes/ProofreadPageInit.php
index 7ea37fa..380c2e8 100644
--- a/includes/ProofreadPageInit.php
+++ b/includes/ProofreadPageInit.php
@@ -131,24 +131,14 @@
 * Get the id of the namespace. Required that Mediawiki is loaded and 
ProofreadPageInit::initNamespace has been executed for the relevant namespace.
 * Warning: It's not the function you search. If you want to know the 
index or page namespace id use ProofreadPage::getIndexNamespaceId() or 
ProofreadPage::getPageNamespaceId()
 * @param $key string the key of the namespace in the i18n file
-* @param $configName string the name of the mediawiki configuration 
entry that store the name of the namespace
-* @return int
+* @return integer
 */
-   public static function getNamespaceId( $key, $configName ) {
+   public static function getNamespaceId( $key ) {
global $wgProofreadPageNamespaceIds;
 
-   $namespaceText = strtolower( str_replace( ' ', '_', wfMessage( 
$configName )->inContentLanguage()->plain() ) );
-   $namespace = MWNamespace::getCanonicalIndex( $namespaceText );
-   if ( $namespace === null ) {
-   if ( !isset( $wgProofreadPageNamespaceIds[$key] ) ) {
-   die( 'Namespace with id ' . 
self::$defaultNamespaceIds[$key] . ' is already set ! ProofreadPage can\'t use 
his id in order to create ' . self::getNamespaceName( $key, 'en' ) . ' 
namespace. Update your LocalSettings.php adding $wgProofreadPageNamespaceIds[' 
. $key . '] = /* NUMERICAL ID OF THE ' . self::getNamespaceName( $key, 'en' ) . 
' NAMESPACE */; AFTER the inclusion of Proofread Page' ); //The only case where 
there $globalId is not set is when a namespace with the default id already 
exist and is not a prp namespace.
-   }
-   return $wgProofreadPageNamespaceIds[$key];
-   } else {
-   if ( isset( $wgProofreadPageNamespaceIds[$key] ) && 
$namespace != $wgProofreadPageNamespaceIds[$key] ) {
-   die( 'There is a bug in mediawiki 
configuration: the ProofreadPage ' . self::getNamespaceName( $key, 'en' ) . ' 
namespace is set to be number ' . $wgProofreadPageNamespaceIds[$key] . ' in the 
$wgProofreadPageNamespaceIds[' . $key . '] PHP configuration parameter and 
number ' . $namespace . ' in the page [[Mediawiki:' . $configName . ']]. Update 
your LocalSettings.php adding $wgProofreadPageNamespaceIds[' . $key . '] = /* 
NUMERICAL ID OF THE ' . self::getNamespaceName( $key, 'en' ) . ' NAMESPACE */; 
AFTER the inclusion of Proofread Page and delete [[Mediawiki:' . $configName . 
']] page.' );
-   }
-   return $namespace;
+   if ( !isset( $wgProofreadPageNamespaceIds[$key] ) ) {
+   die( 'Namespace with id ' . 
self::$defaultNamespaceIds[$key] . ' is already set ! ProofreadPage can\'t use 
his id in order to create ' . self::getNamespaceName( $key, 'en' ) . ' 
namespace. Update your LocalSettings.php adding $wgProofreadPageNamespaceIds[' 
. $key . '] = /* NUMERICAL ID OF THE ' . self::getNamespaceName( $key, 'en' ) . 
' NAMESPACE */; AFTER the inclusion of Proofread Page' ); //The only case where 
$wgProofreadPageNamespaceIds is not set

[MediaWiki-commits] [Gerrit] (bug 49897) configure properly page and index namespaces for... - change (operations/mediawiki-config)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/69755


Change subject: (bug 49897) configure properly page and index namespaces for 
test2
..

(bug 49897) configure properly page and index namespaces for test2

Change-Id: I6bdb111ca6a83773a65aa9f06c7f5d0126f4f9db
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/55/69755/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a1ffa0c..105b715 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3644,6 +3644,10 @@
 
 # wgProofreadPageNamespaceIds @{
 'wgProofreadPageNamespaceIds' => array(
+   'test2wiki' => array(
+   'page' => 104,
+   'index' => 106
+   ),
'sourceswiki' => array(
'page' => 104,
'index' => 106,

-- 
To view, visit https://gerrit.wikimedia.org/r/69755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bdb111ca6a83773a65aa9f06c7f5d0126f4f9db
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Beggining of refactoring of Page pages [DO NOT SUBMIT] Chang... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70169


Change subject: Beggining of refactoring of Page pages [DO NOT SUBMIT] 
Change-Id: I48ed31bdd01e89046ca2b3f86a1cb394ff18eb29
..

Beggining of refactoring of Page pages [DO NOT SUBMIT]
Change-Id: I48ed31bdd01e89046ca2b3f86a1cb394ff18eb29
---
M ProofreadPage.body.php
A includes/page/EditProofreadPagePage.php
A includes/page/ProofreadPagePage.php
A includes/page/ProofreadPageValue.php
4 files changed, 493 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/69/70169/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 0d2ed5d..3c851f3 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -109,10 +109,15 @@
 */
public static function onCustomEditor( $article, $user ) {
global $request;
-   if ( $article->getTitle()->inNamespace( 
self::getIndexNamespaceId() ) ) { //TODO ExternalEditor case
+   $title = $article->getTitle();
+   if ( $title->inNamespace( self::getIndexNamespaceId() ) ) { 
//TODO ExternalEditor case
$editor = new EditProofreadIndexPage( $article );
$editor->edit();
return false;
+   } elseif ( $title->inNamespace( self::getPageNamespaceId() ) ) 
{ //TODO ExternalEditor case
+   $editor = new EditProofreadPagePage( $article );
+   $editor->edit();
+   return false;
} else {
return true;
}
diff --git a/includes/page/EditProofreadPagePage.php 
b/includes/page/EditProofreadPagePage.php
new file mode 100644
index 000..7986d4c
--- /dev/null
+++ b/includes/page/EditProofreadPagePage.php
@@ -0,0 +1,67 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup ProofreadPage
+ */
+
+class EditProofreadPagePage extends EditPage {
+
+   protected function isSectionEditSupported() {
+   return false; // sections and forms don't mix
+   }
+
+   /**
+* Add custom fields
+*/
+   protected function showContentForm() {
+   //Preparation currently done  by ProofreadPage::preparePage()
+   parent::showContentForm();
+   }
+
+   /**
+* Init $this->textbox1 from form content
+*
+* @param $request WebRequest
+*/
+   protected function importContentFormData( &$request ) { //TODO 
validation and set from API support
+   $value = ProofreadPageValue::newEmpty();
+   $this->setHeader( $this->safeUnicodeInput( $request, 
'wpHeaderTextbox' ) );
+   $this->setBody( $this->textbox1 );
+   $this->setFooter( $this->safeUnicodeInput( $request, 
'wpFooterTextbox' ) );
+   $value->setLevel( $request->getInt( 'wpQuality' ) );
+   $this->setProofreaderFromName( $this->safeUnicodeInput( 
$request, 'wpProofreader' ) );
+
+   $this->textbox1 = $value->serialize();
+   return true;
+   }
+
+   /**
+* Check the validity of the page
+*/
+   function internalAttemptSave( &$result, $bot = false ) { //TODO
+   $index = new ProofreadIndexPage( $this->mTitle, 
ProofreadIndexPage::getDataConfig(),
+   if ( $links !== null && count( $links[1] ) !== count( 
array_unique( $links[1] ) ) )
+   $wgOut->showErrorPage( 'proofreadpage_indexdupe', 
'proofreadpage_indexdupetext' );
+   $status = Status::newGood();
+   $status->fatal( 'hookaborted' );
+   $status->value = self::AS_HOOK_ERROR;
+   return $status;
+   }
+   return parent::internalAttemptSave( $result, $bot );
+   }
+}
diff --git a/includes/page/ProofreadPagePage.php 
b/includes/page/ProofreadPagePage.php
new file mode 100644
index 000..928b2f0
--- /dev/null
+++ b/includes/page/ProofreadPagePage.php
@@ -0,0 +1,181 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup ProofreadPage
+ */
+
+/**
+ * The content of a page page
+ */
+class ProofreadPagePage {
+
+   /**
+* @var Title
+*/
+   protected $title;
+
+   /**
+* @var ProofreadPageValue content of the page
+*/
+   protected $content;
+
+   /**
+* @var ProofreadIndexPage|null index related to the page
+*/
+   protected $index;
+
+   /**
+* Constructor
+* @param $title Title Reference to a Title object.
+* @param $content ProofreadPageValue content of the page. Warning: 
only done for EditProofreadPagePage use.
+* @param $index ProofreadIndexPage index related to the page.
+*/
+   public function __con

[MediaWiki-commits] [Gerrit] Separated data fetching from manipulation for page. - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: Separated data fetching from manipulation for page.
..


Separated data fetching from manipulation for page.

Added more data fetching function for index pages.

Change-Id: I7383ad60463348fef97ed2a30ac7760069b2c430
---
M ProofreadPage.body.php
M ProofreadPage.php
A includes/ProofreadPageDbConnector.php
M includes/index/ProofreadIndexDbConnector.php
4 files changed, 289 insertions(+), 201 deletions(-)

Approvals:
  Tpt: Verified; Looks good to me, approved



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index b3aa1d2..7dc68a7 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -327,7 +327,6 @@
$page_namespace_id = self::getPageNamespaceId();
$page_namespace = MWNamespace::getCanonicalName( 
$page_namespace_id );
$in_index_namespace = $wgTitle->inNamespace( 
self::getIndexNamespaceId() );
-   $dbr = wfGetDB( DB_SLAVE );
 
$values = array();
foreach ( $page_ids as $id => $pdbk ) {
@@ -361,13 +360,7 @@
}
 
if ( count( $values ) ) {
-   $res = $dbr->select(
-   array( 'categorylinks' ),
-   array( 'cl_from', 'cl_to' ),
-   array( 'cl_from IN(' . implode( ',', $values ) 
. ')' ),
-   __METHOD__
-   );
-
+   $res = 
ProofreadPageDbConnector::getCategoryNamesForPageIds( $values );
foreach ( $res as $x ) {
$pdbk = $page_ids[$x->cl_from];
if ( array_key_exists( $x->cl_to, 
$qualityCategories ) ) {
@@ -730,20 +723,8 @@
list( $page, $pagenum ) = $item;
$pp[] = $page->getDBkey();
}
-   $dbr = wfGetDB( DB_SLAVE );
$cat = str_replace( ' ' , '_' , wfMessage( 
'proofreadpage_quality0_category' )->inContentLanguage()->escaped() );
-   $res = $dbr->select(
-   array( 'page', 
'categorylinks' ),
-   array( 'page_title' ),
-   array(
- 'page_title' => $pp,
- 'cl_to' => $cat,
- 'page_namespace' => 
$pageNamespaceId
- ),
-   __METHOD__,
-   null,
-   array( 'categorylinks' => 
array( 'LEFT JOIN', 'cl_from=page_id' ) )
-   );
+   $res = 
ProofreadPageDbConnector::getPagesNameInCategory( $pp, $cat );
 
if( $res ) {
foreach ( $res as $o ) {
@@ -1059,14 +1040,6 @@
return true;
}
 
-   /**
-* Remove index data from pr_index table.
-* @param $pageId Integer: page identifier
-*/
-   private static function removeIndexData( $pageId ) {
-   $dbw = wfGetDB( DB_MASTER );
-   $dbw->delete( 'pr_index', array( 'pr_page_id' => $pageId ), 
__METHOD__ );
-   }
 
/**
 * Updates index data for an index referencing the specified page.
@@ -1097,7 +1070,7 @@
 
// Process Index removal.
if ( $title->inNamespace( self::getIndexNamespaceId() ) ) {
-   self::removeIndexData( $article->getId() );
+   ProofreadIndexDbConnector::removeIndexData( 
$article->getId() );
 
// Process Page removal.
} elseif ( $title->inNamespace( self::getPageNamespaceId() ) ) {
@@ -1163,74 +1136,9 @@
 * update pr_index iteratively
 */
$indexId = $title->prpIndexPage->getTitle()->getArticleID();
-   $dbr = wfGetDB( DB_SLAVE );
-   $res = $dbr->select(
-   array( 'pr_index' ),
-   array( 'pr_count', 'pr_q0', 'pr_q1', 'pr_q2', 'pr_q3', 
'pr_q4' ),
-   array(
-   'pr_page_id' => $indexId
-   ),
-   __METHOD__
-   );
-   $x = $dbr->fetchObject( $res );
+   $x = ProofreadIndexDbConnector::getIndexDataFromIndexPageId( 
$indexId );
if( $x ) {
-

[MediaWiki-commits] [Gerrit] ProofreadPage Fatal error: Call to a member function exists(... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: ProofreadPage Fatal error: Call to a member function exists() 
on a non-object
..


ProofreadPage Fatal error: Call to a member function exists() on a non-object

wfFindFile() can return false; not documented to return null

Bug: 50117
Change-Id: I5146e4425a25babb0190ee9d8769a20ef80b35ed
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Tpt: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 0d2ed5d..215d2a1 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -157,7 +157,7 @@
}
$image = wfFindFile( $imageTitle );
// if it is multipage, we use the page order of the file
-   if ( $image !== null && $image->exists() && 
$image->isMultipage() ) {
+   if ( $image && $image->exists() && $image->isMultipage() ) {
$indexTitle = Title::makeTitle( 
self::getIndexNamespaceId(), $image->getTitle()->getText() );
if ( $indexTitle !== null ) {
$title->prpIndexPage = 
ProofreadIndexPage::newFromTitle( $indexTitle );

-- 
To view, visit https://gerrit.wikimedia.org/r/70226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5146e4425a25babb0190ee9d8769a20ef80b35ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ProofreadPage Fatal error: Call to a member function exists(... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: ProofreadPage Fatal error: Call to a member function exists() 
on a non-object
..


ProofreadPage Fatal error: Call to a member function exists() on a non-object

wfFindFile() can return false; not documented to return null

Bug: 50117
Change-Id: I5146e4425a25babb0190ee9d8769a20ef80b35ed
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Tpt: Verified; Looks good to me, approved



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 0d2ed5d..215d2a1 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -157,7 +157,7 @@
}
$image = wfFindFile( $imageTitle );
// if it is multipage, we use the page order of the file
-   if ( $image !== null && $image->exists() && 
$image->isMultipage() ) {
+   if ( $image && $image->exists() && $image->isMultipage() ) {
$indexTitle = Title::makeTitle( 
self::getIndexNamespaceId(), $image->getTitle()->getText() );
if ( $indexTitle !== null ) {
$title->prpIndexPage = 
ProofreadIndexPage::newFromTitle( $indexTitle );

-- 
To view, visit https://gerrit.wikimedia.org/r/70240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5146e4425a25babb0190ee9d8769a20ef80b35ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: 1.22wmf8
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] ProofreadPage Fatal error: Call to a member function exists(... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70240


Change subject: ProofreadPage Fatal error: Call to a member function exists() 
on a non-object
..

ProofreadPage Fatal error: Call to a member function exists() on a non-object

wfFindFile() can return false; not documented to return null

Bug: 50117
Change-Id: I5146e4425a25babb0190ee9d8769a20ef80b35ed
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/40/70240/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 0d2ed5d..215d2a1 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -157,7 +157,7 @@
}
$image = wfFindFile( $imageTitle );
// if it is multipage, we use the page order of the file
-   if ( $image !== null && $image->exists() && 
$image->isMultipage() ) {
+   if ( $image && $image->exists() && $image->isMultipage() ) {
$indexTitle = Title::makeTitle( 
self::getIndexNamespaceId(), $image->getTitle()->getText() );
if ( $indexTitle !== null ) {
$title->prpIndexPage = 
ProofreadIndexPage::newFromTitle( $indexTitle );

-- 
To view, visit https://gerrit.wikimedia.org/r/70240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5146e4425a25babb0190ee9d8769a20ef80b35ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: 1.22wmf8
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 50117) Backport for ProofreadPage - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70245


Change subject: (bug 50117) Backport for ProofreadPage
..

(bug 50117) Backport for ProofreadPage

Change-Id: I1f6aeef253912d6abafba9e683761419bd92fd21
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/70245/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 5ba8b69..7d5ed49 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 5ba8b699e8983116763dd8c3d71da772fb02dacf
+Subproject commit 7d5ed4973b6e22dcf0ec17f4c83692b5626de26e

-- 
To view, visit https://gerrit.wikimedia.org/r/70245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f6aeef253912d6abafba9e683761419bd92fd21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] (bug 50154) The parameter of the header template should be i... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70372


Change subject: (bug 50154) The parameter of the header template should be in 
lower case
..

(bug 50154) The parameter of the header template should be in lower case

This fix the break of the automatic header template feature.

Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/72/70372/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index c4ca736..278f2e4 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -827,7 +827,7 @@
}
$attributes = $indexPage->getIndexEntriesForHeader();
foreach( $attributes as $attribute ) {
-   $key = $attribute->getKey();
+   $key = strtolower( $attribute->getKey() );
if( array_key_exists( $key, $args ) ) {
$val = $args[$key];
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/70372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Clean the aliases of Proofread Page managed namespaces - change (operations/mediawiki-config)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70377


Change subject: Clean the aliases of Proofread Page managed namespaces
..

Clean the aliases of Proofread Page managed namespaces

Removes the aliases "Index" and "Page" that are now setup directly by the
extension as canonical names.

Removes also the setup of namespace numbers for uk and th wikisources (250 and 
252
are the numbers by default)

Change-Id: I8218934679da29a502e0a988c815598f332ce73d
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 158 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/77/70377/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5a21939..4e0a72c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2297,12 +2297,6 @@
"বাটচ'ৰা" => 100,
"বাটচ'ৰা_আলোচনা" => 101,
),
-   'aswikisource' => array(
-   'Page' => 104,// Bug 43129
-   'Page_talk' => 105,
-   'Index' => 106,   // Bug 43129
-   'Index_talk' => 107,
-   ),
'+azwikiquote' => array(
'Wikiquote'  => NS_PROJECT,
'Wikiquote_talk' => NS_PROJECT_TALK,
@@ -2330,10 +2324,6 @@
'ВК' => NS_PROJECT, // Bug 41322
'Author' => 102,// Bug 41322
'Author_talk' => 103,
-   'Page' => 104,  // Bug 41322
-   'Page_talk' => 105,
-   'Index' => 106, // Bug 41322
-   'Index_talk' => 107,
),
'+bgwikisource' => array(
'Author' => 100,
@@ -2368,10 +2358,6 @@
'+brwiki' => array( 'Discussion_Wikipedia' => NS_PROJECT_TALK, ),
'+brwikiquote' => array( 'Wikiquote' => NS_PROJECT ),
'+brwikisource' => array(
-   'Index' => 100,
-   'Index_talk' => 101,
-   'Page' => 102,
-   'Page_talk' => 103,
'Author' => 104,
'Author_talk' => 105,
),
@@ -2384,10 +2370,6 @@
'Portal_talk' => 101, // Bug 37226
),
'+cawikisource' => array(
-   'Page' => 102,
-   'Page_talk' => 103,
-   'Index' => 104,
-   'Index_talk' => 105,
'Author' => 106,
'Author_talk' => 107,
),
@@ -2485,10 +2467,6 @@
'+dawikisource' => array(
'Author' => 102, // 
http://bugzilla.wikimedia.org/show_bug.cgi?id=7796
'Author_talk' => 103,
-   'Page' => 104,
-   'Page_talk' => 105,
-   'Index' => 106,
-   'Index_talk' => 107,
),
'+dewiki' => array(
'WP' => NS_PROJECT,
@@ -2509,10 +2487,6 @@
),
'+dewikisource' => array(
'WS' => 4,
-   'Page' => 102,
-   'Page_talk' => 103,
-   'Index' => 104,
-   'Index_talk' => 105,
),
'+dewikivoyage' => array(
'News' => 106,
@@ -2531,12 +2505,6 @@
),
'+dvwiktionary' => array(
'Wiktionary_talk' => NS_PROJECT_TALK, // Bug 46846
-   ),
-   '+elwikisource' => array(
-   'Page' => 100,
-   'Page_talk' => 101,
-   'Index' => 102,
-   'Index_talk' => 103,
),
'+enwiki' => array(
 // bug 6313
@@ -2575,20 +2543,12 @@
'+eswikisource' => array(
'Auxtoro' => 102,
'Auxtoro-Diskuto' => 103,
-   'Page' => 104,
-   'Page_talk' => 105,
-   'Index' => 106,
-   'Index_talk' => 107,
),
'+etwiki' => array(
'Portal' => 100,
'Portal_talk' => 101,
),
'+etwikisource' => array(
-   'Page' => 102,
-   'Page_talk' => 103,
-   'Index' => 104,
-   'Index_talk' => 105,
'Author' => 106,
'Author_talk' => 107,
),
@@ -2609,10 +2569,6 @@
'Author_talk' => 103,
'پدیدآورنده' => 102,
'گفتگو_پدیدآورنده' => 103,
-   'Page' => 104,
-   'Page_talk' => 105,
-   'Index' => 106,
-   'Index_talk' => 107,
'ون' => NS_PROJECT,
),
'+fawiktionary' => array(
@@ -2620,11 +2576,6 @@
),
'+fiwiki' => array(
'WP' => NS_PROJECT,
-   ),
-   '+frrwiki' => array( // Bug 38023
-   'Page' => 102,
-   'Page_talk' => 103,
-   'Index_talk' => 105,
),
'+frwiki' => array(
'Wikipedia' => NS_PROJECT,
@@ -2644,10 +

[MediaWiki-commits] [Gerrit] (bug 50154) The parameter of the header template should be i... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70389


Change subject: (bug 50154) The parameter of the header template should be in 
lower case
..

(bug 50154) The parameter of the header template should be in lower case

This fix the break of the automatic header template feature.

Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
---
M ProofreadPage.body.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/89/70389/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 215d2a1..36e7d95 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -846,7 +846,7 @@
}
$attributes = $indexPage->getIndexEntriesForHeader();
foreach( $attributes as $attribute ) {
-   $key = $attribute->getKey();
+   $key = strtolower( $attribute->getKey() );
if( array_key_exists( $key, $args ) ) {
$val = $args[$key];
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/70389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a254b7117b809a101d38f5c311ca41bb57a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: 1.22wmf8
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Update ProofreadPage to track 1.22wmf8 branch - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70390


Change subject: Update ProofreadPage to track 1.22wmf8 branch
..

Update ProofreadPage to track 1.22wmf8 branch

Change-Id: I9368483779ae190e6b2f53ef3c058849f884c931
---
M extensions/ProofreadPage
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/70390/1

diff --git a/extensions/ProofreadPage b/extensions/ProofreadPage
index 7d5ed49..5c301d4 16
--- a/extensions/ProofreadPage
+++ b/extensions/ProofreadPage
-Subproject commit 7d5ed4973b6e22dcf0ec17f4c83692b5626de26e
+Subproject commit 5c301d4e1d252e34812524ce25df0fb8dcfeb39c

-- 
To view, visit https://gerrit.wikimedia.org/r/70390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9368483779ae190e6b2f53ef3c058849f884c931
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf8
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve code quality of DbConnectors - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70393


Change subject: Improve code quality of DbConnectors
..

Improve code quality of DbConnectors

Change-Id: I915ec58eeecd09f83dc1b5aa85121948c850442d
---
M ProofreadPage.php
M includes/ProofreadPageDbConnector.php
M includes/index/ProofreadIndexDbConnector.php
3 files changed, 134 insertions(+), 98 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/93/70393/1

diff --git a/ProofreadPage.php b/ProofreadPage.php
index 5aab7a4..c7c2e8c 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -40,15 +40,14 @@
 $wgExtensionMessagesFiles['ProofreadPageAlias'] = $dir . 
'ProofreadPage.alias.php';
 
 $wgAutoloadClasses['ProofreadPage'] = $dir . 'ProofreadPage.body.php';
-$wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir . 
'includes/index/ProofreadIndexDbConnector.php';
 $wgAutoloadClasses['ProofreadPageDbConnector'] = $dir . 
'includes/ProofreadPageDbConnector.php';
 $wgAutoloadClasses['ProofreadPageInit'] = $dir . 
'includes/ProofreadPageInit.php';
-
 
 $wgAutoloadClasses['EditProofreadIndexPage'] = $dir . 
'includes/index/EditProofreadIndexPage.php';
 $wgAutoloadClasses['ProofreadIndexEntry'] = $dir . 
'includes/index/ProofreadIndexEntry.php';
 $wgAutoloadClasses['ProofreadIndexValue'] = $dir . 
'includes/index/ProofreadIndexValue.php';
 $wgAutoloadClasses['ProofreadIndexPage'] = $dir . 
'includes/index/ProofreadIndexPage.php';
+$wgAutoloadClasses['ProofreadIndexDbConnector'] = $dir . 
'includes/index/ProofreadIndexDbConnector.php';
 
 $wgExtensionCredits['other'][] = array(
'path'   => __FILE__,
diff --git a/includes/ProofreadPageDbConnector.php 
b/includes/ProofreadPageDbConnector.php
index 2c8af7d..a40dc3f 100644
--- a/includes/ProofreadPageDbConnector.php
+++ b/includes/ProofreadPageDbConnector.php
@@ -1,19 +1,38 @@
 http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup ProofreadPage
+ */
 
 class ProofreadPageDbConnector {
+
/**
 * @param $values array
 * @param ResultWrapper
 */
public static function getCategoryNamesForPageIds( $pageIds ) {
$dbr = wfGetDB( DB_SLAVE );
-   $res = $dbr->select(
-   array( 'categorylinks' ),
-   array( 'cl_from', 'cl_to' ),
-   array( 'cl_from IN(' . implode( ',', $pageIds ) 
. ')' ),
-   __METHOD__
-   );
-   return $res;
+   return $dbr->select(
+   array( 'categorylinks' ),
+   array( 'cl_from', 'cl_to' ),
+   array( 'cl_from IN(' . implode( ',', $pageIds ) . ')' ),
+   __METHOD__
+   );
}
 
/**
@@ -23,25 +42,24 @@
 */
public static function getPagesNameInCategory( $pp, $cat ) {
$dbr = wfGetDB( DB_SLAVE );
-   $res = $dbr->select(
-   array( 'page', 'categorylinks' ),
-   array( 'page_title' ),
-   array(
- 'page_title' => $pp,
- 'cl_to' => $cat,
- 'page_namespace' => 
ProofreadPage::getPageNamespaceId()
- ),
-   __METHOD__,
-   null,
-   array( 'categorylinks' => array( 'LEFT JOIN', 
'cl_from=page_id' ) )
-   );
-   return $res;
+   return $dbr->select(
+   array( 'page', 'categorylinks' ),
+   array( 'page_title' ),
+   array(
+   'page_title' => $pp,
+   'cl_to' => $cat,
+   'page_namespace' => 
ProofreadPage::getPageNamespaceId()
+   ),
+   __METHOD__,
+   null,
+   array( 'categorylinks' => array( 'LEFT JOIN', 
'cl_from=page_id' ) )
+   );
}
 
/**
-* @param $query
-* @param $cat
-* @return int
+* @param $query array
+* @param $cat string
+* @return integer
 */
public static function queryCount( $query, $cat ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -58,7 +76,7 @@
 
/**
 * @param $pages string
-* @return integer | null
+* @return integer|null
 */
public static function getNumberOfExistingPagesFromPageTitle( $pages ) {
$dbr = wfGetDB( DB_SLAVE );
@@ -68,69 +86,66 @@
array( 'page_

[MediaWiki-commits] [Gerrit] (bug 47011) Wiki link of Index: pages are mishandled if they... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70404


Change subject: (bug 47011) Wiki link of Index: pages are mishandled if they 
contain a ":"
..

(bug 47011) Wiki link of Index: pages are mishandled if they contain a ":"

Change-Id: I2cbd16ab182e74b43401e3f9d692d48d717fa860
---
M includes/index/ProofreadIndexPage.php
M tests/includes/index/ProofreadIndexPageTest.php
2 files changed, 16 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/04/70404/1

diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 2821a07..70f8e60 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -250,7 +250,7 @@
$text = $this->getText();
$options = new ParserOptions();
$rtext = $indexParser->preprocess( $text, $this->title, 
$options );
-   return $this->linkPregMatch( $rtext, 
"/\[\[\s*([^:\|]*?)\s*(\|(.*?)|)\]\]/i" );
+   return $this->getLinksToNamespace( $rtext, NS_MAIN );
}
 
/**
@@ -273,26 +273,25 @@
$links = null;
} else {
$params = null;
-   $links = $this->linkPregMatch( $text, 
"/\[\[$pageNamespace:(.*?)(\|(.*?)|)\]\]/i", 
ProofreadPage::getPageNamespaceId() );
+   $links = $this->getLinksToNamespace( $text, 
ProofreadPage::getPageNamespaceId() );
}
return array( $links, $params );
}
 
 
/**
-* Execute a preg_match_all with the pattern put in parameter and 
return it as a list of links
+* Retruns all links in a given namespace
 * @param $text string
-* @param $pattern string the pattern to execute
 * @param $namespace integer the default namespace id
 * @return array of array( Title title of the pointed page, the label 
of the link )
 */
-   protected function linkPregMatch( $text, $pattern, $namespace = NS_MAIN 
) {
-   preg_match_all( $pattern, $text, $textLinks, PREG_PATTERN_ORDER 
);
+   protected function getLinksToNamespace( $text, $namespace ) {
+   preg_match_all( '/\[\[(.*?)(\|(.*?)|)\]\]/i', $text, 
$textLinks, PREG_PATTERN_ORDER );
$links = array();
$num = 0;
for( $i = 0; $i < count( $textLinks[1] ); $i++ ) {
-   $title = Title::newFromText( $textLinks[1][$i], 
$namespace );
-   if ( $title !== null ) {
+   $title = Title::newFromText( $textLinks[1][$i] );
+   if ( $title !== null && $title->inNamespace( $namespace 
) ) {
if ( $textLinks[3][$i] === '' ) {
$links[$num] = array( $title, 
$title->getSubpageText() );
} else {
diff --git a/tests/includes/index/ProofreadIndexPageTest.php 
b/tests/includes/index/ProofreadIndexPageTest.php
index 374766d..bcc5049 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -67,8 +67,6 @@
global $wgProofreadPageNamespaceIds, $wgExtraNamespaces, 
$wgNamespacesWithSubpages;
parent::setUp();
 
-   $wgExtraNamespaces[250] = 'Page';
-   $wgExtraNamespaces[252] = 'Index';
$wgProofreadPageNamespaceIds =  array(
'page' => 250,
'index' => 252
@@ -123,10 +121,10 @@
}
 
public function testGetLinksToMainNamespace() {
-   $page = new ProofreadIndexPage( Title::makeTitle( 252, 
'Test.djvu' ), self::$config, "{{\n|Pages=\n|TOC=* [[Test/Chapter 
1]]\n* [[Test/Chapter_2|Chapter 2]]\n}}" );
+   $page = new ProofreadIndexPage( Title::makeTitle( 252, 
'Test.djvu' ), self::$config, "{{\n|Pages=[[Page:Test.jpg]]\n|TOC=* 
[[Test/Chapter 1]]\n* [[Azerty:Test/Chapter_2|Chapter 2]]\n}}" );
$links = array(
array( Title::newFromText( 'Test/Chapter 1' ), 'Chapter 
1' ),
-   array( Title::newFromText( 'Test/Chapter_2' ), 'Chapter 
2' )
+   array( Title::newFromText( 'Azerty:Test/Chapter_2' ), 
'Chapter 2' )
 );
$this->assertEquals( $links, $page->getLinksToMainNamespace() );
}
@@ -138,11 +136,11 @@
}
 
public function testGetPagesWithoutPagelist() {
-   $page = new ProofreadIndexPage( Title::makeTitle( 252, 'Test' 
), self::$config, "{{\n|Pages=[[Page:Test 1.jpg|TOC]] [[Page:Test 2.tiff|1]] 
[[Page:Test 3.png|2]]\n|Author=[[Author:Me]]\n}}" );
+   $page = new ProofreadIndexPage( Title::makeTitle( 252, 'Test' 
), self::$config, "

[MediaWiki-commits] [Gerrit] (bug 50215) {{{pagenum}}} is not fill at the loading of a ne... - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/70599


Change subject: (bug 50215) {{{pagenum}}} is not fill at the loading of a new 
Page: page
..

(bug 50215) {{{pagenum}}} is not fill at the loading of a new Page: page

Change-Id: If4697056b2fe01ededa0c5ff03828e1e0146a2b8
---
M ProofreadPage.body.php
M includes/index/ProofreadIndexPage.php
M tests/includes/index/ProofreadIndexPageTest.php
3 files changed, 41 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/99/70599/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 278f2e4..a8c86b6 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -205,8 +205,10 @@
private static function preparePage( $out, $m, $isEdit ) {
global $wgUser, $wgExtensionAssetsPath, $wgContLang;
 
-   if ( !isset( $out->getTitle()->prpIndexPage ) ) {
-   self::loadIndex( $out->getTitle() );
+   $pageTitle = $out->getTitle();
+
+   if ( !isset( $pageTitle->prpIndexPage ) ) {
+   self::loadIndex( $pageTitle );
}
 
$imageTitle = Title::makeTitleSafe( NS_IMAGE, $m[1] );
@@ -287,7 +289,7 @@
'alt' => $out->msg( 
'proofreadpage_index' )->text(), 'width' => 15, 'height' => 15 ) ),
array( 'title' => $out->msg( 
'proofreadpage_index' )->text() ) );
 
-   list( $header, $footer, $css, $editWidth ) = 
$indexPage->getIndexDataForPage();
+   list( $header, $footer, $css, $editWidth ) = 
$indexPage->getIndexDataForPage( $pageTitle );
$jsVars['editWidth'] = $editWidth;
$jsVars['proofreadPageHeader'] = $header;
$jsVars['proofreadPageFooter'] = $footer;
diff --git a/includes/index/ProofreadIndexPage.php 
b/includes/index/ProofreadIndexPage.php
index 2821a07..a9bd9f3 100644
--- a/includes/index/ProofreadIndexPage.php
+++ b/includes/index/ProofreadIndexPage.php
@@ -347,15 +347,45 @@
}
 
/**
+* Return the Title of the previous and the next page pages
+* @param $page Title the page
+* @return string|null
+* @todo Move to pager system
+*/
+   public function getDisplayedPageNumber( Title $page ) {
+   global $wgContLang;
+
+   list( $links, $params ) = $this->getPages();
+   if ( $links === null ) {
+   $pagenr = 1; //TODO move it to 
ProofreadPagePage::getPosition()
+   $parts = explode( '/', $page->getText() );
+   if ( count( $parts ) > 1 ) {
+   $pagenr = intval( 
$wgContLang->parseFormattedNumber( array_pop( $parts ) ) );
+   list( $pagenum, $links, $mode ) = 
ProofreadPage::pageNumber( $pagenr, $params );
+   return $pagenum;
+   }
+   } else {
+   foreach( $links as $pagenr => $link ) {
+   if ( $page->equals( $link[0] ) ) {
+   return $link[1];
+   }
+   }
+   }
+   return null;
+   }
+
+   /**
 * Return metadata from the index pages that will be used by a page 
page.
+* @param $page Title the page (TODO: move to ProofreadPagePage)
 * @return array( header, footer, css, editWidth ) as string
 */
-   public function getIndexDataForPage() {
+   public function getIndexDataForPage( Title $page ) {
$entries = $this->getIndexEntriesForHeader();
$attributes = array();
foreach( $entries as $key => $attribute ) { //We use here only 
values as text
$attributes[strtolower( $key )] = 
$attribute->getStringValue();
}
+   $attributes['pagenum'] = $this->getDisplayedPageNumber( $page );
 
if( isset( $attributes['header'] ) ) {
$header = $attributes['header'];
@@ -363,13 +393,13 @@
$header = wfMessage( 'proofreadpage_default_header' 
)->inContentLanguage()->plain();
}
 
-   if( isset( $attributes['footer'] ) ) {
+   if ( isset( $attributes['footer'] ) ) {
$footer = $attributes['footer'];
} else {
$footer = wfMessage( 'proofreadpage_default_footer' 
)->inContentLanguage()->plain();
}
 
-   foreach ( $attributes as $key => $val ) {
+   foreach( $attributes as $key => $val ) {
$header = str_replace( '{{{' . $key . 

[MediaWiki-commits] [Gerrit] Remove the node from the table of contents - change (mediawiki/core)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71321


Change subject: Remove the  node from the table of contents
..

Remove the  node from the table of contents

Change-Id: Idb05f2877ed2af0b11d510dfad0005690a6efba3
---
M includes/Linker.php
M skins/common/commonContent.css
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/71321/1

diff --git a/includes/Linker.php b/includes/Linker.php
index 3529d28..5bb9230 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1688,10 +1688,10 @@
$lang = wfGetLangObj( $lang );
$title = wfMessage( 'toc' )->inLanguage( $lang )->escaped();
 
-   return ''
+   return ''
. '' . $title . "\n"
. $toc
-   . "\n\n";
+   . "\n\n";
}
 
/**
diff --git a/skins/common/commonContent.css b/skins/common/commonContent.css
index a36fa48..6fe19ac 100644
--- a/skins/common/commonContent.css
+++ b/skins/common/commonContent.css
@@ -14,6 +14,14 @@
padding: 5px;
font-size: 95%;
 }
+#toc,
+.toc { /* Fit content width */
+   display: -moz-inline-stack; /* Firefox 2 */
+   display: inline-block;
+   vertical-align: top;
+   zoom: 1; /* IE 6-7 */
+   *display: inline;
+}
 #toc h2,
 .toc h2 {
display: inline;

-- 
To view, visit https://gerrit.wikimedia.org/r/71321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb05f2877ed2af0b11d510dfad0005690a6efba3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix some regressions included in EditProofreadIndePage - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/60202


Change subject: Fix some regressions included in EditProofreadIndePage
..

Fix some regressions included in EditProofreadIndePage

fix change I64e841469664af41ba96a5a3f865f0272b0fb48a

Change-Id: Ie9bac2c00808f48bb2785fbbad28228933dfc615
---
M includes/index/EditProofreadIndexPage.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/02/60202/1

diff --git a/includes/index/EditProofreadIndexPage.php 
b/includes/index/EditProofreadIndexPage.php
index 289e1e2..4a93c03 100644
--- a/includes/index/EditProofreadIndexPage.php
+++ b/includes/index/EditProofreadIndexPage.php
@@ -101,12 +101,12 @@
$inputAttributes['type'] = $inputType;
$inputAttributes['id'] = $key;
$inputAttributes['size'] = 60;
-   $inputAttributes['cols'] = 60;
-   $inputAttributes['rows'] = $size;
$wgOut->addHTML( Html::input( $key, $val, 
$inputType, $inputAttributes ) );
}
else {
-   $wgOut->addHTML( Html::textarea( $key, $val, 
$inputAttributes ) );
+   $inputAttributes['cols'] = 60;
+   $inputAttributes['rows'] = $size;
+   $wgOut->addHTML( Html::textarea( $key, $val, 
$inputAttributes ) );
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/60202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9bac2c00808f48bb2785fbbad28228933dfc615
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix some regressions included in EditProofreadIndePage - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has submitted this change and it was merged.

Change subject: Fix some regressions included in EditProofreadIndePage
..


Fix some regressions included in EditProofreadIndePage

fix change I64e841469664af41ba96a5a3f865f0272b0fb48a

Change-Id: Ie9bac2c00808f48bb2785fbbad28228933dfc615
---
M includes/index/EditProofreadIndexPage.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Tpt: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/includes/index/EditProofreadIndexPage.php 
b/includes/index/EditProofreadIndexPage.php
index 289e1e2..4a93c03 100644
--- a/includes/index/EditProofreadIndexPage.php
+++ b/includes/index/EditProofreadIndexPage.php
@@ -101,12 +101,12 @@
$inputAttributes['type'] = $inputType;
$inputAttributes['id'] = $key;
$inputAttributes['size'] = 60;
-   $inputAttributes['cols'] = 60;
-   $inputAttributes['rows'] = $size;
$wgOut->addHTML( Html::input( $key, $val, 
$inputType, $inputAttributes ) );
}
else {
-   $wgOut->addHTML( Html::textarea( $key, $val, 
$inputAttributes ) );
+   $inputAttributes['cols'] = 60;
+   $inputAttributes['rows'] = $size;
+   $wgOut->addHTML( Html::textarea( $key, $val, 
$inputAttributes ) );
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/60202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9bac2c00808f48bb2785fbbad28228933dfc615
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Rtdwivedi 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits