[MediaWiki-commits] [Gerrit] Use .feedlink class rather than feed-icon.png file - change (mediawiki...WikiArticleFeeds)

Sun, 14 Sep 2014 05:14:39 -0700 

jenkins-bot has submitted this change and it was merged.

Change subject: Use .feedlink class rather than feed-icon.png file
......................................................................


Use .feedlink class rather than feed-icon.png file

As a bonus the icon now uses SVG with PNG fallback.

Bug: 70615
Change-Id: I4645f266ab84ae4c411296f099dff4a5ef5b88e7
---
M WikiArticleFeeds_body.php
1 file changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WikiArticleFeeds_body.php b/WikiArticleFeeds_body.php
index 2e36e72..52adc79 100644
--- a/WikiArticleFeeds_body.php
+++ b/WikiArticleFeeds_body.php
@@ -124,7 +124,7 @@
        * @param QuickTemplate $template Instance of MonoBookTemplate or other 
QuickTemplate
        */
        static function wfWikiArticleFeedsToolboxLinks( $template ) {
-               global $wgServer, $wgScript, $wgStylePath, $wgWikiFeedPresent;
+               global $wgServer, $wgScript, $wgWikiFeedPresent;
 
                # Short-circuit if there are no Feeds present
                if ( !$wgWikiFeedPresent ) {
@@ -138,7 +138,6 @@
                }
 
                $result = '<li id="feedlinks">';
-               $feedIcon = $wgServer . $wgStylePath . 
"/common/images/feed-icon.png";
 
                # Test for feedBurner presence
                $burned = false;
@@ -153,8 +152,7 @@
                                foreach ( $feeds as $feed => $name ) {
                                        $result .=
                                        '<span id="feed-' . htmlspecialchars( 
$feed ) . '">' .
-                                       '<a href="http://feeds.feedburner.com/' 
. urlencode( $feedBurnerName ) . '?format=xml">' .
-                                       '<img style="margin-right:2px;" src="' 
. $feedIcon . '" border=0>' .
+                                       '<a class="feedlink" 
href="http://feeds.feedburner.com/' . urlencode( $feedBurnerName ) . 
'?format=xml">' .
                                        htmlspecialchars( $name ) . 
'</a>&#160;</span>';
                                }
                                $burned = true;
@@ -169,8 +167,7 @@
                        foreach ( $feeds as $feed => $name ) {
                                $result .=
                                '<span id="feed-' . htmlspecialchars( $feed ) . 
'">' .
-                               '<a href="' . htmlspecialchars( $baseUrl . 
$feed ) . '">' .
-                               '<img style="margin-right:2px;" src="' . 
$feedIcon . '" border=0>' .
+                               '<a class="feedlink" href="' . 
htmlspecialchars( $baseUrl . $feed ) . '">' .
                                htmlspecialchars( $name ) . '</a>&#160;</span>';
                        }
                }

-- 
To view, visit https://gerrit.wikimedia.org/r/159373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4645f266ab84ae4c411296f099dff4a5ef5b88e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiArticleFeeds
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to