[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expand templates: Use editfont on wikitext inputs

2018-01-02 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401394 )

Change subject: Expand templates: Use editfont on wikitext inputs
..


Expand templates: Use editfont on wikitext inputs

Change-Id: Ie8919b4d5caf13749d81b419aff276f7c57d7049
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialExpandTemplates.php 
b/includes/specials/SpecialExpandTemplates.php
index 560d75a..35344aa 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -172,6 +172,11 @@
'rows' => 10,
'default' => $input,
'id' => 'input',
+   // The following classes can be used here:
+   // * mw-editfont-monospace
+   // * mw-editfont-sans-serif
+   // * mw-editfont-serif
+   'cssclass' => 'mw-editfont-' . 
$this->getUser()->getOption( 'editfont' ),
],
'removecomments' => [
'type' => 'check',
@@ -203,6 +208,8 @@
],
];
 
+   $this->getOutput()->addModuleStyles( 
'mediawiki.editfont.styles' );
+
$form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form
->setSubmitTextMsg( 'expand_templates_ok' )
@@ -226,7 +233,11 @@
$output,
10,
10,
-   [ 'id' => 'output', 'readonly' => 'readonly' ]
+   [
+   'id' => 'output',
+   'readonly' => 'readonly',
+   'class' => 'mw-editfont-' . 
$this->getUser()->getOption( 'editfont' )
+   ]
);
 
return $out;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8919b4d5caf13749d81b419aff276f7c57d7049
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expand templates: Use editfont on wikitext inputs

2018-01-01 Thread Esanders (Code Review)
Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401394 )

Change subject: Expand templates: Use editfont on wikitext inputs
..

Expand templates: Use editfont on wikitext inputs

Change-Id: Ie8919b4d5caf13749d81b419aff276f7c57d7049
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/401394/1

diff --git a/includes/specials/SpecialExpandTemplates.php 
b/includes/specials/SpecialExpandTemplates.php
index 560d75a..354acb7 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -172,6 +172,11 @@
'rows' => 10,
'default' => $input,
'id' => 'input',
+   // The following classes can be used here:
+   // * mw-editfont-monospace
+   // * mw-editfont-sans-serif
+   // * mw-editfont-serif
+   'cssclass' => 'mw-editfont-' . 
$this->getUser()->getOption( 'editfont' ),
],
'removecomments' => [
'type' => 'check',
@@ -203,6 +208,8 @@
],
];
 
+   $this->getOutput()->addModuleStyles( 
'mediawiki.editfont.styles' );
+
$form = HTMLForm::factory( 'ooui', $fields, $this->getContext() 
);
$form
->setSubmitTextMsg( 'expand_templates_ok' )
@@ -226,7 +233,7 @@
$output,
10,
10,
-   [ 'id' => 'output', 'readonly' => 'readonly' ]
+   [ 'id' => 'output', 'readonly' => 'readonly', 'class' 
=> 'mw-editfont-' . $this->getUser()->getOption( 'editfont' ) ]
);
 
return $out;

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

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

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