* (bug 3043) - RSS feed link should have silly orange icon

** Monobook & Modern skins implementation

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf12b37..0cd4bf3 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1455,7 +1455,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '199';
+$wgStyleVersion = '200';
 
 
 # Server-side caching:

diff --git a/skins/Modern.php b/skins/Modern.php
index c91d0e1..e651562 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -293,8 +293,8 @@ class ModernTemplate extends QuickTemplate {
 <?php  }
                if($this->data['feeds']) { ?>
                        <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-                                       ?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php
-                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
+                                       ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
+                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
                                        <?php } ?></li><?php
                }
 

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index bc405e8..071e079 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -295,8 +295,8 @@ class MonoBookTemplate extends QuickTemplate {
 <?php  }
                if($this->data['feeds']) { ?>
                        <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-                                       ?><span id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>"><a href="<?php
-                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
+                                       ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
+                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
                                        <?php } ?></li><?php
                }
 

diff --git a/skins/common/images/feed-icon.png b/skins/common/images/feed-icon.png
new file mode 100644 (file)
index 0000000..7188fa2
Binary files /dev/null and b/skins/common/images/feed-icon.png differ

diff --git a/skins/modern/feed-icon.png b/skins/modern/feed-icon.png
new file mode 100644 (file)
index 0000000..7188fa2
Binary files /dev/null and b/skins/modern/feed-icon.png differ

diff --git a/skins/modern/main.css b/skins/modern/main.css
index 80ef008..e24db9b 100644 (file)
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -162,6 +162,12 @@ textarea {
        margin-top: .4em;
 }
 
+/* feed links */
+#feed-atom, #feed-rss {
+       background: url("feed-icon.png") center left no-repeat;
+       padding-left: 16px;
+}
+
 .portlet h5 {
        padding: 0.1em 0 0.3em 1em;
        margin: 0 0 0 0;

diff --git a/skins/modern/rtl.css b/skins/modern/rtl.css
index d7aae76..6967af2 100644 (file)
--- a/skins/modern/rtl.css
+++ b/skins/modern/rtl.css
@@ -116,6 +116,12 @@ table.filehistory th {
        padding: 0.1em 1em 0.3em 0;
 }
 
+/* feed links */
+#feed-atom, #feed-rss {
+       background: none;
+       padding-left: 0;
+}
+
 #p-cactions li {
        float: right;
 }

diff --git a/skins/monobook/feed-icon.png b/skins/monobook/feed-icon.png
new file mode 100644 (file)
index 0000000..7188fa2
Binary files /dev/null and b/skins/monobook/feed-icon.png differ

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 63ce572..5f96a98 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -900,6 +900,12 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print {
        z-index: 3;
 }
 
+/* feed links */
+#feed-atom, #feed-rss {
+       background: url("feed-icon.png") center left no-repeat;
+       padding-left: 16px;
+}
+
 /* TODO: #t-iscite is only used by the Cite extension, come up with some
  * system which allows extensions to add to this file on the fly
  */

diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css
index fbd5ab3..7f97cab 100644 (file)
--- a/skins/monobook/rtl.css
+++ b/skins/monobook/rtl.css
@@ -77,6 +77,12 @@ div.magnify,
        right: 0;
 }
 
+/* feed links */
+#feed-atom, #feed-rss {
+       background: none;
+       padding-left: 0;
+}
+
 #p-cactions {
        left: auto;
        right: 11.5em;