From 36639313aa31cfd06fcc8427668b088bfd5d6747 Mon Sep 17 00:00:00 2001
From: Danny B <danny_b@users.mediawiki.org>
Date: Fri, 23 Jan 2009 02:09:48 +0000
Subject: [PATCH] * (bug 3043) - RSS feed link should have silly orange icon **
 Monobook & Modern skins implementation

---
 includes/DefaultSettings.php      |   2 +-
 skins/Modern.php                  |   4 ++--
 skins/MonoBook.php                |   4 ++--
 skins/common/images/feed-icon.png | Bin 0 -> 557 bytes
 skins/modern/feed-icon.png        | Bin 0 -> 557 bytes
 skins/modern/main.css             |   6 ++++++
 skins/modern/rtl.css              |   6 ++++++
 skins/monobook/feed-icon.png      | Bin 0 -> 557 bytes
 skins/monobook/main.css           |   6 ++++++
 skins/monobook/rtl.css            |   6 ++++++
 10 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 skins/common/images/feed-icon.png
 create mode 100644 skins/modern/feed-icon.png
 create mode 100644 skins/monobook/feed-icon.png

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf12b37ce4..0cd4bf34e2 100644
--- 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 c91d0e1cae..e651562801 100644
--- 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 bc405e8d13..071e07957c 100644
--- 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
index 0000000000000000000000000000000000000000..7188fa23a8824ee0256a4429bc3acbcb0d5c4b34
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RT2@VQ55-;3Xga7~m&q+i<R49=>(6MV%Q5Zn+^L_Wem-v!a
zMbntrfHW05h)zx}w$fFCh>I>=oCHDKTm%P~PC66{y4Xn&LD8{A!J>-}(o%{Mgj(Cu
z)<R9v<i2;WL)E|F{5bMuqFU>(R%Roybp%l(s1?KrVnB@`LTI;LbGx}RX8Ws^Inz$-
zS{_99wh{ju69g5(Sj9wwT9Kq^hK0d78>t=2=rM3>2FVvm*OqV#Z%7xOV>Csr@UNN_
z;~{hBLhYWCAvnVB2DUOnJaUov)Hq@76WZHBt>W4lY0rqN5ll{zw1r!IMe9j}-n&Vp
z?-;qpG^TVC*UoSqPv$(TRxpu}jNhhs?J<SxPho2b_xdKNMModtoF(mKco$Gn&`4-M
zyMdd3g!Yw*FHNCFaqk}@2ajV<U%_=eJ`L=XVnw@~_>~X17Zc!n==r;JKEK58tP-DX
zkaayi3#gcVQvUK3xvMj1zJU8UjU1{Wr8Dd;zQvYK5DpwAq@ZXBYK5@146O~^uT8qk
z^8j#o7`Of%07(YOf)BEK|J>IjWm{J(|8Jz7zgN1RwCl;b0q+G{$~EoQw;!WHYqNzU
vs{2$Va{-SfL;=L379<J58{gbr|2g&t{m{i)u&AM;00000NkvXXu0mjfvRU~V

literal 0
HcmV?d00001

diff --git a/skins/modern/feed-icon.png b/skins/modern/feed-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7188fa23a8824ee0256a4429bc3acbcb0d5c4b34
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RT2@VQ55-;3Xga7~m&q+i<R49=>(6MV%Q5Zn+^L_Wem-v!a
zMbntrfHW05h)zx}w$fFCh>I>=oCHDKTm%P~PC66{y4Xn&LD8{A!J>-}(o%{Mgj(Cu
z)<R9v<i2;WL)E|F{5bMuqFU>(R%Roybp%l(s1?KrVnB@`LTI;LbGx}RX8Ws^Inz$-
zS{_99wh{ju69g5(Sj9wwT9Kq^hK0d78>t=2=rM3>2FVvm*OqV#Z%7xOV>Csr@UNN_
z;~{hBLhYWCAvnVB2DUOnJaUov)Hq@76WZHBt>W4lY0rqN5ll{zw1r!IMe9j}-n&Vp
z?-;qpG^TVC*UoSqPv$(TRxpu}jNhhs?J<SxPho2b_xdKNMModtoF(mKco$Gn&`4-M
zyMdd3g!Yw*FHNCFaqk}@2ajV<U%_=eJ`L=XVnw@~_>~X17Zc!n==r;JKEK58tP-DX
zkaayi3#gcVQvUK3xvMj1zJU8UjU1{Wr8Dd;zQvYK5DpwAq@ZXBYK5@146O~^uT8qk
z^8j#o7`Of%07(YOf)BEK|J>IjWm{J(|8Jz7zgN1RwCl;b0q+G{$~EoQw;!WHYqNzU
vs{2$Va{-SfL;=L379<J58{gbr|2g&t{m{i)u&AM;00000NkvXXu0mjfvRU~V

literal 0
HcmV?d00001

diff --git a/skins/modern/main.css b/skins/modern/main.css
index 80ef008c5b..e24db9b1ac 100644
--- 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 d7aae76984..6967af27c6 100644
--- 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
index 0000000000000000000000000000000000000000..7188fa23a8824ee0256a4429bc3acbcb0d5c4b34
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RT2@VQ55-;3Xga7~m&q+i<R49=>(6MV%Q5Zn+^L_Wem-v!a
zMbntrfHW05h)zx}w$fFCh>I>=oCHDKTm%P~PC66{y4Xn&LD8{A!J>-}(o%{Mgj(Cu
z)<R9v<i2;WL)E|F{5bMuqFU>(R%Roybp%l(s1?KrVnB@`LTI;LbGx}RX8Ws^Inz$-
zS{_99wh{ju69g5(Sj9wwT9Kq^hK0d78>t=2=rM3>2FVvm*OqV#Z%7xOV>Csr@UNN_
z;~{hBLhYWCAvnVB2DUOnJaUov)Hq@76WZHBt>W4lY0rqN5ll{zw1r!IMe9j}-n&Vp
z?-;qpG^TVC*UoSqPv$(TRxpu}jNhhs?J<SxPho2b_xdKNMModtoF(mKco$Gn&`4-M
zyMdd3g!Yw*FHNCFaqk}@2ajV<U%_=eJ`L=XVnw@~_>~X17Zc!n==r;JKEK58tP-DX
zkaayi3#gcVQvUK3xvMj1zJU8UjU1{Wr8Dd;zQvYK5DpwAq@ZXBYK5@146O~^uT8qk
z^8j#o7`Of%07(YOf)BEK|J>IjWm{J(|8Jz7zgN1RwCl;b0q+G{$~EoQw;!WHYqNzU
vs{2$Va{-SfL;=L379<J58{gbr|2g&t{m{i)u&AM;00000NkvXXu0mjfvRU~V

literal 0
HcmV?d00001

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index 63ce572cc7..5f96a98e0d 100644
--- 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 fbd5ab35ea..7f97cab20f 100644
--- 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;
-- 
2.20.1