From: Gabriel Wicke Date: Fri, 23 Apr 2004 16:31:38 +0000 (+0000) Subject: * feed links in skinphptal (appear in toolbox in monobook) X-Git-Tag: 1.3.0beta1~311 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=c404ec2ff35522fcbcbb52275251ddee8e3c8e7a;p=lhc%2Fweb%2Fwiklou.git * feed links in skinphptal (appear in toolbox in monobook) * recent changes moved to navigation (only not directly page-related link in the toolbox is special pages now) * accesskey in SpecialPreferences --- diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php index 39dbe70edd..301a14ce86 100644 --- a/includes/SkinPHPTal.php +++ b/includes/SkinPHPTal.php @@ -64,7 +64,7 @@ global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgOut; global $wgScript, $wgStyleSheetPath, $wgLanguageCode, $wgUseNewInterlanguage; global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest; - global $wgDisableCounters, $wgLogo, $action; + global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses; extract( $wgRequest->getValues( 'oldid', 'diff' ) ); @@ -92,6 +92,17 @@ $tpl->setRef( "thispage", &$this->thispage ); $tpl->set( "subtitle", $out->getSubtitle() ); $tpl->set( 'catlinks', getCategories()); + if( $wgOut->isSyndicated() ) { + $feeds = array(); + foreach( $wgFeedClasses as $format => $class ) { + $feeds[$format] = array( + 'text' => $format, + 'href' => $wgRequest->escapeAppendQuery( "feed=$format" ), + 'ttip' => wfMsg('tooltip-'.$format) + ); + } + $tpl->setRef( 'feeds', &$feeds ); + } $tpl->setRef( 'mimetype', &$wgMimeType ); $tpl->setRef( 'charset', &$wgOutputEncoding ); $tpl->set( 'headlinks', $out->getHeadLinks() ); diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index dd17a05345..ba649eaa49 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -466,7 +466,8 @@ class PreferencesForm { $wgOut->addHTML( "
- +
diff --git a/languages/Language.php b/languages/Language.php index 622117da3e..9fc5adacf7 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -563,6 +563,7 @@ performed by sysops with \"bureaucrat\" status.", "hidetoc" => "hide", "thisisdeleted" => "View or restore $1?", "restorelink" => "$1 deleted edits", +'feedlinks' => 'Feeds:', # Main script and global functions # @@ -1549,6 +1550,7 @@ amusement.", 'tooltip-preview' => 'Preview your changes, please use this before saving! [alt-p]', 'tooltip-contributions' => 'View the list of contributions of this user', 'tooltip-emailuser' => 'Send a mail to this user', +'tooltip-rss' => 'RSS feed for this page', # Metadata "nodublincore" => "Dublin Core RDF metadata disabled for this server.", diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt index cc92bf31ab..90407e95d3 100644 --- a/templates/xhtml_slim.pt +++ b/templates/xhtml_slim.pt @@ -96,6 +96,9 @@
  • Current Events
    • +
  • Recent Changes
  • Random Page
    • @@ -131,27 +134,31 @@