Revision: 46058
Author: danny_b
Date: 2009-01-23 02:09:48 +0000 (Fri, 23 Jan 2009)
Log Message:
-----------
* (bug 3043) - RSS feed link should have silly orange icon
** Monobook & Modern skins implementation
Modified Paths:
--------------
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/skins/Modern.php
trunk/phase3/skins/MonoBook.php
trunk/phase3/skins/modern/main.css
trunk/phase3/skins/modern/rtl.css
trunk/phase3/skins/monobook/main.css
trunk/phase3/skins/monobook/rtl.css
Added Paths:
-----------
trunk/phase3/skins/common/images/feed-icon.png
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 01:47:09 UTC (rev
46057)
+++ trunk/phase3/includes/DefaultSettings.php 2009-01-23 02:09:48 UTC (rev
46058)
@@ -1455,7 +1455,7 @@
* to ensure that client-side caches don't keep obsolete copies of global
* styles.
*/
-$wgStyleVersion = '199';
+$wgStyleVersion = '200';
# Server-side caching:
Modified: trunk/phase3/skins/Modern.php
===================================================================
--- trunk/phase3/skins/Modern.php 2009-01-23 01:47:09 UTC (rev 46057)
+++ trunk/phase3/skins/Modern.php 2009-01-23 02:09:48 UTC (rev 46058)
@@ -293,8 +293,8 @@
<?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> </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>
<?php } ?></li><?php
}
Modified: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php 2009-01-23 01:47:09 UTC (rev 46057)
+++ trunk/phase3/skins/MonoBook.php 2009-01-23 02:09:48 UTC (rev 46058)
@@ -295,8 +295,8 @@
<?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> </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>
<?php } ?></li><?php
}
Added: trunk/phase3/skins/common/images/feed-icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/phase3/skins/common/images/feed-icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/phase3/skins/modern/feed-icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/phase3/skins/modern/feed-icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/phase3/skins/modern/main.css
===================================================================
--- trunk/phase3/skins/modern/main.css 2009-01-23 01:47:09 UTC (rev 46057)
+++ trunk/phase3/skins/modern/main.css 2009-01-23 02:09:48 UTC (rev 46058)
@@ -162,6 +162,12 @@
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 01:47:09 UTC (rev 46057)
+++ trunk/phase3/skins/modern/rtl.css 2009-01-23 02:09:48 UTC (rev 46058)
@@ -116,6 +116,12 @@
padding: 0.1em 1em 0.3em 0;
}
+/* feed links */
+#feed-atom, #feed-rss {
+ background: none;
+ padding-left: 0;
+}
+
#p-cactions li {
float: right;
}
Added: trunk/phase3/skins/monobook/feed-icon.png
===================================================================
(Binary files differ)
Property changes on: trunk/phase3/skins/monobook/feed-icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/phase3/skins/monobook/main.css
===================================================================
--- trunk/phase3/skins/monobook/main.css 2009-01-23 01:47:09 UTC (rev
46057)
+++ trunk/phase3/skins/monobook/main.css 2009-01-23 02:09:48 UTC (rev
46058)
@@ -900,6 +900,12 @@
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 01:47:09 UTC (rev 46057)
+++ trunk/phase3/skins/monobook/rtl.css 2009-01-23 02:09:48 UTC (rev 46058)
@@ -77,6 +77,12 @@
right: 0;
}
+/* feed links */
+#feed-atom, #feed-rss {
+ background: none;
+ padding-left: 0;
+}
+
#p-cactions {
left: auto;
right: 11.5em;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
