jenkins-bot has submitted this change and it was merged.
Change subject: Move Add pages and add tracking category
......................................................................
Move Add pages and add tracking category
Move Add pages form to the top so that scrolling isn't needed to reach
it in long lists; add tracking category for delivery lists.
Change-Id: I5fd351b6074c1c0036738d34b586088a6d8cb9d3
---
M MassMessage.php
M i18n/en.json
M i18n/qqq.json
M includes/content/MassMessageListContent.php
M modules/ext.MassMessage.content.css
5 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MassMessage.php b/MassMessage.php
index 32f9543..2e8ec91 100644
--- a/MassMessage.php
+++ b/MassMessage.php
@@ -204,3 +204,6 @@
// User rights
$wgAvailableRights[] = 'massmessage'; // Local messaging
$wgGroupPermissions['sysop']['massmessage'] = true;
+
+// Tracking category for spamlists
+$wgTrackingCategories[] = 'massmessage-list-category';
diff --git a/i18n/en.json b/i18n/en.json
index 788f7f2..9b1f2ab 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -96,5 +96,7 @@
"massmessage-summary-addmulti": "Added $1 {{PLURAL:$1|pages}}",
"massmessage-summary-remove": "Removed [[:$1]]",
"massmessage-summary-removeonsite": "Removed $1 on $2",
- "massmessage-summary-removemulti": "Removed $1 {{PLURAL:$1|pages}}"
+ "massmessage-summary-removemulti": "Removed $1 {{PLURAL:$1|pages}}",
+ "massmessage-list-category": "MassMessage delivery lists",
+ "massmessage-list-category-desc": "The page is a delivery list for
[[Special:MassMessage]]."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a891e35..432227f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -97,5 +97,7 @@
"massmessage-summary-addmulti": "Edit summary for adding multiple
target pages\n* $1 is the number of pages added",
"massmessage-summary-remove": "Edit summary for removing a target
page\n* $1 is the title of the page",
"massmessage-summary-removeonsite": "Edit summary for removing a target
page on another wiki\n* $1 is the title of the page\n* $2 is the domain of the
wiki",
- "massmessage-summary-removemulti": "Edit summary for removing multiple
target pages\n* $1 is the number of pages removed"
+ "massmessage-summary-removemulti": "Edit summary for removing multiple
target pages\n* $1 is the number of pages removed",
+ "massmessage-list-category": "Name for the tracking category containing
all MassMessage delivery lists",
+ "massmessage-list-category-desc": "Description for the tracking
category containing delivery lists"
}
diff --git a/includes/content/MassMessageListContent.php
b/includes/content/MassMessageListContent.php
index 9da0b71..15f9630 100644
--- a/includes/content/MassMessageListContent.php
+++ b/includes/content/MassMessageListContent.php
@@ -171,6 +171,7 @@
// Parse the description text.
$output = $wgParser->parse( $this->getDescription(), $title,
$options, true, true, $revId );
+ $wgParser->addTrackingCategory( 'massmessage-list-category' );
// Generate output HTML, if needed.
if ( $generateHtml ) {
@@ -180,8 +181,8 @@
} else {
$warning = '';
}
- $output->setText( $warning . $output->getText() .
$this->getTargetsHtml()
- . self::getAddForm() );
+ $output->setText( $warning . $output->getText() .
self::getAddForm()
+ . $this->getTargetsHtml() );
} else {
$output->setText( '' );
}
diff --git a/modules/ext.MassMessage.content.css
b/modules/ext.MassMessage.content.css
index 58a5062..1b63008 100644
--- a/modules/ext.MassMessage.content.css
+++ b/modules/ext.MassMessage.content.css
@@ -12,7 +12,7 @@
font-style: italic;
}
-#mw-massmessage-addpages label {
+#mw-massmessage-addform label {
margin-right: 2px;
}
--
To view, visit https://gerrit.wikimedia.org/r/152067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fd351b6074c1c0036738d34b586088a6d8cb9d3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan <wctai...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
