From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Fri, 16 Jul 2004 12:12:35 +0000 (+0000)
Subject: tweaks to sitenotice placement and colours in older skins: grey border, above the... 
X-Git-Tag: 1.5.0alpha1~2670
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=7c7bdc98f5513f60e74d01d94784396434af31d2;p=lhc%2Fweb%2Fwiklou.git

tweaks to sitenotice placement and colours in older skins: grey border, above the heading
---

diff --git a/includes/Skin.php b/includes/Skin.php
index ab40ff88e0..5a93b1553c 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -317,19 +317,14 @@ class Skin {
 	#
 	function beforeContent()
 	{
-		global $wgUser, $wgOut, $wgSiteNotice;
+		global $wgUser, $wgOut;
 
-		if( $wgSiteNotice ) {
-			$note = "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
-		} else {
-			$note = '';
-		}
-		return $this->doBeforeContent() . $note;
+		return $this->doBeforeContent();
 	}
 
 	function doBeforeContent()
 	{
-		global $wgUser, $wgOut, $wgTitle, $wgLang;
+		global $wgUser, $wgOut, $wgTitle, $wgLang, $wgSiteNotice;
 		$fname = 'Skin::doBeforeContent';
 		wfProfileIn( $fname );
 
@@ -379,6 +374,9 @@ class Skin {
 		$s .= "</tr>\n</table>\n</div>\n";
 		$s .= "\n<div id='article'>\n";
 
+		if( $wgSiteNotice ) {
+			$s .= "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
+		}
 		$s .= $this->pageTitle();
 		$s .= $this->pageSubtitle() ;
 		$s .= $this->getCategories();
diff --git a/includes/SkinCologneBlue.php b/includes/SkinCologneBlue.php
index 212e3939fd..b2f99aa275 100644
--- a/includes/SkinCologneBlue.php
+++ b/includes/SkinCologneBlue.php
@@ -13,7 +13,7 @@ class SkinCologneBlue extends Skin {
 
 	function doBeforeContent()
 	{
-		global $wgUser, $wgOut, $wgTitle;
+		global $wgUser, $wgOut, $wgTitle, $wgSiteNotice;
 
 		$s = "";
 		$qb = $this->qbSetting();
@@ -45,6 +45,9 @@ class SkinCologneBlue extends Skin {
 
 		$s .= "\n</div>\n<div id='article'>";
 
+		if( $wgSiteNotice ) {
+			$s .= "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
+		}
 		$s .= $this->pageTitle();
 		$s .= $this->pageSubtitle() . "\n";
 		return $s;
diff --git a/includes/SkinNostalgia.php b/includes/SkinNostalgia.php
index c97c681ddd..301bbf0338 100644
--- a/includes/SkinNostalgia.php
+++ b/includes/SkinNostalgia.php
@@ -18,7 +18,7 @@ class SkinNostalgia extends Skin {
 
 	function doBeforeContent()
 	{
-		global $wgUser, $wgOut, $wgTitle;
+		global $wgUser, $wgOut, $wgTitle, $wgSiteNotice;
 
 		$s = "\n<div id='content'>\n<div id='topbar'>";
 		$s .= $this->logoText( "right" );
@@ -27,6 +27,9 @@ class SkinNostalgia extends Skin {
 		$s .= $this->pageSubtitle() . "\n";
 
 		$s .= $this->topLinks() . "\n<br />";
+		if( $wgSiteNotice ) {
+			$s .= "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
+		}
 		$s .= $this->pageTitleLinks();
 
 		$ol = $this->otherLanguages();
diff --git a/stylesheets/cologneblue.css b/stylesheets/cologneblue.css
index a138309084..1bcba666c1 100644
--- a/stylesheets/cologneblue.css
+++ b/stylesheets/cologneblue.css
@@ -93,7 +93,3 @@ a.stub { color:#772233; text-decoration:none; }
 h2, h3, h4, h5, h6 { margin-bottom: 0; }
 small { font-size: 75%; }
 
-#siteNotice {
-    border: 1px solid red;
-}
-
diff --git a/stylesheets/common.css b/stylesheets/common.css
index c44d5f4c61..ec18a7c806 100644
--- a/stylesheets/common.css
+++ b/stylesheets/common.css
@@ -193,3 +193,6 @@ div.townBox dl dd {
     padding:5px;
     font-size: 95%;
 }
+#siteNotice {
+    border:1px solid #aaaaaa;
+}
diff --git a/stylesheets/wikistandard.css b/stylesheets/wikistandard.css
index dbfcfb1b1e..a1f96644ed 100644
--- a/stylesheets/wikistandard.css
+++ b/stylesheets/wikistandard.css
@@ -42,8 +42,3 @@ p.catlinks { font-size:small; margin-top:0; text-align:right;}
 td { empty-cells:show; }
 td.bottom { border-top: 1px solid gray; }
 td.top { border-bottom: 1px solid gray; }
-
-
-#siteNotice {
-    border: 1px solid red;
-}