Rename mediawiki.legacy.feeds to mediawiki.feedlink

Follow-up to d51317ccc24940b77f4f7226d9455c801c09b457. There's nothing
"legacy" about this newly added module.

Also updated comments and marked the copy in shared.css for removal
when cached page renders expire.

Change-Id: Iabaebe9bf1e11a06bb951769693b1be4404e5b00

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index cc294f8..a1844a8 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -58,7 +58,7 @@ class SkinTemplate extends Skin {
                        'mediawiki.sectionAnchor'
                );
                if ( $out->isSyndicated() ) {
-                       $moduleStyles[] = 'mediawiki.legacy.feeds';
+                       $moduleStyles[] = 'mediawiki.feedlink';
                }
                $out->addModuleStyles( $moduleStyles );
        }

diff --git a/resources/Resources.php b/resources/Resources.php
index ec1523e..d575c8d 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -970,7 +970,10 @@ return array(
                        'feedback-useragent'
                ),
        ),
-
+       'mediawiki.feedlink' => array(
+               'position' => 'top',
+               'styles' => 'resources/src/mediawiki/mediawiki.feedlink.css',
+       ),
        'mediawiki.filewarning' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js',
                'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less',
@@ -978,7 +981,6 @@ return array(
                        'oojs-ui',
                ),
        ),
