jenkins-bot has submitted this change and it was merged.
Change subject: Add contact pages for legal to metawiki
......................................................................
Add contact pages for legal to metawiki
Change-Id: Id3c5e567f0e0ff193805109314f8d698f59049a3
---
A docroot/noc/conf/LegalContactPages.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
A wmf-config/LegalContactPages.php
5 files changed, 138 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/LegalContactPages.php.txt
b/docroot/noc/conf/LegalContactPages.php.txt
new file mode 120000
index 0000000..1aec108
--- /dev/null
+++ b/docroot/noc/conf/LegalContactPages.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/LegalContactPages.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 1d2bcf2..270177a 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -21,6 +21,7 @@
filebackend.php
flaggedrevs.php
jobqueue-eqiad.php
+ LegalContactPages.php
liquidthreads.php
logging-labs.php
lucene-common.php
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 78e98f2..24fdade 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -831,6 +831,10 @@
if ( $wmgUseContactPage ) {
include( $IP . '/extensions/ContactPage/ContactPage.php' );
$wgContactConfig['default'] = array_merge( $wgContactConfig['default'],
$wmgContactPageConf );
+
+ if ( $wgDBname === 'metawiki' ) {
+ include( "$wmfConfigDir/LegalContactPages.php" );
+ }
}
if ( $wmgUseSecurePoll ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 3018ba6..3bfd99f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10881,6 +10881,7 @@
'wmgUseContactPage' => array(
'default' => false,
'foundationwiki' => true,
+ 'metawiki' => true,
'nlwiki' => true,
'testwiki' => true,
),
diff --git a/wmf-config/LegalContactPages.php b/wmf-config/LegalContactPages.php
new file mode 100644
index 0000000..6cf7f0f
--- /dev/null
+++ b/wmf-config/LegalContactPages.php
@@ -0,0 +1,131 @@
+<?php
+
+$trademark = array(
+ 'type' => 'multiselect',
+ 'options-messages' => array(
+ 'contactpage-wikimedia-trademark-globe' => 'wikiglobe',
+ 'contactpage-wikimedia-trademark-wikiwordmark' =>
'wikipediawordmark',
+ 'contactpage-wikimedia-trademark-w' => 'stylizedw',
+ 'contactpage-wikimedia-trademark-foundation' => 'foundation',
+ 'contactpage-wikimedia-trademark-commons' => 'commons',
+ 'contactpage-wikimedia-trademark-incubator' => 'incubator',
+ 'contactpage-wikimedia-trademark-mediawiki' => 'mediawiki',
+ 'contactpage-wikimedia-trademark-wikiquote' => 'wikiquote',
+ 'contactpage-wikimedia-trademark-wikibooks' => 'wikibooks',
+ 'contactpage-wikimedia-trademark-wikimania' => 'wikimania',
+ 'contactpage-wikimedia-trademark-wikimedia' => 'wikimedia',
+ 'contactpage-wikimedia-trademark-wikinews' => 'wikinews',
+ 'contactpage-wikimedia-trademark-wikisource' => 'wikisource',
+ 'contactpage-wikimedia-trademark-wikispecies' => 'wikispecies',
+ 'contactpage-wikimedia-trademark-wikiversity' => 'wikiversity',
+ 'contactpage-wikimedia-trademark-wiktionary' => 'wiktionary',
+ 'contactpage-wikimedia-trademark-wikivoyage' => 'wikivoyage',
+ ),
+ 'required' => true,
+);
+
+$wgContactConfig['requestlicense'] = array(
+ 'RecipientUser' => 'Trademarks (WMF)',
+ 'SenderEmail' => $wmgNotificationSender, // TODO: Replace with details
submitted on form
+ 'SenderName' => 'Contact Page',
+ 'RequireDetails' => true,
+ 'IncludeIP' => false,
+ 'AdditionalFields' => array(
+ 'Username' => array(
+ 'type' => 'text',
+ 'label-message' =>
'contactpage-license-request-username',
+ ),
+ 'Site' => array(
+ 'type' => 'text',
+ 'label-message' =>
'contactpage-license-request-relevantsite',
+ ),
+ 'Group' => array(
+ 'type' => 'text',
+ 'label-message' => 'contactpage-license-request-group',
+ ),
+ 'Title' => array(
+ 'type' => 'text',
+ 'label-message' => 'contactpage-license-request-title',
+ ),
+ 'Org' => array(
+ 'type' => 'text',
+ 'label-message' =>
'contactpage-license-request-organization',
+ ),
+ 'OrgType' => array(
+ 'type' => 'text',
+ 'label-message' =>
'contactpage-license-request-organization-type',
+ ),
+ 'ProposedUse' => array(
+ 'type' => 'selectorother',
+ 'label-message' =>
'contactpage-license-request-use-proposed',
+ 'options-messages' => array(
+ 'contactpage-license-request-use-online' =>
'online',
+ 'contactpage-license-request-use-book' =>
'book',
+ 'contactpage-license-request-use-print' =>
'print',
+ 'contactpage-license-request-use-tv' => 'tv',
+ ),
+ 'default' => 'online',
+ 'required' => true,
+ ),
+
+ 'Description' => array(
+ 'label-message' =>
'contactpage-license-request-description',
+ 'type' => 'textarea',
+ 'rows' => 10,
+ 'cols' => 80,
+ 'required' => true,
+ ),
+
+ 'Trademark' => array(
+ 'label-message' =>
'contactpage-license-request-selectmark',
+ ) + $trademark,
+
+ 'use-note' => array(
+ 'type' => 'info',
+ 'help-messages' => array(
'contactpage-license-request-use-note' ),
+ ),
+ )
+);
+
+$wgContactConfig['licenseabuse'] = array(
+ 'RecipientUser' => 'Trademarks (WMF)',
+ 'SenderEmail' => $wmgNotificationSender, // TODO: Replace with details
submitted on form
+ 'SenderName' => 'Contact Page',
+ 'RequireDetails' => true,
+ 'IncludeIP' => false,
+ 'AdditionalFields' => array(
+ 'Description' => array(
+ 'label-message' =>
'contactpage-license-abuse-description',
+ 'type' => 'textarea',
+ 'rows' => 5,
+ 'cols' => 80,
+ 'required' => true,
+ ),
+ 'Location' => array(
+ 'label-message' => 'contactpage-license-abuse-location',
+ 'type' => 'textarea',
+ 'rows' => 5,
+ 'cols' => 80,
+ 'required' => true,
+ ),
+ 'TheirContact' => array(
+ 'label-message' =>
'contactpage-license-abuse-theircontact',
+ 'type' => 'textarea',
+ 'rows' => 5,
+ 'cols' => 80,
+ 'required' => true,
+ ),
+ 'YourContact' => array(
+ 'label-message' =>
'contactpage-license-abuse-yourcontact',
+ 'type' => 'textarea',
+ 'rows' => 5,
+ 'cols' => 80,
+ 'required' => true,
+ ),
+ 'TradeMark' => array(
+ 'label-message' =>
'contactpage-license-abuse-selectmark',
+ ) + $trademark,
+ )
+);
+
+unset( $trademark );
--
To view, visit https://gerrit.wikimedia.org/r/119873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3c5e567f0e0ff193805109314f8d698f59049a3
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Deskana <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
