[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move Beta Features screenshots into modules

2017-10-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386739 )

Change subject: Move Beta Features screenshots into modules
..


Move Beta Features screenshots into modules

Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f
---
M VisualEditor.hooks.php
R modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg
R modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg
R modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg
R modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg
5 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 3fcc30f..9a86a01 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -686,7 +686,7 @@
 
public static function onGetBetaPreferences( User $user, array 
&$preferences ) {
$coreConfig = RequestContext::getMain()->getConfig();
-   $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . 
"/VisualEditor";
+   $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . 
"/VisualEditor/modules/ve-wmf";
 
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$preferences['visualeditor-enable'] = [
diff --git a/betafeatures-icon-VisualEditor-ltr.svg 
b/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg
similarity index 100%
rename from betafeatures-icon-VisualEditor-ltr.svg
rename to modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg
diff --git a/betafeatures-icon-VisualEditor-rtl.svg 
b/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg
similarity index 100%
rename from betafeatures-icon-VisualEditor-rtl.svg
rename to modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg
diff --git a/betafeatures-icon-WikitextEditor-ltr.svg 
b/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg
similarity index 100%
rename from betafeatures-icon-WikitextEditor-ltr.svg
rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg
diff --git a/betafeatures-icon-WikitextEditor-rtl.svg 
b/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg
similarity index 100%
rename from betafeatures-icon-WikitextEditor-rtl.svg
rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
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...VisualEditor[master]: Move Beta Features screenshots into modules

2017-10-26 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386739 )

Change subject: Move Beta Features screenshots into modules
..

Move Beta Features screenshots into modules

Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f
---
M VisualEditor.hooks.php
R modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg
R modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg
R modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg
R modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg
5 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/39/386739/1

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 3fcc30f..9a86a01 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -686,7 +686,7 @@
 
public static function onGetBetaPreferences( User $user, array 
&$preferences ) {
$coreConfig = RequestContext::getMain()->getConfig();
-   $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . 
"/VisualEditor";
+   $iconpath = $coreConfig->get( 'ExtensionAssetsPath' ) . 
"/VisualEditor/modules/ve-wmf";
 
$veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
$preferences['visualeditor-enable'] = [
diff --git a/betafeatures-icon-VisualEditor-ltr.svg 
b/modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg
similarity index 100%
rename from betafeatures-icon-VisualEditor-ltr.svg
rename to modules/ve-wmf/betafeatures-icon-VisualEditor-ltr.svg
diff --git a/betafeatures-icon-VisualEditor-rtl.svg 
b/modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg
similarity index 100%
rename from betafeatures-icon-VisualEditor-rtl.svg
rename to modules/ve-wmf/betafeatures-icon-VisualEditor-rtl.svg
diff --git a/betafeatures-icon-WikitextEditor-ltr.svg 
b/modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg
similarity index 100%
rename from betafeatures-icon-WikitextEditor-ltr.svg
rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-ltr.svg
diff --git a/betafeatures-icon-WikitextEditor-rtl.svg 
b/modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg
similarity index 100%
rename from betafeatures-icon-WikitextEditor-rtl.svg
rename to modules/ve-wmf/betafeatures-icon-WikitextEditor-rtl.svg

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b46f334d226a3e061a3534fd2982397b66e2c6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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