-
        'mediawiki.helplink' => array(
                'position' => 'top',
                'styles' => array(
@@ -1695,10 +1697,6 @@ return array(
 
        /* MediaWiki Legacy */
 
-       'mediawiki.legacy.feeds' => array(
-               'position' => 'top',
-               'styles' => 'resources/src/mediawiki.legacy/feeds.css',
-       ),
        'mediawiki.legacy.commonPrint' => array(
                'position' => 'top',
                'styles' => array(

diff --git a/resources/src/mediawiki.legacy/feeds.css b/resources/src/mediawiki.legacy/feeds.css
deleted file mode 100644 (file)
index 9737fd4..0000000
--- a/resources/src/mediawiki.legacy/feeds.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Extracted from mediawiki.legacy.shared, which no longer @embeds the
- * background image. The selector below must be more specific. */
-#feedlinks a.feedlink {
-       /* SVG support using a transparent gradient to guarantee cross-browser
-        * compatibility (browsers able to understand gradient syntax support also SVG).
-        * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-       background-image: url(images/feed-icon.png);
-       /* @embed */
-       background-image: -webkit-linear-gradient(transparent, transparent), url(images/feed-icon.svg);
-       /* @embed */
-       background-image: linear-gradient(transparent, transparent), url(images/feed-icon.svg);
-}

diff --git a/resources/src/mediawiki.legacy/images/feed-icon.png b/resources/src/mediawiki.legacy/images/feed-icon.png
deleted file mode 100644 (file)
index 00f49f6..0000000
Binary files a/resources/src/mediawiki.legacy/images/feed-icon.png and /dev/null differ

diff --git a/resources/src/mediawiki.legacy/images/feed-icon.svg b/resources/src/mediawiki.legacy/images/feed-icon.svg
deleted file mode 100644 (file)
index 6e5f570..0000000
--- a/resources/src/mediawiki.legacy/images/feed-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 256 256"><defs><linearGradient x1=".085" y1=".085" x2=".915" y2=".915" id="a"><stop offset="0" stop-color="#E3702D"/><stop offset=".107" stop-color="#EA7D31"/><stop offset=".35" stop-color="#F69537"/><stop offset=".5" stop-color="#FB9E3A"/><stop offset=".702" stop-color="#EA7C31"/><stop offset=".887" stop-color="#DE642B"/><stop offset="1" stop-color="#D95B29"/></linearGradient></defs><rect width="256" height="256" rx="55" ry="55" fill="#CC5D15"/><rect width="246" height="246" rx="50" ry="50" x="5" y="5" fill="#F49C52"/><rect width="236" height="236" rx="47" ry="47" x="10" y="10" fill="url(#a)"/><circle cx="68" cy="189" r="24" fill="#FFF"/><path d="M160 213h-34a82 82 0 0 0-82-82v-34a116 116 0 0 1 116 116zM184 213a140 140 0 0 0-140-140v-35a175 175 0 0 1 175 175z" fill="#FFF"/></svg>
\ No newline at end of file

diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index 248ea19..14fd286 100644 (file)
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -493,13 +493,14 @@ a.new {
 }
 
 /* feed links */
+/* To be removed before 1.26 release, moved to mediawiki.feedlink module */
 a.feedlink {
        /* SVG support using a transparent gradient to guarantee cross-browser
         * compatibility (browsers able to understand gradient syntax support also SVG).
         * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-       background-image: url(images/feed-icon.png);
-       background-image: -webkit-linear-gradient(transparent, transparent), url(images/feed-icon.svg);
-       background-image: linear-gradient(transparent, transparent), url(images/feed-icon.svg);
+       background-image: url(../mediawiki/images/feed-icon.png);
+       background-image: -webkit-linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg);
+       background-image: linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg);
        background-position: center left;
        background-repeat: no-repeat;
        background-size: 12px 12px;

diff --git a/resources/src/mediawiki/images/feed-icon.png b/resources/src/mediawiki/images/feed-icon.png
new file mode 100644 (file)
index 0000000..00f49f6
Binary files /dev/null and b/resources/src/mediawiki/images/feed-icon.png differ

diff --git a/resources/src/mediawiki/images/feed-icon.svg b/resources/src/mediawiki/images/feed-icon.svg
new file mode 100644 (file)
index 0000000..6e5f570
--- /dev/null
+++ b/resources/src/mediawiki/images/feed-icon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 256 256"><defs><linearGradient x1=".085" y1=".085" x2=".915" y2=".915" id="a"><stop offset="0" stop-color="#E3702D"/><stop offset=".107" stop-color="#EA7D31"/><stop offset=".35" stop-color="#F69537"/><stop offset=".5" stop-color="#FB9E3A"/><stop offset=".702" stop-color="#EA7C31"/><stop offset=".887" stop-color="#DE642B"/><stop offset="1" stop-color="#D95B29"/></linearGradient></defs><rect width="256" height="256" rx="55" ry="55" fill="#CC5D15"/><rect width="246" height="246" rx="50" ry="50" x="5" y="5" fill="#F49C52"/><rect width="236" height="236" rx="47" ry="47" x="10" y="10" fill="url(#a)"/><circle cx="68" cy="189" r="24" fill="#FFF"/><path d="M160 213h-34a82 82 0 0 0-82-82v-34a116 116 0 0 1 116 116zM184 213a140 140 0 0 0-140-140v-35a175 175 0 0 1 175 175z" fill="#FFF"/></svg>
\ No newline at end of file

diff --git a/resources/src/mediawiki/mediawiki.feedlink.css b/resources/src/mediawiki/mediawiki.feedlink.css
new file mode 100644 (file)
index 0000000..1dda2ac
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.feedlink.css
@@ -0,0 +1,14 @@
+/* Styles for links to RSS/Atom feeds in sidebar */
+
+/* Until the copy of this code in mediawiki.legacy.shared is removed, which no longer @embeds the
+ * background image, the selector below must be kept more specific. */
+#feedlinks a.feedlink {
+       /* SVG support using a transparent gradient to guarantee cross-browser
+        * compatibility (browsers able to understand gradient syntax support also SVG).
+        * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
+       background-image: url(images/feed-icon.png);
+       /* @embed */
+       background-image: -webkit-linear-gradient(transparent, transparent), url(images/feed-icon.svg);
+       /* @embed */
+       background-image: linear-gradient(transparent, transparent), url(images/feed-icon.svg);
+}