From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 29 Nov 2005 20:25:20 +0000 (+0000)
Subject: Fix bug 4048 by adding a new 'privacy' link in footer. Disable it with '-'
X-Git-Tag: 1.6.0~1095
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=11665110cfeb66639fc61a5495e63505b3a201dc;p=lhc%2Fweb%2Fwiklou.git

Fix bug 4048 by adding a new 'privacy' link in footer. Disable it with '-'
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 35601401f9..e2b3c4f397 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -526,6 +526,10 @@ END;
 		if( $disclaimer ) {
 			$s .= ' | ' . $disclaimer;
 		}
+		$privacy = $this->privacyLink(); # may be empty too
+		if( $privacy ) {
+			$s .= ' | ' . $privacy;
+		}
 
 		if ( $wgOut->isArticleRelated() ) {
 			if ( $wgTitle->getNamespace() == NS_IMAGE ) {
@@ -981,13 +985,21 @@ END;
 		return $s;
 	}
 
+	function privacyLink() {
+		$privacy = wfMsg( 'privacy' );
+		if ($privacy == '-') {
+			return '';
+		} else {
+			return $this->makeKnownLink( wfMsgForContent( 'privacypage' ), $privacy);
+		}
+	}
+
 	function aboutLink() {
 		$s = $this->makeKnownLink( wfMsgForContent( 'aboutpage' ),
 		  wfMsg( 'aboutsite' ) );
 		return $s;
 	}
 
-
 	function disclaimerLink() {
 		$disclaimers = wfMsg( 'disclaimers' );
 		if ($disclaimers == '-') {
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index e7432606a4..5b80782995 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -357,6 +357,7 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'copyrightico', $this->getCopyrightIcon() );
 		$tpl->set( 'poweredbyico', $this->getPoweredBy() );
 		$tpl->set( 'disclaimer', $this->disclaimerLink() );
+		$tpl->set( 'privacy', $this->privacyLink() );
 		$tpl->set( 'about', $this->aboutLink() );
 
 		$tpl->setRef( 'debug', $out->mDebugtext );
diff --git a/languages/Language.php b/languages/Language.php
index 72304ff29a..d9c9ee3c5a 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -414,6 +414,8 @@ parent class in order maintain consistency across languages.
 
 'disclaimers' => 'Disclaimers',
 'disclaimerpage' => 'Project:General_disclaimer',
+'privacy' => 'Privacy policy',
+'privacypage' => 'Project:Privacy_policy',
 'errorpagetitle' => 'Error',
 'returnto'		=> 'Return to $1.',
 'tagline'      	=> 'From {{SITENAME}}',
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 32ebab1770..547eb9e5c5 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -223,6 +223,7 @@ class MonoBookTemplate extends QuickTemplate {
 	  <?php if($this->data['numberofwatchingusers' ]) { ?><li id="f-numberofwatchingusers"><?php  $this->html('numberofwatchingusers') ?></li><?php } ?>
 	  <?php if($this->data['credits'   ]) { ?><li id="f-credits"><?php    $this->html('credits')    ?></li><?php } ?>
 	  <?php if($this->data['copyright' ]) { ?><li id="f-copyright"><?php  $this->html('copyright')  ?></li><?php } ?>
+	  <?php if($this->data['privacy'   ]) { ?><li id="f-privacy"><?php    $this->html('privacy')    ?></li><?php } ?>
 	  <?php if($this->data['about'     ]) { ?><li id="f-about"><?php      $this->html('about')      ?></li><?php } ?>
 	  <?php if($this->data['disclaimer']) { ?><li id="f-disclaimer"><?php $this->html('disclaimer') ?></li><?php } ?>
 	  <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?>
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 5ad5e66372..7dcb5700e9 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -105,7 +105,8 @@ div#f-poweredbyico,
 div#f-copyrightico,
 li#f-viewcount,
 li#f-about,
-li#f-disclaimer {
+li#f-disclaimer,
+li#f-privacy {
     /* Hides all the elements irrelevant for printing */
     display: none;
 }