From 8b663c901e9f9c3e9c007fbe79ab5f89d47b359f Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Thu, 6 Mar 2008 14:59:28 +0000 Subject: [PATCH] * Add links to page and file deletion forms to edit predefined delete reasons This makes the forms a bit more consistent to special:blockip --- RELEASE-NOTES | 1 + includes/Article.php | 6 ++++++ includes/DefaultSettings.php | 2 +- includes/FileDeleteForm.php | 6 ++++++ languages/messages/MessagesDe.php | 2 ++ languages/messages/MessagesEn.php | 2 ++ maintenance/language/messages.inc | 2 ++ skins/common/common_rtl.css | 4 ++-- skins/common/oldshared.css | 4 ++-- skins/modern/main.css | 4 ++-- skins/modern/rtl.css | 4 ++-- skins/monobook/main.css | 4 ++-- skins/monobook/rtl.css | 4 ++-- skins/simple/rtl.css | 4 ++-- 14 files changed, 34 insertions(+), 15 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8a29f8f357..d01ecd314d 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -38,6 +38,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN reduce broken form submissions * Add --old-redirects-only option to maintenance/refreshLinks.php, to add old redirects to the redirect table +* Add links to page and file deletion forms to edit predefined delete reasons === Bug fixes in 1.13 === diff --git a/includes/Article.php b/includes/Article.php index 624c9762ba..b42994ec2b 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -2128,6 +2128,12 @@ class Article { Xml::hidden( 'wpEditToken', $wgUser->editToken() ) . Xml::closeElement( 'form' ); + if ( $wgUser->isAllowed( 'editinterface' ) ) { + $skin = $wgUser->getSkin(); + $link = $skin->makeLink ( 'MediaWiki:deletereason-dropdown', wfMsgHtml( 'delete-edit-reasonlist' ) ); + $form .= '

' . $link . '

'; + } + $wgOut->addHTML( $form ); $this->showLogExtract( $wgOut ); } diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index b955d8662e..ec7a4b00b3 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1326,7 +1326,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '119'; +$wgStyleVersion = '120'; # Server-side caching: diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 757affbb2b..381a81b57b 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -152,6 +152,12 @@ class FileDeleteForm { Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); + if ( $wgUser->isAllowed( 'editinterface' ) ) { + $skin = $wgUser->getSkin(); + $link = $skin->makeLink ( 'MediaWiki:filedelete-reason-dropdown', wfMsgHtml( 'filedelete-edit-reasonlist' ) ); + $form .= '

' . $link . '

'; + } + $wgOut->addHtml( $form ); } diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index a9659b1413..2f65998800 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -1236,6 +1236,7 @@ Bitte gib der Datei einen Namen, der den Inhalt besser beschreibt.', * Allgemeine Löschgründe ** Urheberrechtsverletzung ** Duplikat', +'filedelete-edit-reasonlist' => 'Löschgründe bearbeiten', # MIME search 'mimesearch' => 'Suche nach MIME-Typ', @@ -1550,6 +1551,7 @@ Um die Einstellungen deiner Beobachtungsliste anzupassen, besuche: {{fullurl:Spe ** Wunsch des Autors ** Urheberrechtsverletzung ** Vandalismus', +'delete-edit-reasonlist' => 'Löschgründe bearbeiten', 'delete-toobig' => 'Diese Seite hat mit mehr als $1 Versionen eine sehr lange Versionsgeschichte. Das Löschen solcher Seiten wurde eingeschränkt, um eine versehentliche Überlastung der Server zu verhindern.', 'delete-warning-toobig' => 'Diese Seite hat mit mehr als $1 Versionen eine sehr lange Versionsgeschichte. Das Löschen kann zu Störungen im Datenbankbetrieb führen.', 'rollback' => 'Zurücksetzen der Änderungen', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 8a37f912b9..d6f2516432 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1566,6 +1566,7 @@ PICT # misc. *Common delete reasons ** Copyright violation ** Duplicated file', +'filedelete-edit-reasonlist' => 'Edit delete reasons', # MIME search 'mimesearch' => 'MIME search', @@ -1886,6 +1887,7 @@ Please confirm that you intend to do this, that you understand the consequences, ** Author request ** Copyright violation ** Vandalism', +'delete-edit-reasonlist' => 'Edit delete reasons', 'delete-toobig' => 'This page has a large edit history, over $1 revisions. Deletion of such pages has been restricted to prevent accidental disruption of {{SITENAME}}.', 'delete-warning-toobig' => 'This page has a large edit history, over $1 revisions. Deleting it may disrupt database operations of {{SITENAME}}; proceed with caution.', 'rollback' => 'Roll back edits', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 5009ea1f0d..622ea246fd 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -978,6 +978,7 @@ $wgMessageStructure = array( 'filedelete-otherreason', 'filedelete-reason-otherlist', 'filedelete-reason-dropdown', + 'filedelete-edit-reasonlist', ), 'mimesearch' => array( 'mimesearch', @@ -1268,6 +1269,7 @@ $wgMessageStructure = array( 'deleteotherreason', 'deletereasonotherlist', 'deletereason-dropdown', + 'delete-edit-reasonlist', 'delete-toobig', 'delete-warning-toobig', 'rollback', diff --git a/skins/common/common_rtl.css b/skins/common/common_rtl.css index d26acc13d9..05890db7fa 100644 --- a/skins/common/common_rtl.css +++ b/skins/common/common_rtl.css @@ -28,8 +28,8 @@ div.tright, div.floatright { div.tleft, div.floatleft { clear: left; } -/* Unblock and Ipblocklist links of Special:Blockip */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { float: left; } table.filehistory th { diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css index ead422dc78..dd58d9d603 100644 --- a/skins/common/oldshared.css +++ b/skins/common/oldshared.css @@ -441,8 +441,8 @@ table.multipageimage td { .templatesUsed { margin-top: 1em; } -/* Convenience links on Special:Ipblocklist */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { font-size: 90%; float: right; } diff --git a/skins/modern/main.css b/skins/modern/main.css index d56c0007ab..2e478ea168 100644 --- a/skins/modern/main.css +++ b/skins/modern/main.css @@ -989,8 +989,8 @@ tr.sv-space td { display: none; } margin: 0.1em 0; } -/* Convenience links on Special:Ipblocklist */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { font-size: 90%; float: right; } diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css index c92dbcfe8a..eedcbd3577 100644 --- a/skins/modern/rtl.css +++ b/skins/modern/rtl.css @@ -91,8 +91,8 @@ input#wpSave, input#wpDiff { float: right; margin: 0 0 1em 3em; } -/* Unblock and Ipblocklist links of Special:Blockip */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { float: left; } diff --git a/skins/monobook/main.css b/skins/monobook/main.css index dd3da3a12f..af65080c86 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -1514,8 +1514,8 @@ tr.sv-space td { display: none; } margin: 0.1em 0; } -/* Convenience links on Special:Ipblocklist */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { font-size: 90%; float: right; } diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css index 2bd5261e21..5b6889f1fe 100644 --- a/skins/monobook/rtl.css +++ b/skins/monobook/rtl.css @@ -215,8 +215,8 @@ input#wpSave, input#wpDiff { float: right; margin: 0 0 1em 3em; } -/* Unblock and Ipblocklist links of Special:Blockip */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { float: left; } diff --git a/skins/simple/rtl.css b/skins/simple/rtl.css index 002aa72ec2..d8061dad8a 100644 --- a/skins/simple/rtl.css +++ b/skins/simple/rtl.css @@ -161,8 +161,8 @@ input#wpSave, input#wpDiff { float: right; margin: 0 0 1em 3em; } -/* Unblock and Ipblocklist links of Special:Blockip */ -p.mw-ipb-conveniencelinks { +/* Convenience links to edit block and delete reasons */ +p.mw-ipb-conveniencelinks, p.mw-filedelete-editreasons, p.mw-delete-editreasons { float: left; } -- 2.20.1