Revision: 46060
Author: danny_b
Date: 2009-01-23 03:39:11 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
* (bug 3043) - RSS feed link should have silly orange icon
** improved r46058, now works in all skins
Modified Paths:
--------------
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/Skin.php
trunk/phase3/skins/Modern.php
trunk/phase3/skins/MonoBook.php
trunk/phase3/skins/common/common_rtl.css
trunk/phase3/skins/common/shared.css
trunk/phase3/skins/modern/main.css
trunk/phase3/skins/modern/rtl.css
trunk/phase3/skins/monobook/main.css
trunk/phase3/skins/monobook/rtl.css
trunk/phase3/skins/simple/main.css
trunk/phase3/skins/simple/rtl.css
Removed Paths:
-------------
trunk/phase3/skins/modern/feed-icon.png
trunk/phase3/skins/monobook/feed-icon.png
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2009-01-23 02:11:20 UTC (rev
46059)
+++ trunk/phase3/includes/DefaultSettings.php 2009-01-23 03:39:11 UTC (rev
46060)
@@ -1455,7 +1455,7 @@
* to ensure that client-side caches don't keep obsolete copies of global
* styles.
*/
-$wgStyleVersion = '200';
+$wgStyleVersion = '201';
# Server-side caching:
Modified: trunk/phase3/includes/Skin.php
===================================================================
--- trunk/phase3/includes/Skin.php 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/includes/Skin.php 2009-01-23 03:39:11 UTC (rev 46060)
@@ -1005,7 +1005,7 @@
if( $wgOut->isSyndicated() ) {
foreach( $wgFeedClasses as $format => $class ) {
$feedurl = $wgRequest->escapeAppendQuery(
"feed=$format" );
- $s .= " | <a href=\"$feedurl\">{$format}</a>";
+ $s .= " | <a href=\"$feedurl\"
class=\"feedlink\">{$format}</a>";
}
}
return $s;
Modified: trunk/phase3/skins/Modern.php
===================================================================
--- trunk/phase3/skins/Modern.php 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/Modern.php 2009-01-23 03:39:11 UTC (rev 46060)
@@ -294,7 +294,7 @@
if($this->data['feeds']) { ?>
<li id="feedlinks"><?php foreach($this->data['feeds']
as $key => $feed) {
?><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>
+ echo htmlspecialchars($feed['href'])
?>" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key)
?>><?php echo htmlspecialchars($feed['text'])?></a>
<?php } ?></li><?php
}
Modified: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/MonoBook.php 2009-01-23 03:39:11 UTC (rev 46060)
@@ -296,7 +296,7 @@
if($this->data['feeds']) { ?>
<li id="feedlinks"><?php foreach($this->data['feeds']
as $key => $feed) {
?><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>
+ echo htmlspecialchars($feed['href'])
?>" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key)
?>><?php echo htmlspecialchars($feed['text'])?></a>
<?php } ?></li><?php
}
Modified: trunk/phase3/skins/common/common_rtl.css
===================================================================
--- trunk/phase3/skins/common/common_rtl.css 2009-01-23 02:11:20 UTC (rev
46059)
+++ trunk/phase3/skins/common/common_rtl.css 2009-01-23 03:39:11 UTC (rev
46060)
@@ -46,3 +46,9 @@
html > body div#article ul {
display: table;
}
+
+/* feed links */
+a.feedlink {
+ background: none;
+ padding-left: 0;
+}
Modified: trunk/phase3/skins/common/shared.css
===================================================================
--- trunk/phase3/skins/common/shared.css 2009-01-23 02:11:20 UTC (rev
46059)
+++ trunk/phase3/skins/common/shared.css 2009-01-23 03:39:11 UTC (rev
46060)
@@ -317,4 +317,10 @@
strong.mw-revdelundel-link {
font-family: monospace;
font-size: smaller
-}
\ No newline at end of file
+}
+
+/* feed links */
+a.feedlink {
+ background: url("images/feed-icon.png") center left no-repeat;
+ padding-left: 16px;
+}
Deleted: trunk/phase3/skins/modern/feed-icon.png
===================================================================
(Binary files differ)
Modified: trunk/phase3/skins/modern/main.css
===================================================================
--- trunk/phase3/skins/modern/main.css 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/modern/main.css 2009-01-23 03:39:11 UTC (rev 46060)
@@ -162,12 +162,6 @@
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;
Modified: trunk/phase3/skins/modern/rtl.css
===================================================================
--- trunk/phase3/skins/modern/rtl.css 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/modern/rtl.css 2009-01-23 03:39:11 UTC (rev 46060)
@@ -116,12 +116,6 @@
padding: 0.1em 1em 0.3em 0;
}
-/* feed links */
-#feed-atom, #feed-rss {
- background: none;
- padding-left: 0;
-}
-
#p-cactions li {
float: right;
}
Deleted: trunk/phase3/skins/monobook/feed-icon.png
===================================================================
(Binary files differ)
Modified: trunk/phase3/skins/monobook/main.css
===================================================================
--- trunk/phase3/skins/monobook/main.css 2009-01-23 02:11:20 UTC (rev
46059)
+++ trunk/phase3/skins/monobook/main.css 2009-01-23 03:39:11 UTC (rev
46060)
@@ -900,12 +900,6 @@
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
*/
Modified: trunk/phase3/skins/monobook/rtl.css
===================================================================
--- trunk/phase3/skins/monobook/rtl.css 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/monobook/rtl.css 2009-01-23 03:39:11 UTC (rev 46060)
@@ -77,12 +77,6 @@
right: 0;
}
-/* feed links */
-#feed-atom, #feed-rss {
- background: none;
- padding-left: 0;
-}
-
#p-cactions {
left: auto;
right: 11.5em;
Modified: trunk/phase3/skins/simple/main.css
===================================================================
--- trunk/phase3/skins/simple/main.css 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/simple/main.css 2009-01-23 03:39:11 UTC (rev 46060)
@@ -175,6 +175,12 @@
padding: 0.5em 0.4em 0.4em 0.4em;
}
+/* feed links */
+a.feedlink {
+ background: url("../common/images/feed-icon.png") center left no-repeat;
+ padding-left: 16px;
+}
+
textarea {
width: 100%;
}
Modified: trunk/phase3/skins/simple/rtl.css
===================================================================
--- trunk/phase3/skins/simple/rtl.css 2009-01-23 02:11:20 UTC (rev 46059)
+++ trunk/phase3/skins/simple/rtl.css 2009-01-23 03:39:11 UTC (rev 46060)
@@ -71,6 +71,12 @@
right: 0;
}
+/* feed links */
+a.feedlink {
+ background: none;
+ padding-left: 0;
+}
+
/* Fix margins for non-css2 browsers */
/* top right bottom left */
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
