Revision: 43601 Author: jojo Date: 2008-11-17 12:46:52 +0000 (Mon, 17 Nov 2008)
Log Message: ----------- fixed/implemented http://code.pediapress.com/wiki/ticket/347 Modified Paths: -------------- trunk/extensions/Collection/Collection.body.php trunk/extensions/Collection/Collection.i18n.php Modified: trunk/extensions/Collection/Collection.body.php =================================================================== --- trunk/extensions/Collection/Collection.body.php 2008-11-17 10:32:39 UTC (rev 43600) +++ trunk/extensions/Collection/Collection.body.php 2008-11-17 12:46:52 UTC (rev 43601) @@ -937,15 +937,17 @@ if ( $skinTemplate->iscontent && ( $action == '' || $action == 'view' || $action == 'purge' ) ) { if ( self::isCollectionPage( $skinTemplate->mTitle, $wgArticle ) ) { $params = 'colltitle=' . wfUrlencode( $skinTemplate->mTitle->getPrefixedDBKey() ); - foreach ( $wgCollectionFormats as $writer => $name ) { - $nav_urls['download_as_' . $writer] = array( + if ( isset( $wgCollectionFormats['rl'] ) ) { + $nav_urls['printable_version_pdf'] = array( 'href' => SkinTemplate::makeSpecialUrlSubpage( 'Collection', 'render_collection/', - $params . '&writer=' . $writer ), - 'text' => wfMsg( 'coll-download_as', $name ), + $params . '&writer=rl'), + 'text' => wfMsg( 'coll-printable_version_pdf' ), ); } + foreach ( $wgCollectionFormats as $writer => $name ) { + } } else { $params = 'arttitle=' . $skinTemplate->mTitle->getPrefixedURL(); if( $wgArticle ) { @@ -954,13 +956,13 @@ $params .= '&oldid=' . $oldid; } } - foreach ( $wgCollectionFormats as $writer => $name ) { - $nav_urls['download_as_' . $writer] = array( + if ( isset( $wgCollectionFormats['rl'] ) ) { + $nav_urls['printable_version_pdf'] = array( 'href' => SkinTemplate::makeSpecialUrlSubpage( 'Collection', 'render_article/', $params . '&writer=' . $writer ), - 'text' => wfMsg( 'coll-download_as', $name ) + 'text' => wfMsg( 'coll-printable_version_pdf' ) ); } } @@ -975,16 +977,13 @@ static function insertMonoBookToolboxLink( &$skinTemplate ) { global $wgCollectionFormats; - foreach ( $wgCollectionFormats as $writer => $name ) { - if ( !empty( $skinTemplate->data['nav_urls']['download_as_' . $writer]['href'] ) ) { - $href = htmlspecialchars( $skinTemplate->data['nav_urls']['download_as_' . $writer]['href'] ); - $label = htmlspecialchars( $skinTemplate->data['nav_urls']['download_as_' . $writer]['text'] ); - print <<<EOS + if ( !empty( $skinTemplate->data['nav_urls']['printable_version_pdf']['href'] ) ) { + $href = htmlspecialchars( $skinTemplate->data['nav_urls']['printable_version_pdf']['href'] ); + $label = htmlspecialchars( $skinTemplate->data['nav_urls']['printable_version_pdf']['text'] ); + print <<<EOS <li id="t-download-as-$writer"><a href="$href" rel="nofollow">$label</a></li> EOS - ; - } - + ; } return true; } Modified: trunk/extensions/Collection/Collection.i18n.php =================================================================== --- trunk/extensions/Collection/Collection.i18n.php 2008-11-17 10:32:39 UTC (rev 43600) +++ trunk/extensions/Collection/Collection.i18n.php 2008-11-17 12:46:52 UTC (rev 43601) @@ -37,6 +37,7 @@ 'coll-n_pages' => '$1 {{PLURAL:$1|page|pages}}', 'coll-unknown_subpage_title' => 'Unknown subpage', 'coll-unknown_subpage_text' => 'This subpage of [[Special:Collection|Collection]] does not exist', + 'coll-printable_version_pdf' => 'PDF version', 'coll-download_as' => 'Download as $1', 'coll-noscript_text' => '<h1>JavaScript is required!</h1> <strong>Your browser does not support JavaScript or JavaScript has been turned off. _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
