Cleanup for r41782: use a common class, not a series of specific IDs.

Per Brions codereview: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/41782#c124

diff --git a/includes/Article.php b/includes/Article.php
index 143ca36..69f1fe9 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -842,7 +842,7 @@ class Article {
                                $count = $pager->getNumRows();
                                if( $count > 0 ) {
                                        $pager->mLimit = 10;
-                                       $wgOut->addHtml( '<div id="mw-deleted-notice">' );
+                                       $wgOut->addHtml( '<div class="mw-warning-with-logexcerpt">' );
                                        $wgOut->addWikiMsg( 'deleted-notice' );
                                        $wgOut->addHTML(
                                                $loglist->beginLogEventsList() .

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f11affc..6ffa9c6 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1201,7 +1201,7 @@ class EditPage {
                                $noticeMsg = 'protectedpagewarning';
                                $classes[] = 'mw-textarea-protected';
                        }
-                       $wgOut->addHTML( "<div id='mw-edit-$noticeMsg'>\n" );
+                       $wgOut->addHTML( "<div class='mw-warning-with-logexcerpt'>\n" );
                        $wgOut->addWikiMsg( $noticeMsg );
                        LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle->getPrefixedText(), '', 1 );
                        $wgOut->addHTML( "</div>\n" );
@@ -2344,7 +2344,7 @@ END
                $count = $pager->getNumRows();
                if ( $count > 0 ) {
                        $pager->mLimit = 10;
-                       $out->addHtml( '<div id="mw-recreate-deleted-warn">' );
+                       $out->addHtml( '<div class="mw-warning-with-logexcerpt">' );
                        $out->addWikiMsg( 'recreate-deleted-warn' );
                        $out->addHTML(
                                $loglist->beginLogEventsList() .

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 55d51a0..a61462d 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1735,7 +1735,7 @@ wgUploadAutoFill = {$autofill};
                $loglist = new LogEventsList( $wgUser->getSkin(), $out );
                $pager = new LogPager( $loglist, 'delete', false, $filename );
                if( $pager->getNumRows() > 0 ) {
-                       $out->addHtml( '<div id="mw-upload-deleted-warn">' );
+                       $out->addHtml( '<div class="mw-warning-with-logexcerpt">' );
                        $out->addWikiMsg( 'upload-wasdeleted' );
                        $out->addHTML(
                                $loglist->beginLogEventsList() .

diff --git a/skins/common/shared.css b/skins/common/shared.css
index 8d5bd23..9ce28a1 100644 (file)
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -279,20 +279,12 @@ td#mw-emailuser-sender, td#mw-emailuser-recipient {
  * Page protection warning
  * incl. log entries for these warnings
  */
-div#mw-upload-deleted-warn,
-div#mw-deleted-notice,
-div#mw-recreate-deleted-warn,
-div#mw-edit-semiprotectedpagewarning,
-div#mw-edit-protectedpagewarning {
+div.mw-warning-with-logexcerpt {
        padding: 3px;
        margin-bottom: 3px;
        border: 2px solid #2F6FAB;
 }
-div#mw-upload-deleted-warn ul li,
-div#mw-deleted-notice ul li,
-div#mw-recreate-deleted-warn ul li,
-div#mw-edit-semiprotectedpagewarning ul li,
-div#mw-edit-protectedpagewarning ul li {
+div.mw-warning-with-logexcerpt ul li {
        font-size: 90%;
 }