Skin updates:
authorBrion Vibber <brion@users.mediawiki.org>
Sun, 11 Apr 2004 01:25:00 +0000 (01:25 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Sun, 11 Apr 2004 01:25:00 +0000 (01:25 +0000)
* Add 'pagetitle' message to customize the HTML page title format (eg, "$1 - Wikipedia Encyclopedia")
* Some XHTML fixes to Nostalgia skin, prefs
* Removing the unfinished Smarty skins, renamed Standard to Classic
* Remove "gnunote" message in favor of general "copyright" msg, which is filled with the link & name in $wgRightsPage/$wgRightsURL and $wgRightsText
* Support a copyright-related icon as $wgRightsIcon (includes sample gnu-fdl.png)
* Show "Powered by MediaWiki" icon in footer (poweredby_mediawiki_88x31.png by Dan Carlson)

18 files changed:
images/gnu-fdl.png [new file with mode: 0644]
images/gnu-fdl.xcf [new file with mode: 0644]
images/poweredby_mediawiki_88x31.png [new file with mode: 0644]
includes/OutputPage.php
includes/Skin.php
includes/SkinNostalgia.php
includes/SkinPHPTal.php
includes/SkinSmarty.php [deleted file]
includes/SpecialPreferences.php
includes/User.php
languages/Language.php
languages/LanguageEo.php
stylesheets/monobook/main.css
stylesheets/montparnasse.css [deleted file]
stylesheets/paddington.css [deleted file]
templates/montparnasse.tpl [deleted file]
templates/paddington.tpl [deleted file]
templates/xhtml_slim.pt

diff --git a/images/gnu-fdl.png b/images/gnu-fdl.png
new file mode 100644 (file)
index 0000000..1371aba
Binary files /dev/null and b/images/gnu-fdl.png differ
diff --git a/images/gnu-fdl.xcf b/images/gnu-fdl.xcf
new file mode 100644 (file)
index 0000000..364440d
Binary files /dev/null and b/images/gnu-fdl.xcf differ
diff --git a/images/poweredby_mediawiki_88x31.png b/images/poweredby_mediawiki_88x31.png
new file mode 100644 (file)
index 0000000..f9175eb
Binary files /dev/null and b/images/poweredby_mediawiki_88x31.png differ
index a1a96aa..d32792a 100644 (file)
@@ -597,7 +597,7 @@ class OutputPage {
                $ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
 
                if ( "" == $this->mHTMLtitle ) {
-                       $this->mHTMLtitle = $this->mPagetitle;
+                       $this->mHTMLtitle = wfMsg( "pagetitle", $this->mPagetitle );
                }
                if( $xml ) {
                        $xmlbits = "xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"";
@@ -606,8 +606,9 @@ class OutputPage {
                }
                $rtl = $wgLang->isRTL() ? " dir='RTL'" : "";
                $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
-               $ret .= "<head>\n<title>{$this->mHTMLtitle}</title>\n";
+               $ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
                array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
+               
                $ret .= $this->getHeadLinks();
                global $wgStyleSheetPath;
                if( $this->isPrintable() ) {
index b1cab1e..806ef15 100644 (file)
@@ -527,7 +527,7 @@ class Skin {
        {
                global $wgOut, $wgTitle, $wgUser;
 
-               $s = "<h1 class='pagetitle'>" . $wgOut->getPageTitle() . "</h1>";
+               $s = "<h1 class='pagetitle'>" . htmlspecialchars( $wgOut->getPageTitle() ) . "</h1>";
                if($wgUser->getOption("editsectiononrightclick") && $wgTitle->userCanEdit()) { $s=$this->editSectionScript(0,$s);}
                return $s;
        }
@@ -713,8 +713,47 @@ class Skin {
                        }
                }
                $s .= $this->lastModified();
-               $s .= " " . wfMsg( "gnunote" );
-               return $s;
+               return $s . " " .  $this->getCopyright();
+       }
+       
+       function getCopyright() {
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText;
+               $out = "";
+               if( $wgRightsPage ) {
+                       $link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
+               } elseif( $wgRightsUrl ) {
+                       $link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
+               } else {
+                       # Give up now
+                       return $out;
+               }
+               $out .= wfMsg( "copyright", $link );
+               return $out;
+       }
+       
+       function getCopyrightIcon() {
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon;
+               $out = "";
+               if( $wgRightsIcon ) {
+                       $icon = htmlspecialchars( $wgRightsIcon );
+                       if( $wgRightsUrl ) {
+                               $url = htmlspecialchars( $wgRightsUrl );
+                               $out .= "<a href=\"$url\">";
+                       }
+                       $text = htmlspecialchars( $wgRightsText );
+                       $out .= "<img src=\"$icon\" alt='$text' />";
+                       if( $wgRightsUrl ) {
+                               $out .= "</a>";
+                       }
+               }
+               return $out;
+       }
+       
+       function getPoweredBy() {
+               global $wgUploadPath;
+               $url = htmlspecialchars( "$wgUploadPath/poweredby_mediawiki_88x31.png" );
+               $img = "<a href='http://www.mediawiki.org/'><img src='$url' alt='MediaWiki' /></a>";
+               return $img;
        }
 
        function lastModified()
@@ -924,7 +963,7 @@ class Skin {
                $spp = $wgLang->specialPage( "Specialpages" );
 
                $s = "<form id=\"specialpages\" method=\"get\" class=\"inline\" " .
-                 "action=\"{$wgServer}{$wgRedirectScript}\">\n";
+                 "action=\"" . htmlspecialchars( "{$wgServer}{$wgRedirectScript}" ) . "\">\n";
                $s .= "<select name=\"wpDropdown\">\n";
                $s .= "<option value=\"{$spp}\">{$sp}</option>\n";
 
@@ -933,7 +972,7 @@ class Skin {
                        $s .= "<option value=\"{$p}\">{$desc}</option>\n";
                }
                $s .= "</select>\n";
-               $s .= "<input type=submit value=\"{$go}\" name=redirect>\n";
+               $s .= "<input type='submit' value=\"{$go}\" name='redirect' />\n";
                $s .= "</form>\n";
                return $s;
        }
@@ -1384,14 +1423,18 @@ class Skin {
 
                if ( "" == $link ) {
                        $u = "";
-                       if ( "" == $text ) { $text = $nt->getFragment(); }
+                       if ( "" == $text ) {
+                               $text = htmlspecialchars( $nt->getFragment() );
+                       }
                } else {
                        $u = $nt->escapeLocalURL( $query );
                }
                if ( "" != $nt->getFragment() ) {
-                       $u .= "#" . wfEscapeHTML( $nt->getFragment() );
+                       $u .= "#" . htmlspecialchars( $nt->getFragment() );
+               }
+               if ( "" == $text ) {
+                       $text = htmlspecialchars( $nt->getPrefixedText() );
                }
-               if ( "" == $text ) { $text = $nt->getPrefixedText(); }
                $style = $this->getInternalLinkAttributesObj( $nt, $text );
 
                $inside = "";
@@ -1421,7 +1464,9 @@ class Skin {
                }
                $u = $nt->escapeLocalURL( $q );
 
-               if ( "" == $text ) { $text = $nt->getPrefixedText(); }
+               if ( "" == $text ) {
+                       $text = htmlspecialchars( $nt->getPrefixedText() );
+               }
                $style = $this->getInternalLinkAttributesObj( $nt, $text, "yes" );
 
                $inside = "";
@@ -1450,7 +1495,9 @@ class Skin {
 
                $u = $nt->escapeLocalURL( $query );
 
-               if ( "" == $text ) { $text = $nt->getPrefixedText(); }
+               if ( "" == $text ) {
+                       $text = htmlspecialchars( $nt->getPrefixedText() );
+               }
                $style = $this->getInternalLinkAttributesObj( $nt, $text, "stub" );
 
                $inside = "";
@@ -1764,6 +1811,15 @@ class Skin {
                return $this->makeKnownLink( $wgLang->specialPage( $pn ),
                  wfMsg( $key ) );
        }
+       
+       function makeExternalLink( $url, $text, $escape = true ) {
+               $style = $this->getExternalLinkAttributes( $url, $text );
+               $url = htmlspecialchars( $url );
+               if( $escape ) {
+                       $text = htmlspecialchars( $text );
+               }
+               return "<a href=\"$url\"$style>$text</a>";
+       }
 
        # Called by history lists and recent changes
        #
index 557c88f..3d990ee 100644 (file)
@@ -21,15 +21,15 @@ class SkinNostalgia extends Skin {
                $s .= $this->logoText( "right" );
 
                $s .= $this->pageTitle();
-               $s .= $this->pageSubtitle() . "\n<p>";
+               $s .= $this->pageSubtitle() . "\n";
 
-               $s .= $this->topLinks() . "\n<br>";
+               $s .= $this->topLinks() . "\n<br />";
                $s .= $this->pageTitleLinks();
 
                $ol = $this->otherLanguages();
-               if($ol) $s .= "<br>" . $ol;
+               if($ol) $s .= "<br />" . $ol;
 
-               $s .= "<br clear=all><hr>\n</div>\n";
+               $s .= "<br clear='all' /><hr />\n</div>\n";
                $s .= "\n<div id='article'>";
 
                return $s;
@@ -61,13 +61,13 @@ class SkinNostalgia extends Skin {
        {
                global $wgUser, $wgOut;
 
-               $s = "\n</div><br clear=all>\n";
+               $s = "\n</div><br clear='all' />\n";
 
-               $s .= "\n<div id='footer'><hr>";
+               $s .= "\n<div id='footer'><hr />";
 
                $s .= $this->bottomLinks();
-               $s .= "\n<br>" . $this->pageStats();
-               $s .= "\n<br>" . $this->mainPageLink()
+               $s .= "\n<br />" . $this->pageStats();
+               $s .= "\n<br />" . $this->mainPageLink()
                  . " | " . $this->aboutLink()
                  . " | " . $this->searchForm();
 
index c85ee32..5a99fe5 100644 (file)
@@ -71,7 +71,6 @@
                        $this->userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
                        $this->titletxt = $wgTitle->getPrefixedText();
                        
-                       
                        $this->initPage( $out );
                        $tpl = new PHPTAL($this->template . '.pt', 'templates');
                        
@@ -80,6 +79,7 @@
                        #}
 
                        $tpl->setRef( "title", &$this->titletxt ); // ?
+                       $tpl->set( "pagetitle", wfMsg( "pagetitle", $this->titletxt ) );
                        $tpl->setRef( "thispage", &$this->thispage );
                        $tpl->set( "subtitle", $out->getSubtitle() );
                        $tpl->setRef( 'mimetype', &$wgMimeType );
                        $tpl->setRef( "skin", &$this);
                        $tpl->set( "logo", $this->logoText() );
                        $tpl->set( "pagestats", $this->pageStats() );
+                       $tpl->set( "copyright", $this->getCopyrightIcon() );
+                       $tpl->set( "poweredby", $this->getPoweredBy() );
                        $tpl->set( "disclaimer", $this->disclaimerLink() );
                        $tpl->set( "about", $this->aboutLink() );
 
diff --git a/includes/SkinSmarty.php b/includes/SkinSmarty.php
deleted file mode 100644 (file)
index 54049e1..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-# Copyright (C) 2003 Brion Vibber <brion@pobox.com>
-# http://www.mediawiki.org/
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or 
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
-# And turn on $wgUseSmarty so this file gets included
-
-# Set your include_path so Smarty/libs is available
-include_once( "Smarty.class.php" );
-
-class SkinSmarty extends Skin {
-       var $template;
-       
-       function initPage() {
-               $this->template = "paddington";
-       }
-       
-       function outputPage( &$out ) {
-               global $wgTitle, $wgArticle, $wgUser, $wgLang;
-               global $wgScriptPath, $wgStyleSheetPath, $wgLanguageCode;
-
-               $this->initPage();
-               
-               $smarty = new Smarty();
-               $smarty->register_function( "wikimsg",
-                       array( &$this,"smarty_function_wikimsg" ), true );
-               $smarty->register_function( "wikilink",
-                       array( &$this, "smarty_function_wikilink" ) );
-               
-               $smarty->assign( "title", $wgTitle->getPrefixedText() ); // ?
-               $smarty->assign( "thispage", $wgTitle->getPrefixedDbKey() );
-               $smarty->assign( "subtitle", $out->getSubtitle() );
-               
-               $smarty->assign( "editable", ($wgTitle->getNamespace != Namespace::getSpecial() ) );
-               $smarty->assign( "exists", $wgTitle->getArticleID() != 0 );
-               $smarty->assign( "watch", $wgTitle->userIsWatching() ? "unwatch" : "watch" );
-               $smarty->assign( "protect", count($wgTitle->getRestrictions()) ? "unprotect" : "protect" );
-
-               $smarty->assign( "searchaction", $wgScriptPath );
-               $smarty->assign( "stylepath", $wgStyleSheetPath );
-               $smarty->assign( "lang", $wgLanguageCode );
-               $smarty->assign( "langname", $wgLang->getLanguageName( $wgLanguageCode ) );
-
-               $smarty->assign( "username", $wgUser->getName() );
-               $smarty->assign( "userpage", $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName() );
-               $smarty->assign( "loggedin", $wgUser->getID() != 0 );
-               $smarty->assign( "sysop", $wgUser->isSysop() );
-               if( $wgUser->getNewtalk() ) {
-                       $ntl = wfMsg( "newmessages",
-                               $this->makeKnownLink(
-                                       $wgLang->getNsText( Namespace::getTalk( Namespace::getUser() ) )
-                                               . ":" . $wgUser->getName(),
-                                       wfMsg("newmessageslink")
-                               )
-                       );
-               } else {
-                       $ntl = "";
-               }
-               $smarty->assign( "newtalk", $ntl );
-
-               $smarty->assign( "logo", $this->logoText() );
-               $smarty->assign( "pagestats", $this->pageStats() );
-               $smarty->assign( "otherlanguages", $this->otherLanguages() );
-
-               $smarty->assign( "debug", $out->mDebugtext );
-               $smarty->assign( "reporttime", $out->reportTime() );
-               
-               $smarty->assign( "bodytext", $out->mBodytext );
-               
-               $smarty->display( $this->template . ".tpl" );
-       }
-
-       function smarty_function_wikimsg( $params, &$smarty ) {
-               return wfMsg( $params['key'] );
-       }
-       
-       function smarty_function_wikilink( $params, &$smarty ) {
-               global $wgLang;
-               $action = "";
-               $popup = "";
-               $title = NULL;
-               
-               if($params['action']) $action = "action=" . $params['action'];
-               
-               if($params['special']) {
-                       $title = Title::makeTitle( NS_SPECIAL, $params['special'] );
-                       #$text = $wgLang->getSpecialPageName( $params['special'] );
-                       $text = $popup = $params['special'];
-                       if($params['target']) $action .= "target=" . urlencode( $params['target'] );
-               } else {
-                       if( $params['keypage'] )
-                               $title = Title::newFromText( wfMsg( $params['keypage'] ) );
-                       else
-                               $title = Title::newFromText( $params['name'] );
-                       if(isset($params["talk"])) {
-                               $title = Title::makeTitle( $title->getNamespace() ^ 1, $title->getDbKey() );
-                       }
-                       $text = $popup = $title->getPrefixedText();
-               }
-               
-               $url = $title->escapeLocalURL( $action );
-               
-               if($params['text']) $text = $params['text'];
-               if($params['key']) $text = wfMsg( $params['key'] );
-               if($popup) $popup = ' title="' . htmlspecialchars( $popup ) . '"';
-               
-               return "<a href=\"$url\"$popup>$text</a>";
-       }
-
-/*
-       function Skin()
-       function getSkinNames()
-       function getStylesheet()
-       
-       function qbSetting()
-       function initPage()
-       function getHeadScripts() {
-       function getUserStyles()
-       function doGetUserStyles()
-       function getBodyOptions()
-       function getExternalLinkAttributes( $link, $text )
-       function getInternalLinkAttributes( $link, $text, $broken = false )
-
-       function getLogo()
-       function beforeContent()
-       function doBeforeContent()
-       function getQuickbarCompensator( $rows = 1 )
-       function afterContent()
-       function doAfterContent()
-       function pageTitleLinks()
-       function printableLink()
-       function pageTitle()
-       function pageSubtitle()
-       function nameAndLogin()
-       function searchForm()
-       function topLinks()
-       function bottomLinks()
-       function pageStats()
-       function lastModified()
-       function logoText( $align = "" )
-       function quickBar()
-       function specialPagesList()
-       function mainPageLink()
-       function copyrightLink()
-       function aboutLink()
-       function editThisPage()
-       function deleteThisPage()
-       function protectThisPage()
-       function watchThisPage()
-       function moveThisPage()
-       function historyLink()
-       function whatLinksHere()
-       function userContribsLink()
-       function emailUserLink()
-       function watchPageLinksLink()
-       function otherLanguages()
-       function bugReportsLink()
-       function dateLink()
-       function talkLink()
-       function transformContent( $text )
-
-       function makeLink( $title, $text= "", $query = "", $trail = "" )
-       function makeKnownLink( $title, $text = "", $query = "", $trail = "" )
-       function makeBrokenLink( $title, $text = "", $query = "", $trail = "" )
-       function makeStubLink( $title, $text = "", $query = "", $trail = "" )
-       function fnamePart( $url )
-       function makeImage( $url, $alt = "" )
-       function makeImageLink( $name, $url, $alt = "" )
-       function makeMediaLink( $name, $url, $alt = "" )
-       function specialLink( $name, $key = "" )
-
-       function beginHistoryList()
-       function beginImageHistoryList()
-       function endRecentChangesList()
-       function endHistoryList()
-       function endImageHistoryList()
-       function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor )
-       function imageHistoryLine( $iscur, $ts, $img, $u, $ut, $size, $c )
-
-       
-       function beginRecentChangesList()
-       function recentChangesBlockLine ( $y ) {
-       function recentChangesBlockGroup ( $y ) {
-       function recentChangesBlock ()
-       function recentChangesLine( $ts, $u, $ut, $ns, $ttl, $c, $isminor, $isnew, $watched = false, $oldid = 0 , $diffid = 0 )
-       function recentChangesLineOld( $ts, $u, $ut, $ns, $ttl, $c, $isminor, $isnew, $watched = false, $oldid = 0, $diffid = 0 )
-       function recentChangesLineNew( $ts, $u, $ut, $ns, $ttl, $c, $isminor, $isnew, $watched = false, $oldid = 0 , $diffid = 0 )
-
-       function tocIndent($level) {
-       function tocUnindent($level) {
-       function tocLine($anchor,$tocline,$level) {
-       function tocTable($toc) {
-       function editSectionScript($section,$head) {
-       function editSectionLink($section) {
-*/
-
-}
-
-class SkinMontparnasse extends SkinSmarty {
-       function initPage() {
-               SkinSmarty::initPage();
-               $this->template = "montparnasse";
-       }
-}
-
-?>
index 3a1b38e..7329c77 100644 (file)
@@ -269,7 +269,7 @@ class PreferencesForm {
                $wgOut->setRobotpolicy( "noindex,nofollow" );
 
                if ( "" != $err ) {
-                       $wgOut->addHTML( "<font size='+1' color='red'>$err</font>\n<p>" );
+                       $wgOut->addHTML( "<p class='error'>" . htmlspecialchars( $err ) . "</p>\n" );
                }
                $uname = $wgUser->getName();
                $uid = $wgUser->getID();
index c1607e7..8b01c75 100644 (file)
@@ -686,6 +686,10 @@ class User {
        {
                wfSetVar( $this->mDataLoaded, $loaded );
        }
+       
+       function getUserPage() {
+               return Title::makeTitle( NS_USER, $this->mName );
+       }
 }
 
 ?>
index ba0311d..dc19381 100644 (file)
@@ -61,8 +61,6 @@ if($wgMetaNamespace === FALSE)
        'standard' => "Standard",
        'nostalgia' => "Nostalgia",
        'cologneblue' => "Cologne Blue",
-       'smarty' => "Paddington",
-       'montparnasse' => "Montparnasse",
        'davinci' => "DaVinci",
        'mono' => "Mono",
        'monobook' => "MonoBook"
@@ -522,7 +520,8 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 "redirectedfrom" => "(Redirected from $1)",
 "lastmodified" => "This page was last modified $1.",
 "viewcount"            => "This page has been accessed $1 times.",
-"gnunote" => "All text is available under the terms of the <a class='internal' href='{{localurl:GNU_Free_Documentation_License}}'>GNU Free Documentation License</a>. $wgSitename is powered by <a href='http://www.mediawiki.org/' class='external'>MediaWiki</a>, an open source wiki engine.",
+"copyright"    => "Content is available under $1.",
+"poweredby"    => "{{SITENAME}} is powered by [http://www.mediawiki.org/ MediaWiki], an open source wiki engine.",
 "printsubtitle" => "(From {{SERVER}})",
 "protectedpage" => "Protected page",
 "administrators" => "{{ns:4}}:Administrators",
@@ -541,7 +540,8 @@ performed by sysops with  \"bureaucrat\" status.",
 "go"                   => "Go",
 "ok"                   => "OK",
 "sitetitle"            => "{{SITENAME}}",
-"sitesubtitle" => "The Free Encyclopedia",
+"pagetitle"            => "$1 - {{SITENAME}}",
+"sitesubtitle" => "The Free Encyclopedia", # FIXME
 "retrievedfrom" => "Retrieved from \"$1\"",
 "newmessages" => "You have $1.",
 "newmessageslink" => "new messages",
@@ -1447,6 +1447,7 @@ amusement.",
 "importfailed" => "Import failed: $1",
 "importnotext" => "Empty or no text",
 "importsuccess"        => "Import succeeded!",
+"importhistoryconflict" => "Conflicting history revision exists (may have imported this page before)",
 
 # Keyboard access keys for power users
 'accesskey-article' => 'a',
index 147153b..8000c12 100644 (file)
@@ -35,14 +35,12 @@ $wgEditEncoding             = "x";
 );
 
 /* private */ $wgSkinNamesEo = array(
-       'standard' => "Norma",
+       'standard' => "Klasika",
        'nostalgia' => "Nostalgio",
        'cologneblue' => "Kolonja Bluo",
-       'smarty' => "Paddington",
-       'montparnasse' => "Montparnasse",
        'davinci' => "DaVinci",
        'mono' => "Senkolora",
-       'monobook' => "MonoBook"
+       'monobook' => "Librejo"
 );
 
 /* private */ $wgMathNamesEo = array(
@@ -225,8 +223,9 @@ Vidu $1.",
 "nbytes"               => "$1 bitokoj",
 "go"                   => "Ek!", #FIXME
 "ok"                   => "Ek!", #FIXME
-"sitetitle"            => "{{SITENAME}}", # Wikipedia
-"sitesubtitle" => "La Libera Enciklopedio",
+"sitetitle"            => "{{SITENAME}}",
+"pagetitle"            => "$1 - {{SITENAME}}",
+"sitesubtitle" => "La Libera Enciklopedio", # FIXME
 "retrievedfrom" => "Citita el \"$1\"", #FIXME: Aperas post presita paĝo
 "newmessages"  => "Jen $1 por vi.",
 "newmessageslink" => "nova mesaĝo",
index fe98bca..b5b1228 100644 (file)
@@ -7,7 +7,7 @@
 ** Alexander Limi - http://www.plonesolutions.com
 ** additional plone work:
 ** Joe Geldart & Tom Croucher - http://www.netalleynetworks.com, Michael Zeltner - http://niij.org,
-** Geir Bækholt - http://www.plonesolutions.com
+** Geir Bækholt - http://www.plonesolutions.com
 ** All you guys rock :)
 */
 
@@ -876,6 +876,17 @@ li#contentaction-watch {
     margin-right: 2em;
 }
 
+#footer-poweredby, #footer-copyright {
+       margin: 0 8px;
+       position: relative;
+       top: -2px; /* Bump it up just a tad */
+}
+#footer-poweredby {
+       float: right;
+}
+#footer-copyright {
+       float: left;
+}
 
 /* 
 ** IE/Mac fixes, hope to find a validating way to move this
diff --git a/stylesheets/montparnasse.css b/stylesheets/montparnasse.css
deleted file mode 100644 (file)
index ee2595d..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-body.encyclopedia { background: white; }
-body.meta    { background: #ffffdd; }
-body {
-       margin: 0px;
-       padding:0px;
-       }
-/* ================= masthead */
-#topbar {
-       background: #6688AA; /* from ColBlue */
-       background: #8ad;       /* light blue */
-       color:white;
-       color:#fff;
-       border:none; /* for NN4 */
-       width:100%;
-       margin: 0px;
-       }
-       
-#topbar h1 {
-       font-size: 160%;
-       margin: 0px;
-       padding:1px 2px;
-       }
-#topbar h1 span {
-       font-size: 65%;
-       }
-#topbar span#alert {
-       color:#f08;
-       font-weight:bold;
-       }
-#topbar div {
-       background: #ddd;               
-       font-size: 90%;
-       color:black;
-       padding:1px;
-}
-#topbar div a {
-       text-decoration:none;
-}
-#topbar div a:hover {
-       text-decoration:underline;
-}
-
-/* ================= article */
-#article {
-       padding:0.5em;
-       margin-left:0.5em;
-       margin-right:15em; /* sidebar margin */
-}
-h1.pagetitle {
-       font-size: 150%;
-       padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0; 
-       }
-p.subtitle , p.languages , p.actions {
-       padding: 0em 1em;
-       margin: 0em ; 
-       font-size: 90%;
-       color:#723; 
-       }
-/* ================= sidebar */
-#main {
-       position:relative;
-       /* only needed if sidebar sits below masthead */
-}
-
-#sidebar {
-       position:absolute;
-       top:0px;
-       right:0px;
-       width:11em;
-       padding:0.5em;
-}
-#dummylogo {
-       width:100px;
-       height:100px;
-       background: #ddd;
-       margin:0px auto;
-       font-size:75%;
-       
-}
-#sidebar h2 {
-       margin: 4px 0px 0px;
-       padding: 0px 0.5em;
-       font-size:100%;
-       background: #8ad;
-       color:white;
-       }
-#sidebar div {
-       border: solid 2px #8ad;
-       padding: 0.5em ;
-       margin: 0em ; 
-       font-size: 90%;
-       background: #def;
-}
-#sidebar #search {
-       text-align:center;
-}
-#sidebar #dummylogo {
-       margin:0px auto ;
-       width:100px;
-       height:100px;
-       background: #eee;
-}
-
-/* ================= footer */
-#footer {
-       padding:2px;
-       margin-left:0.5em;
-       margin-right:12em; /* sidebar margin */
-       /* 
-       border-top: solid 2px #8ad;     /* light blue */;
-       
-}
-#footer div {
-       
-       border: solid 2px #8ad;
-       padding: 0.5em ;
-       margin: 0em ; 
-       font-size: 90%;
-       background: #def;
-       
-}
-#footer h2 {
-       margin: 4px 0px 0px;
-       padding: 0px 0.5em;
-       font-size:100%;
-       background: #8ad;
-       color:white;
-}
-#footer #pagestats {
-       margin: 4px 0px 0px;
-       background: #8ad;
-       color:white;
-       font-weight:bold;
-}
-
-/* ================= hacks */  
-       /* Feed these styles only to NS4.... */
-       /*/*/ /*/
-       h1.pagetitle {
-               margin-top: -30px;
-               color:red;
-       }
-       p.actions {
-               margin-top: -20px;
-       }
-       /* Okay, we can let the others back in.... */   
-       
-       
-/* Print-specific things to hide */
-.urlexpansion, .printfooter {
-        display: none;
-       }
-/* automatically generated edit summaries */
-#autocomment { color: gray; }
-
-/* Table of contents */
-#toc {
-        border: 1px solid #8888aa;
-        background-color: #f7f8ff;
-        padding: 5px;
-        font-size: 95%;
-}
-.tocindent {
-        margin-left: 2em;
-}
-.tocline {
-        margin-bottom: 0px;
-}
-.toctoggle, .editsection {
-        font-size: smaller;
-}
-
-/* images */
-div.floatright { float: right; margin: 0 0 1em 1em; }
-div.floatright p { font-style: italic; }
-div.floatleft { float: left; margin: 0.3em 0.5em 0.5em 0; }
-div.floatleft p { font-style: italic; }
-
-/* thumbnails */
-div.thumbnail-none, div.thumbnail-right, div.thumbnail-left {
-        padding: 2px;
-        border:1px solid #8888aa;
-        background:#CCCCCC;
-        margin: 0.3em 0 0.5em;
-        font-size: 85%;
-        text-align: center;
-}
-
-div.thumbnail-none p, div.thumbnail-right p, div.thumbnail-left p {
-        margin-top:3px; margin-bottom:3px;
-        text-align: left;
-}
-
-div.thumbnail-right {
-        float: right;
-        margin-left:0.5em;
-}
-
-div.thumbnail-left {
-        float: left;
-        margin-right:0.5em;
-}
-
-/* table standards */
-table.rimage {
-        float:right;
-        width:1pt;
-        margin-left:1em;
-        margin-bottom:1em;
-        text-align:center;
-        font-size:smaller;
-        }
diff --git a/stylesheets/paddington.css b/stylesheets/paddington.css
deleted file mode 100644 (file)
index c129107..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-body.encyclopedia { background: white }
-body.meta    { background: #ffffdd }
-body {
-       margin: 0px;
-       padding:0px;
-       }
-form.inline {
-       display: inline; 
-       }
-       
-/* borders */
-/*
-#topbar h1, #topbar div.navbox {
-       border-bottom:solid grey 1px;    
-}
-*/     
-       
-/* ********************************** TOPBAR */
-#topbar {
-       border-bottom: solid 1px black;
-       
-}
-/* common to all 3 topbar blocks */
-#topbar h1, #topbar div.navbox {
-       /*
-       background-color: #eef;
-       background-color: #f8f8f8;
-       */
-       padding: 0px 4px;
-       margin: 0px;
-       /*
-       border-bottom:solid white 2px;   
-       border-bottom:solid grey 1px;    
-       */
-       }
-#topbar h1 {
-       font-size: 2.2em;
-       }       
-#topbar h1 span {
-       font-size: 0.6em;
-       color:#aaa;
-       }       
-div.navbox {
-       font-size:0.9em;
-       }
-#topbar div#navboxsubtitle {
-       }
-#topbar div#sitelinks {
-       padding-bottom: 2px;
-}
-       
-div.spacer {
-       clear:both;
-}
-
-div.row span.left {
-  float: left;
-  text-align: left;
-  width: 49%;
-  }
-
-div.row span.right {
-  float: right;
-  text-align: right;
-  width: 49%;
-  }
-
-/* ********************************* CONTENT */        
-#content { 
-       top: 0px;  
-       margin: 0px; 
-       /*
-       padding: 0px 5px 0px ; 
-       position:relative;
-       */
-       }
-h1.pagetitle {
-       padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0; 
-       font-size: 2em;
-       
-       }
-p.subtitle , p.languages , p.actions {
-       padding: 0em 1em;
-       margin: 0em ; 
-       font-size: 0.9em;
-       color:#723; 
-       }
-p.languages {
-       font-style: italic;
-       }
-       
-#article {
-       padding: 0px 4px;
-}
-
-/* ********************************* quickbar */       
-#quickbar-left , #quickbar-right { 
-       position: absolute; 
-       top: 0px; 
-       bottom:0px;
-       width: 148px; 
-       padding: 0px; 
-       visibility: visible;
-       z-index: 99; 
-       }
-#quickbar-left { 
-       left: 0px; 
-       border-right:1px solid black;
-       }
-#quickbar-right { 
-       right: 0px; 
-       border-left:1px solid black;
-       }
-.quickbarsection {
-       padding: 6px;
-       border-bottom:1px solid black;
-}
-/* ********************************** QUICKBAR DEPENDENCIES */
-#content { 
-       margin-left: 148px; 
-       }
-
-/* Print-specific things to hide */
-.urlexpansion, .printfooter {
-        display: none;
-}
-
-/* automatically generated edit summaries */
-#autocomment { color: gray; }
-
-/* Table of contents */
-#toc {
-        border: 1px solid #8888aa;
-        background-color: #f7f8ff;
-        padding: 5px;
-        font-size: 95%;
-}
-.tocindent {
-        margin-left: 2em;
-}
-.tocline {
-        margin-bottom: 0px;
-}
-.toctoggle, .editsection {
-        font-size: smaller;
-}
-
-/* images */
-div.floatright { float: right; margin: 0 0 1em 1em; }
-div.floatright p { font-style: italic; }
-div.floatleft { float: left; margin: 0.3em 0.5em 0.5em 0; }
-div.floatleft p { font-style: italic; }
-
-/* thumbnails */
-div.thumbnail-none, div.thumbnail-right, div.thumbnail-left {
-        padding: 2px;
-        border:1px solid #8888aa;
-        background:#CCCCCC;
-        margin: 0.3em 0 0.5em;
-        font-size: 85%;
-        text-align: center;
-}
-
-div.thumbnail-none p, div.thumbnail-right p, div.thumbnail-left p {
-        margin-top:3px; margin-bottom:3px;
-        text-align: left;
-}
-
-div.thumbnail-right {
-        float: right;
-        margin-left:0.5em;
-}
-
-div.thumbnail-left {
-        float: left;
-        margin-right:0.5em;
-}
-
-/* table standards */
-table.rimage {
-        float:right;
-        width:1pt;
-        margin-left:1em;
-        margin-bottom:1em;
-        text-align:center;
-        font-size:smaller;
-        }
diff --git a/templates/montparnasse.tpl b/templates/montparnasse.tpl
deleted file mode 100644 (file)
index 4ebf95b..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="{$lang}">
-<head><title>{$title|escape:"html"}</title>
-<meta http-equiv="Content-type" content="text/html; charset={$charset}">
-<meta name="robots" content="{$robots}">
-{if $favicon}<link rel="shortcut icon" href="{$favicon}">{/if}
-<link rel="stylesheet" href="{$stylepath}/montparnasse.css">
-</head>
-
-<body class="encyclopedia">
-<div id="content">
-
-<!-- ************************************* topbar -->
-<div id="topbar">
-<h1 class="sitename">{wikimsg key="sitetitle"}<span> - {wikimsg key="sitesubtitle"} - {$langname}</span></h1>
-
-<div>{wikilink keypage="mainpage"} -
-       {wikilink special="Recentchanges"} -
-       {wikilink special="Randompage"} -
-       {wikilink keypage="currentevents"} -
-       {if $loggedin}{wikilink special="Userlogout"}{else}{wikilink special="Userlogin"}{/if}
-       {if $newtalk}- <span id="alert">{$newtalk}</span>{/if}</div>
-</div>
-
-<!-- ************************************* article  -->
-<div id="main">
-<div id="article">
-<h1 class="pagetitle">{$title|escape:"html"}</h1>
-       <p class="actions">{wikilink name=$thispage printable=true key="printable"}
-       {if $editable}
-       | {wikilink name=$thispage action="edit" key=$editpage}
-       {if $exists}| {wikilink name=$thispage action="history" key="pagehistory"}{/if}
-       {/if}</p>
-
-{$bodytext}
-
-</div id="article">
-
-<div id="sidebar">
-  <div id="search">
-  <div id="dummylogo">logo placeholder</div>
-       {wikimsg key="searchwiki"}
-       <form name="search" class="inline" method="get" action="{$searchaction}">
-       <input type="text" name="search" size="19" value=""><br>
-       <input type=submit name="go" value="{wikimsg key="go"}">&nbsp;<input type="submit" value="{wikimsg key="search"}">
-       </form>
-  </div>
-
-<h2>{wikimsg key="otherlanguages"}</h2>
-
-       <div class="languages">{$otherlanguages}</div>
-
-<h2>{wikimsg key="sitelinks"}</h2>
-<div>
-       {wikilink keypage="mainpage"}<br>
-       {wikilink special="Recentchanges"}<br>
-       {wikilink special="Randompage"}<br>
-       {wikilink keypage="currentevents"}
-</div>
-
-<h2>{wikimsg key="personaltools"}</h2>
-<div>
-{if $loggedin}
-       {wikilink name=$userpage key="myuserpage"}<br>
-       {wikilink name=$userpage talk=true key="mytalkpage"}<br>
-       {wikilink special="Watchlist"}<br>
-       {wikilink special="Contributions" target=$username}
-       {wikilink special="Userlogout"}
-{else}
-       {wikimsg key="notloggedin"}<br>
-       {wikilink special="Userlogin"}
-{/if}
-</div>
-
-
-</div id="sidebar">
-</div id="main">
-
-<div id="footer">
-       <h2>{wikimsg key="searchwiki"}</h2><div>
-               <form name="search" class="inline" method=get action="{$searchaction}">
-               <input type=text name="search" size="19" value="">
-               <input type=submit name="go" value="Go">&nbsp;<input type=submit value="Search">
-               <!-- ** namespace checkboxes here would be nice! -->
-               </form>
-       </div>
-{if $editable}
-       <h2>{wikimsg key="pagetools"}</h2><div>
-               <strong>{wikilink name=$thispage action="edit" key=$editpage}</strong> |
-               {if $loggedin}{wikilink name=$thispage action=$watch key=$watch} |{/if}
-               {wikilink name=$thispage talk=true key=$talkpage} |
-               {if $exists}{wikilink name=$thispage action="history" key="pagehistory"} |{/if}
-               {wikilink special="Whatlinkshere" target=$thispage} |
-               {wikilink special="Recentchangeslinked" target=$thispage} |
-       {if $loggedin && $exists}
-               <br>
-       {if $sysop}
-               {wikilink name=$thispage action="delete" key="deletepage"} |
-               {wikilink name=$thispage action=$protect key=$protect} |
-       {/if}
-               {wikilink special="Movepage" target="$thispage"}
-       {/if}
-       </div>
-{/if}
-<div id="pagestats">
-{$pagestats}
-</div>
-
-</div id="footer">
-</body>
-</html>
diff --git a/templates/paddington.tpl b/templates/paddington.tpl
deleted file mode 100644 (file)
index a21dea0..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="{$lang}">
-<head>
-<title>{$title|escape:"html"}</title>
-<meta http-equiv="Content-type" content="text/html; charset={$charset}">
-<meta name="robots" content="{$robots}">
-{if $favicon}<link rel="shortcut icon" href="{$favicon}">{/if}
-<link rel="stylesheet" href="{$stylepath}/paddington.css">
-<script type="text/javascript" src="{$stylepath}/wikibits.js"></script>
-</head>
-
-<body class="encyclopedia">
-<div id="content">
-
-<!-- ************************************* topbar -->
-
-<div id="topbar">
-<h1 class="sitename">{wikimsg key="sitetitle"} <span>{$langname}</span></h1>
-<div class="spacer"></div>
-
-<div class="navbox" id="navboxsubtitle">
-<div class="row" id="searchrow">
-       <span class="left">
-       {wikimsg key="sitesubtitle"}</span>
-       <span class="right">
-       <form name="search" class="inline" method=get action="{$searchurl}">
-       <input type=text name="search" size="19" value="">
-       <input type=submit name="go" value="{wikimsg key="go"}">&nbsp;<input type="submit" value="{wikimsg key="search"}">
-       </form>
-       </span>
-</div><!--searchrow-->
-<div class="spacer"></div>
-</div><!--navboxsubtitle-->
-
-<div class="navbox" id="sitelinks">
-<div class="spacer"></div>
-<div class="row" id="sitelinksrow">
-       <span class="left">
-               {wikilink keypage="mainpage"} |
-               {wikilink special="Recentchanges"} |
-               {wikilink keypage="helppage"}
-       </span>
-       <span class="right">
-       {if $loggedin}
-               {wikilink name=$userpage} ({wikilink name=$userpage talk=true}) |
-               {wikilink special="Userlogout" returnto=$thispage} |
-               {wikilink special="Preferences"}
-       {else}
-               {wikimsg key="notloggedin"} |
-               {wikilink special="Userlogin"}
-       {/if}
-       </span>
-</div>
-       {if $newtalk}<div class="alert">{$newtalk}</div>{/if}
-       <div class="spacer"></div>
-</div><!--sitelinks-->
-
-</div><!-- ************************************* topbar -->
-
-<!-- ************************************* article -->
-<div id="article">
-       <h1 class="pagetitle">{$title|escape:"html"}</h1>
-
-       <p class="subtitle">{$subtitle}</p>
-
-       <p class="actions">{wikilink name=$thispage printable=true key="printable"} |
-       {if $editable}
-       {wikilink name=$title action="edit" key=$editpage}
-       {if $exists} | {wikilink name=$title action="history" key="history"}{/if}
-       {/if}</p>
-
-       <p class="languages">{wikimsg key="otherlanguages"} {$langlist}</p>
-
-
-{$bodytext}
-
-</div><!--article-->
-
-<div id="pagestats">
-{$pagestats}
-</div>
-
-</div><!-- id="content" -->
-
-<!-- ************************************* quickbar -->
-
-<div id="quickbar-left">
-<div class="quickbarsection">
-       {$logo}
-</div>
-<div class="quickbarsection">
-       {wikilink keypage="mainpage"}
-       <br>{wikilink special="Recentchanges"}
-       <br>{wikilink special="Random"}
-       {if $loggedin}<br>{wikilink special="Watchlist"}{/if}
-       <br>{wikilink special="Contributions" target=$username}
-       <br>{wikilink keypage="currentevents"}
-</div>
-{if $editable}<div class="quickbarsection">
-       <strong>{wikilink name=$thispage action="edit" key=$editpage}</strong>
-       {if $loggedin}
-               <br>{wikilink name=$thispage action="watch" key=$watchpage}
-               {if $exists}
-                       <br>{wikilink special="Movepage" target=$thispage}
-                       {if $sysop}
-                               <br>{wikilink name=$thispage action="delete" key="deletepage"}
-                               <br>{wikilink name=$thispage action=$protect key=$protect}
-                       {/if}
-               {/if}
-       {/if}
-       <br>{wikilink name=$thispage talk=true key=$talkpage}
-       {if $exists}<br>{wikilink name=$thispage action="history" key="history"}{/if}
-       <br>{wikilink special="Whatlinkshere" target=$thispage}
-       <br>{wikilink special="Recentchangeslinked" target=$thispage}
-</div>{/if}
-<div class="quickbarsection">
-       {if $loggedin}{wikilink special="Upload"}
-       <br>{/if}{wikilink special="Specialpages"}
-       <br>{wikilink keypage="bugreports"}
-</div>
-</div><!-- end quickbar -->
-
-</body></html>
-
index 35a109f..72d9e40 100644 (file)
@@ -4,7 +4,7 @@
   <head>
     <meta http-equiv="Content-Type" content="${mimetype}; charset=${charset}" />
        ${headlinks}
-    <title tal:content="title">Exciting xhtml slimfast</title>
+    <title tal:content="pagetitle">Exciting xhtml slimfast</title>
 
     <style type="text/css" media="screen">
       /*<![CDATA[*/
       <!--<esi:include src="thisurl?esiview=toolbox&loggedin=0"/> static footer, same for all pages but contains a few messaged that are worth caching --> 
       <div class="visualClear"></div>
       <div id="portal-footer">
+        <div id="footer-poweredby" tal:condition="poweredby">${poweredby}</div>
+        <div id="footer-copyright" tal:condition="copyright">${copyright}</div>
         <ul id="footer-list">
           <li id="footer-pagestats" tal:condition="pagestats">${pagestats}</li>
           <li id="footer-about" tal:condition="about">${about}</li>