jenkins-bot has submitted this change and it was merged.
Change subject: Watchlist: Separate non-form parts out of the <fieldset>
......................................................................
Watchlist: Separate non-form parts out of the <fieldset>
These include the information blurb at the top and the "Mark all pages
visited" button.
This also allows us the change the form-inside-fieldset nesting to
saner fieldset-inside-form. The 'mw-watchlist-form-namespaceselector'
id was removed; the primary form now has id of 'mw-watchlist-form'.
Bug: 48615
Change-Id: I9398922dc4cabc7b190f8d97c5d91a05710206bb
---
M includes/specials/SpecialWatchlist.php
1 file changed, 13 insertions(+), 9 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index b4bea60..5d3dc2f 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -245,12 +245,8 @@
$output->showLagWarning( $lag );
}
- # Create output form
- $form = Xml::fieldset(
- $this->msg( 'watchlist-options' )->text(),
- false,
- array( 'id' => 'mw-watchlist-options' )
- );
+ # Create output
+ $form = '';
# Show watchlist header
$form .= "<p>";
@@ -275,7 +271,16 @@
$form .= Xml::closeElement( 'form' ) . "\n";
}
- $form .= "<hr />\n";
+ $form .= Xml::openElement( 'form', array(
+ 'method' => 'post',
+ 'action' => $this->getTitle()->getLocalURL(),
+ 'id' => 'mw-watchlist-form'
+ ) );
+ $form .= Xml::fieldset(
+ $this->msg( 'watchlist-options' )->text(),
+ false,
+ array( 'id' => 'mw-watchlist-options' )
+ );
$tables = array( 'recentchanges', 'watchlist' );
$fields = RecentChange::selectFields();
@@ -355,7 +360,6 @@
$form .= $wlInfo;
$form .= $cutofflinks;
$form .= $lang->pipeList( $links ) . "\n";
- $form .= Xml::openElement( 'form', array( 'method' => 'post',
'action' => $this->getTitle()->getLocalURL(), 'id' =>
'mw-watchlist-form-namespaceselector' ) ) . "\n";
$form .= "<hr />\n<p>";
$form .= Html::namespaceSelector(
array(
@@ -386,8 +390,8 @@
foreach ( $hiddenFields as $key => $value ) {
$form .= Html::hidden( $key, $value ) . "\n";
}
- $form .= Xml::closeElement( 'form' ) . "\n";
$form .= Xml::closeElement( 'fieldset' ) . "\n";
+ $form .= Xml::closeElement( 'form' ) . "\n";
$output->addHTML( $form );
# If there's nothing to show, stop here
--
To view, visit https://gerrit.wikimedia.org/r/64557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9398922dc4cabc7b190f8d97c5d91a05710206bb
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Matmarex <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
