From: MatmaRex
Date: Wed, 26 Sep 2012 19:53:58 +0000 (+0200)
Subject: CologneBlue rewrite: kill pageTitle(), pageSubtitle(), printableLink()
X-Git-Tag: 1.31.0-rc.0~22157
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=a1b46bc0883e96bf8ac461b712f276d15bddc6e5;p=lhc%2Fweb%2Fwiklou.git
CologneBlue rewrite: kill pageTitle(), pageSubtitle(), printableLink()
Change-Id: I8280e882f312854cc8a8ee86106bbbd31cb897d3
---
diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 723278d678..b172fd2d50 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -175,55 +175,6 @@ class CologneBlueTemplate extends BaseTemplate {
return $wgLang->pipeList( $s );
}
- function printableLink() {
- global $wgOut, $wgRequest, $wgLang;
-
- $s = array();
-
- if ( !$wgOut->isPrintable() ) {
- $printurl = htmlspecialchars( $this->getSkin()->getTitle()->getLocalUrl(
- $wgRequest->appendQueryValue( 'printable', 'yes', true ) ) );
- $s[] = ""
- . wfMessage( 'printableversion' )->text() . '';
- }
-
- if ( $wgOut->isSyndicated() ) {
- foreach ( $wgOut->getSyndicationLinks() as $format => $link ) {
- $feedurl = htmlspecialchars( $link );
- $s[] = "" . wfMessage( "feed-$format" )->escaped() . "";
- }
- }
- return $wgLang->pipeList( $s );
- }
-
- /**
- * Gets the h1 element with the page title.
- * @return string
- */
- function pageTitle() {
- global $wgOut;
- $s = '' . $wgOut->getPageTitle() . '
';
- return $s;
- }
-
- function pageSubtitle() {
- global $wgOut;
-
- $sub = $wgOut->getSubtitle();
-
- if ( $sub == '' ) {
- global $wgExtraSubtitle;
- $sub = wfMessage( 'tagline' )->parse() . $wgExtraSubtitle;
- }
-
- $subpages = $this->getSkin()->subPageSubtitle();
- $sub .= !empty( $subpages ) ? "
$subpages" : '';
- $s = "
{$sub}
\n";
-
- return $s;
- }
-
function bottomLinks() {
global $wgOut, $wgUser;
$sep = wfMessage( 'pipe-separator' )->escaped() . "\n";
@@ -547,8 +498,19 @@ class CologneBlueTemplate extends BaseTemplate {
if( $notice ) {
$s .= "\n$notice
\n";
}
- $s .= $this->pageTitle();
- $s .= $this->pageSubtitle() . "\n";
+
+ $s .= '' . $this->data['title'] . '
';
+
+ if ( $this->translator->translate( 'tagline' ) ) {
+ $s .= "" . htmlspecialchars( $this->translator->translate( 'tagline' ) ) . "
";
+ }
+ if ( $this->getSkin()->getOutput()->getSubtitle() ) {
+ $s .= "" . $this->getSkin()->getOutput()->getSubtitle() . "
";
+ }
+ if ( $this->getSkin()->subPageSubtitle() ) {
+ $s .= "" . $this->getSkin()->subPageSubtitle() . "
";
+ }
+
return $s;
}
diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index 4716c38b87..511c81a34a 100644
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -120,12 +120,12 @@ h1 .editsection {
font-size: 55.6%;
}
-h1.pagetitle {
+h1#firstHeading {
padding-bottom: 0;
margin-bottom: 0;
}
-#article p.subtitle {
+#article p.subtitle, #article p.subpages, #article p.tagline {
color: #666666;
font-size: 11pt;
font-weight: bold;