r46060 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r46059‎ | r46060 | r46061 >
Date:03:39, 23 January 2009
Author:danny_b
Status:ok
Tags:
Comment:
* (bug 3043) - RSS feed link should have silly orange icon
** improved r46058, now works in all skins
Modified paths:
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/includes/Skin.php (modified) (history)
  • /trunk/phase3/skins/Modern.php (modified) (history)
  • /trunk/phase3/skins/MonoBook.php (modified) (history)
  • /trunk/phase3/skins/common/common_rtl.css (modified) (history)
  • /trunk/phase3/skins/common/shared.css (modified) (history)
  • /trunk/phase3/skins/modern/feed-icon.png (deleted) (history)
  • /trunk/phase3/skins/modern/main.css (modified) (history)
  • /trunk/phase3/skins/modern/rtl.css (modified) (history)
  • /trunk/phase3/skins/monobook/feed-icon.png (deleted) (history)
  • /trunk/phase3/skins/monobook/main.css (modified) (history)
  • /trunk/phase3/skins/monobook/rtl.css (modified) (history)
  • /trunk/phase3/skins/simple/main.css (modified) (history)
  • /trunk/phase3/skins/simple/rtl.css (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/monobook/feed-icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/phase3/skins/monobook/rtl.css
@@ -77,12 +77,6 @@
7878 right: 0;
7979 }
8080
81 -/* feed links */
82 -#feed-atom, #feed-rss {
83 - background: none;
84 - padding-left: 0;
85 -}
86 -
8781 #p-cactions {
8882 left: auto;
8983 right: 11.5em;
Index: trunk/phase3/skins/monobook/main.css
@@ -900,12 +900,6 @@
901901 z-index: 3;
902902 }
903903
904 -/* feed links */
905 -#feed-atom, #feed-rss {
906 - background: url("feed-icon.png") center left no-repeat;
907 - padding-left: 16px;
908 -}
909 -
910904 /* TODO: #t-iscite is only used by the Cite extension, come up with some
911905 * system which allows extensions to add to this file on the fly
912906 */
Index: trunk/phase3/skins/modern/feed-icon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/phase3/skins/modern/rtl.css
@@ -116,12 +116,6 @@
117117 padding: 0.1em 1em 0.3em 0;
118118 }
119119
120 -/* feed links */
121 -#feed-atom, #feed-rss {
122 - background: none;
123 - padding-left: 0;
124 -}
125 -
126120 #p-cactions li {
127121 float: right;
128122 }
Index: trunk/phase3/skins/modern/main.css
@@ -162,12 +162,6 @@
163163 margin-top: .4em;
164164 }
165165
166 -/* feed links */
167 -#feed-atom, #feed-rss {
168 - background: url("feed-icon.png") center left no-repeat;
169 - padding-left: 16px;
170 -}
171 -
172166 .portlet h5 {
173167 padding: 0.1em 0 0.3em 1em;
174168 margin: 0 0 0 0;
Index: trunk/phase3/skins/common/shared.css
@@ -317,4 +317,10 @@
318318 strong.mw-revdelundel-link {
319319 font-family: monospace;
320320 font-size: smaller
321 -}
\ No newline at end of file
 321+}
 322+
 323+/* feed links */
 324+a.feedlink {
 325+ background: url("images/feed-icon.png") center left no-repeat;
 326+ padding-left: 16px;
 327+}
Index: trunk/phase3/skins/common/common_rtl.css
@@ -46,3 +46,9 @@
4747 html > body div#article ul {
4848 display: table;
4949 }
 50+
 51+/* feed links */
 52+a.feedlink {
 53+ background: none;
 54+ padding-left: 0;
 55+}
Index: trunk/phase3/skins/simple/rtl.css
@@ -71,6 +71,12 @@
7272 right: 0;
7373 }
7474
 75+/* feed links */
 76+a.feedlink {
 77+ background: none;
 78+ padding-left: 0;
 79+}
 80+
7581 /* Fix margins for non-css2 browsers */
7682 /* top right bottom left */
7783
Index: trunk/phase3/skins/simple/main.css
@@ -175,6 +175,12 @@
176176 padding: 0.5em 0.4em 0.4em 0.4em;
177177 }
178178
 179+/* feed links */
 180+a.feedlink {
 181+ background: url("../common/images/feed-icon.png") center left no-repeat;
 182+ padding-left: 16px;
 183+}
 184+
179185 textarea {
180186 width: 100%;
181187 }
Index: trunk/phase3/skins/MonoBook.php
@@ -296,7 +296,7 @@
297297 if($this->data['feeds']) { ?>
298298 <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
299299 ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
300 - echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
 300+ echo htmlspecialchars($feed['href']) ?>" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
301301 <?php } ?></li><?php
302302 }
303303
Index: trunk/phase3/skins/Modern.php
@@ -294,7 +294,7 @@
295295 if($this->data['feeds']) { ?>
296296 <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
297297 ?><a id="<?php echo Sanitizer::escapeId( "feed-$key" ) ?>" href="<?php
298 - echo htmlspecialchars($feed['href']) ?>"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
 298+ echo htmlspecialchars($feed['href']) ?>" class="feedlink"<?php echo $this->skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;
299299 <?php } ?></li><?php
300300 }
301301
Index: trunk/phase3/includes/DefaultSettings.php
@@ -1455,7 +1455,7 @@
14561456 * to ensure that client-side caches don't keep obsolete copies of global
14571457 * styles.
14581458 */
1459 -$wgStyleVersion = '200';
 1459+$wgStyleVersion = '201';
14601460
14611461
14621462 # Server-side caching:
Index: trunk/phase3/includes/Skin.php
@@ -1005,7 +1005,7 @@
10061006 if( $wgOut->isSyndicated() ) {
10071007 foreach( $wgFeedClasses as $format => $class ) {
10081008 $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
1009 - $s .= " | <a href=\"$feedurl\">{$format}</a>";
 1009+ $s .= " | <a href=\"$feedurl\" class=\"feedlink\">{$format}</a>";
10101010 }
10111011 }
10121012 return $s;

Follow-up revisions

RevisionCommit summaryAuthorDate
r46061* re: r46058 & r46060 (bug 3043)danny_b03:51, 23 January 2009
r46474Tweak for bug 3043 -- disable feed link icons in RTL since they display incor...brion19:57, 28 January 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r46058* (bug 3043) - RSS feed link should have silly orange icon...danny_b02:09, 23 January 2009

Status & tagging log