Adamw has submitted this change and it was merged.
Change subject: Moved EducationProgram preferences to Appearance tab
......................................................................
Moved EducationProgram preferences to Appearance tab
* Removed "did you know user preference.
* Shifted EducationPrograms user preference to Appearance tab
as it affects the appearance of the site, and to remove the
misc tab.
Bug: 52759
Change-Id: I81916c208a49a55a14a08611bf6a20f21bfb0449
---
M EducationProgram.hooks.php
M EducationProgram.settings.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 3 insertions(+), 14 deletions(-)
Approvals:
Ragesoss: Looks good to me, but someone else must approve
Adamw: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index c5cd6fb..2c53d5e 100644
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -146,15 +146,7 @@
$preferences['ep_showtoplink'] = array(
'type' => 'toggle',
'label-message' => 'ep-prefs-showtoplink',
- 'section' => 'misc/education',
- );
- }
-
- if ( Settings::get( 'enableDykSetting' ) ) {
- $preferences['ep_showdyk'] = array(
- 'type' => 'toggle',
- 'label-message' => 'ep-prefs-showdyk',
- 'section' => 'misc/education',
+ 'section' => 'rendering/education',
);
}
@@ -162,7 +154,7 @@
$preferences['ep_bulkdelorgs'] = array(
'type' => 'toggle',
'label-message' => 'ep-prefs-bulkdelorgs',
- 'section' => 'misc/education',
+ 'section' => 'rendering/education',
);
}
@@ -170,7 +162,7 @@
$preferences['ep_bulkdelcourses'] = array(
'type' => 'toggle',
'label-message' => 'ep-prefs-bulkdelcourses',
- 'section' => 'misc/education',
+ 'section' => 'rendering/education',
);
}
diff --git a/EducationProgram.settings.php b/EducationProgram.settings.php
index 1c7720a..2fe7393 100644
--- a/EducationProgram.settings.php
+++ b/EducationProgram.settings.php
@@ -46,7 +46,6 @@
'timelineUserLimit' => 3,
'dykCategory' => 'MyCourses Did You Know',
'dykOrgCategory' => '$2/$1', // $1 = org name, $2 = dykCategory setting
- 'enableDykSetting' => true,
'timelineMessageLengthLimit' => 250,
'requireRealName' => false,
'collectRealName' => false,
diff --git a/i18n/en.json b/i18n/en.json
index 36d61a2..61aa568 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -101,7 +101,6 @@
"ep-prefs-showtoplink": "Show a link to [[Special:MyCourses|your courses]]
at the top of every page.",
"ep-prefs-bulkdelorgs": "Show a bulk deletion control for the
[[Special:Institutions|institutions]].",
"ep-prefs-bulkdelcourses": "Show a bulk deletion control for the
[[Special:Courses|courses]].",
- "ep-prefs-showdyk": "Show the \"Did you know box\" on
[[Special:MyCourses|your courses]] page.",
"right-ep-org": "Manage Education Program institutions",
"right-ep-course": "Manage Education Program courses",
"right-ep-token": "See Education Program enrollment tokens",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 98cda34..e68a47e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -115,7 +115,6 @@
"ep-prefs-showtoplink": "Preference checkbox label",
"ep-prefs-bulkdelorgs": "Preference checkbox label",
"ep-prefs-bulkdelcourses": "Preference checkbox label",
- "ep-prefs-showdyk": "Message shown next to the user preference checkbox
that allows controlling if the \"Did you know box\" should show up on
Special:MyCourses.",
"right-ep-org": "{{doc-right|ep-org}}",
"right-ep-course": "{{doc-right|ep-course}}",
"right-ep-token": "{{doc-right|ep-token}}",
--
To view, visit https://gerrit.wikimedia.org/r/125959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81916c208a49a55a14a08611bf6a20f21bfb0449
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
Gerrit-Reviewer: 01tonythomas <[email protected]>
Gerrit-Reviewer: Adamw <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: MZMcBride <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Ragesoss <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
