GNOME.org
 

[planet-web] Assign http://news.gnome.org its own theme dir and piwik configuration.

commit 4541e238985e0f434fb3318c86392a1556ac0264
Author: Andrea Veri <av src gnome org>
Date:   Mon Feb 27 20:20:44 2012 +0100

    Assign http://news.gnome.org its own theme dir and piwik configuration.

 config/news/config.ini              |    2 +-
 themes/news-old/config.ini          |   28 +++
 themes/news-old/feeds.html.tmpl     |    1 +
 themes/news-old/index.html.tmpl     |  220 +++++++++++++++++++++
 themes/news-old/rss20.xml.tmpl      |   33 ++++
 themes/news-old/sidebar.html.tmpl   |   17 ++
 themes/news-old/simple.html.tmpl    |   74 +++++++
 themes/news/config.ini              |    2 +
 themes/news/index-2.0.html.tmpl     |  222 +++++++++++++++++++++
 themes/news/index-regular.html.tmpl |  332 ++++++++++++++++++++++++++++++++
 themes/news/index.html.tmpl         |  362 +++++++++++++++++++++++------------
 themes/news/rss20.xml.tmpl          |    8 +-
 themes/news/simple.html.tmpl        |    4 +-
 13 files changed, 1177 insertions(+), 128 deletions(-)
---
diff --git a/config/news/config.ini b/config/news/config.ini
index 3a25abf..566c632 100644
--- a/config/news/config.ini
+++ b/config/news/config.ini
@@ -7,7 +7,7 @@ owner_email = jdub gnome org
 date_format = %B %d, %Y %I:%M %p
 log_level = CRITICAL
 
-output_theme = ../../themes/gnome
+output_theme = ../../themes/news
 output_dir = ../../web/news
 
 #spider_threads = 10
diff --git a/themes/news-old/config.ini b/themes/news-old/config.ini
new file mode 100644
index 0000000..a93011a
--- /dev/null
+++ b/themes/news-old/config.ini
@@ -0,0 +1,28 @@
+# In addition to the outputs produced by the 'asf' theme, this one adds
+# a 'mobile' version.  For best results, this needs to be combined with
+# the 'excerpt.py' filter.
+
+[Planet]
+template_files:
+  index.html.tmpl
+  simple.html.tmpl
+  feeds.html.tmpl
+  sidebar.html.tmpl
+  atom.xml.xslt
+  rss10.xml.tmpl
+  rss20.xml.tmpl
+  opml.xml.xslt
+  foafroll.xml.xslt
+
+template_directories:
+  /var/cache/gnomeweb/venus/themes/common
+
+bill_of_materials:
+
+# feeds should be fairly short by default
+[atom.xml.xslt]
+items_per_page = 30
+[rss10.xml.tmpl]
+items_per_page = 30
+[rss20.xml.tmpl]
+items_per_page = 30
diff --git a/themes/news-old/feeds.html.tmpl b/themes/news-old/feeds.html.tmpl
new file mode 100644
index 0000000..7598891
--- /dev/null
+++ b/themes/news-old/feeds.html.tmpl
@@ -0,0 +1 @@
+<ul><TMPL_LOOP Channels><li<TMPL_IF nick> class="<TMPL_VAR nick>"</TMPL_IF>><TMPL_IF url><a href="<TMPL_VAR url ESCAPE="HTML">" title="Subscribe"><img src="http://planet.gnome.org/img/feed-icon-10x10.png"; alt="(feed)"></a><TMPL_ELSE><img src="http://planet.gnome.org/img/feed-icon-10x10.png"; alt="(feed)"></TMPL_IF> <TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" <TMPL_IF message>class="message" title="<TMPL_VAR message ESCAPE="HTML">"</TMPL_IF><TMPL_UNLESS message>title="<TMPL_VAR title_plain ESCAPE="HTML">"</TMPL_UNLESS>><TMPL_VAR name></a><TMPL_ELSE><span <TMPL_IF message>class="message" title="<TMPL_VAR message ESCAPE="HTML">"</TMPL_IF><TMPL_UNLESS message>title="<TMPL_VAR title_plain ESCAPE="HTML">"</TMPL_UNLESS>><TMPL_VAR name></span></TMPL_IF></li></TMPL_LOOP></ul>
diff --git a/themes/news-old/index.html.tmpl b/themes/news-old/index.html.tmpl
new file mode 100644
index 0000000..32283bd
--- /dev/null
+++ b/themes/news-old/index.html.tmpl
@@ -0,0 +1,220 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+
+<head>
+	<title><TMPL_VAR name></title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="shortcut icon" type="image/png" href="http://planet.gnome.org/img/gnome-16.png";>
+	<link rel="alternate" type="application/atom+xml" title="Planet GNOME Atom 1.0" href="http://planet.gnome.org/atom.xml";>
+	<link rel="alternate" type="application/rss+xml" title="Planet GNOME RSS 2.0" href="http://planet.gnome.org/rss20.xml";>
+
+	<link rel="stylesheet" href="http://planet.gnome.org/nlayout.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/planet.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/generic.css"; type="text/css">
+	<link rel="stylesheet" href="http://blogs.gnome.org/wp-content/mu-plugins/bug-links/bug-links.css"; type="text/css">
+
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js";></script>
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.cookie.min.js";></script>
+	<script type="text/javascript">
+	function toggleFeeds() {
+		$("#feedlist").slideToggle(function() {
+			$("#feeds h3").toggleClass("open");
+		});
+	}
+	$(document).ready(function() {
+		var hidden = $.cookie("hidden") ? $.cookie("hidden").split(",") : new Array();
+		// hide posts by disabled folks
+		if (hidden.length > 0) for (i in hidden) {
+			$("div." + hidden[i]).hide();
+		}
+		$("#feeds h3 a").click(function(e) {
+			e.preventDefault();
+			if ($("#feedlist ul").length == 0) {
+				$("#feedlist").load('feeds.html', '', function(r,t,x) {
+					$('<input type="checkbox" checked>')
+						.change(function() {
+							var nick = $(this).parent().attr("class");
+							var i = $.inArray(nick, hidden);
+							if ($(this).attr("checked")) {
+								if (hidden[i]) hidden.splice(i, 1);
+								$("div." + nick).show();
+							} else {
+								if (!hidden[i]) hidden[hidden.length] = nick;
+								$("div." + nick).hide();
+							}
+							$.cookie("hidden", hidden.join(","),
+								{expires: 365});
+						})
+						.prependTo("#feedlist ul li");
+					// remove checks from disabled folks
+					for (i in hidden) {
+						$("#feedlist ul li." + hidden[i] + " input")
+							.removeAttr("checked");
+					}
+					toggleFeeds();
+				});
+			} else {
+				toggleFeeds();
+			}
+		});
+	});
+	</script>
+</head>
+
+<body>
+
+
+<div id="gnome-sites">
+<ul><li class="home"><a href="http://www.gnome.org/"; title="Home">Home</a></li><li><a href="http://news.gnome.org"; title="News">News</a></li><li><a href="http://www.gnome.org/projects/"; title="Projects">Projects</a></li><li><a href="http://art.gnome.org"; title="Art">Art</a></li><li><a href="http://www.gnome.org/support/"; title="Support">Support</a></li><li><a href="http://developer.gnome.org"; title="Development">Development</a></li><li><a href="http://www.gnome.org/community/"; title="Community">Community</a></li></ul>
+</div> <!-- /gnome-sites -->
+
+
+<div id="page">
+
+
+<div id="header">
+
+<!-- Google CSE Search Box Begins -->
+<div id="search">
+<form id="searchbox_007525575524326405779:c0gv0y410u0" action="http://www.google.com/cse";>
+<input type="hidden" name="cx" value="007525575524326405779:c0gv0y410u0">
+<input name="q" type="text" size="15">
+<!--<input type="submit" name="sa" value="Search">-->
+<input type="hidden" name="cof" value="FORID:0">
+</form>
+<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_007525575524326405779%3Ac0gv0y410u0";></script>
+</div> <!-- /search -->
+<!-- Google CSE Search Box Ends -->
+
+<div id="masthead">
+<a href="/" title="Home" rel="home"><img src="http://planet.gnome.org/img/logo.png"; alt="Home" id="site-logo" width="64" height="64"></a>
+<div id="site-title">
+<p id="site-name"><a href="/" title="Home" rel="home">GNOME News</a></p>
+<p id="site-slogan">GNOME: Read all about it!</p>
+</div> <!-- /site-title -->
+<a id="footer-link" href="#footer">About GNOME News</a>
+</div> <!-- /masthead -->
+
+</div> <!-- /header -->
+
+
+<div id="content">
+
+<TMPL_IF banner_message>
+<div class="banner"><TMPL_VAR banner_message></div>
+</TMPL_IF>
+
+<TMPL_LOOP Items>
+
+<TMPL_IF new_date>
+<h2 class="date"><TMPL_VAR new_date></h2>
+</TMPL_IF>
+
+<div class="entry<TMPL_IF channel_nick> <TMPL_VAR channel_nick></TMPL_IF>">
+
+<div class="person-info">
+<a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title ESCAPE="HTML">"><TMPL_IF channel_face><img class="face" src="<TMPL_VAR channel_face ESCAPE="HTML">" alt=""><br><TMPL_ELSE><img class="face" src="http://planet.gnome.org/heads/nobody.png"; alt=""><br></TMPL_IF><TMPL_VAR channel_name><TMPL_IF channel_real><br><TMPL_VAR channel_real></TMPL_IF><TMPL_IF channel_nick><br>(<TMPL_VAR channel_nick>)</TMPL_IF></a>
+<TMPL_IF channel_gsoc2008><p><a href="http://www.gnome.org/projects/soc/"; title="Google Summer of Code 2008"><img src="http://planet.gnome.org/heads/logos/gsoc2008.png"; alt="GSoC 2008" /></a></p></TMPL_IF>
+</div>
+
+<div class="post">
+
+<div class="post-header">
+<TMPL_IF title><h3 class="post-title"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h3></TMPL_IF>
+</div> <!-- /post-header -->
+
+<div class="post-contents">
+<TMPL_IF channel_fixedwidth><pre></TMPL_IF>
+<TMPL_VAR content>
+<TMPL_IF channel_fixedwidth></pre></TMPL_IF>
+</div> <!-- /post-contents -->
+
+<div class="post-footer">
+<p><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR date></a></p>
+</div> <!-- /post-footer -->
+
+<b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
+<b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
+
+</div> <!-- /post -->
+
+</div> <!-- /entry -->
+
+</TMPL_LOOP>
+
+</div> <!-- /content -->
+
+
+<div id="feeds">
+	<h3><a href="feeds.html">Feeds</a></h3>
+	<div id="feedlist"></div>
+</div>
+
+<div id="footer">
+
+<div class="column">
+<div class="section">
+<h3>GNOME News</h3>
+<p><b>GNOME News provides insight into the what is happening at GNOME.</b></p>
+
+<p>Brought to you by the <a href="http://www.planetplanet.org/";>Planet</a> aggregator, cron, <a href="http://www.python.org/";>Python</a>, <a href="http://www.redhat.com/";>Red Hat</a> (who kindly host the GNOME servers). Design by <a href="http://bethesignal.org/";>Jeff Waugh</a>, inspired by earlier work from <a href="http://www.actsofvolition.com/";>Steven Garrity</a>, <a href="http://www.gnome.org/~seth/";>Seth Nickell</a> and <a href="http://www.isity.net/";>Diana Fong</a>.</p>
+
+<p>Planet GNOME is edited by Jeff Waugh. Please <a href="mailto:jdub gnome org?Subject=planet gnome org">mail him</a> if you have a question or would like your blog added to the feed.</p>
+
+<p>Updated on <TMPL_VAR date> UTC. Entries are normalised to UTC time.</p>
+</div>
+</div>
+
+<div class="column">
+<div class="section">
+<h3>GNOME World Wide</h3>
+<p><a href="http://live.gnome.org/GnomeWorldWide";><img src="http://people.gnome.org/~jdub/random/GnomeWorldWideSmall.jpg"; alt=""></a></p>
+<p>GNOME communities around the world by region and language:</p>
+<ul>
+  <li><a href="http://www.gnomebangalore.org/?q=blog";>Bangalore, India</a></li>
+  <li><a href="http://br.gnome.org/";>Brazil</a></li>
+  <li><a href="http://gnome.cult.bg/";>Bulgaria</a></li>
+  <li><a href="http://planeta.gnome.cl/";>Chile</a></li>
+  <li><a href="http://planet.gnomefr.org/";>Francophile</a></li>
+  <li><a href="http://planet.gnome-ev.de/";>Germany</a></li>
+  <li><a href="http://planet.gnome.gr/";>Greece</a></li>
+  <li><a href="http://planeta.es.gnome.org/";>Hispano</a></li>
+  <li><a href="http://it.gnome.org/planet/";>Italy</a></li>
+  <li><a href="http://gnome.or.kr/pgk/";>Korea</a></li>
+  <li><a href="http://planet.nl.gnome.org/";>Netherlands</a></li>
+  <li><a href="http://www.gnome.org.tr/";>Turkey</a></li>
+  <li><a href="http://www.uk.gnome.org/planet/";>United Kingdom</a></li>
+</ul>
+</div>
+</div>
+
+<div id="fineprint" class="section">
+<h3><img src="img/footer-logo.png" alt="GNOME" title="GNOME"></h3>
+<p>Copyright  2003-2008, <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
+<a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>.<br>
+Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.</p>
+<p id="ownership">Planet GNOME automatically reposts blog entries from the GNOME community. Entries on this page are owned by their authors. We do not edit, endorse or vouch for the contents of individual posts.</p>
+</div> <!-- /fineprint -->
+
+</div> <!-- /footer -->
+
+
+</div> <!-- /page -->
+
+<!-- Piwik --> 
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=5"; style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+
+</body>
+
+</html>
diff --git a/themes/news-old/rss20.xml.tmpl b/themes/news-old/rss20.xml.tmpl
new file mode 100644
index 0000000..7fd4908
--- /dev/null
+++ b/themes/news-old/rss20.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rss version="2.0">
+
+<channel>
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<language>en</language>
+	<description><TMPL_VAR name ESCAPE="HTML"> - <TMPL_VAR link ESCAPE="HTML"></description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name ESCAPE="HTML"><TMPL_IF title>: <TMPL_VAR title_plain ESCAPE="HTML"></TMPL_IF></title>
+	<guid isPermaLink="<TMPL_VAR guid_isPermaLink>"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<description><TMPL_IF channel_face>&lt;img src="<TMPL_VAR channel_face ESCAPE="HTML">" alt="" align="right"&gt; </TMPL_IF><TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+	<TMPL_IF author_email>
+	<TMPL_IF author_name>
+	<author><TMPL_VAR author_email> (<TMPL_VAR author_name>)</author>
+	<TMPL_ELSE>
+	<author><TMPL_VAR author_email></author>
+	</TMPL_IF>
+	</TMPL_IF>
+	<TMPL_IF enclosure_href>
+        <enclosure url="<TMPL_VAR enclosure_href ESCAPE="HTML">" length="<TMPL_VAR enclosure_length>" type="<TMPL_VAR enclosure_type>"/>
+	</TMPL_IF>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/themes/news-old/sidebar.html.tmpl b/themes/news-old/sidebar.html.tmpl
new file mode 100644
index 0000000..acfdf4c
--- /dev/null
+++ b/themes/news-old/sidebar.html.tmpl
@@ -0,0 +1,17 @@
+<ul>
+<TMPL_LOOP Items>
+### we can only show items that have titles in this feed
+<TMPL_IF title>
+<li>
+<a href="<TMPL_VAR link ESCAPE="HTML">">
+<TMPL_IF channel_face>
+<img src="<TMPL_VAR channel_face ESCAPE="HTML">" height="24" alt="">
+<TMPL_ELSE>
+<img src="http://planet.gnome.org/heads/nobody.png"; height="24" alt="">
+</TMPL_IF>
+<TMPL_VAR title></a>
+</li>
+</TMPL_IF>
+
+</TMPL_LOOP>
+</ul>
diff --git a/themes/news-old/simple.html.tmpl b/themes/news-old/simple.html.tmpl
new file mode 100644
index 0000000..29e2b01
--- /dev/null
+++ b/themes/news-old/simple.html.tmpl
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title><TMPL_VAR name></title>
+	<link rel="stylesheet" href="http://planet.gnome.org/generic.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/planet.css"; type="text/css">
+
+	<link rel="icon" type="image/png" href="http://planet.gnome.org/img/gnome-16.png";>
+	<link rel="SHORTCUT ICON" type="image/png" href="http://planet.gnome.org/img/gnome-16.png";>
+	<link rel="alternate" type="application/atom+xml" title="Planet GNOME Atom 1.0" href="http://planet.gnome.org/atom.xml";>
+	<link rel="alternate" type="application/rss+xml" title="Planet GNOME RSS 2.0" href="http://planet.gnome.org/rss20.xml";>
+</head>
+
+
+<body>
+
+
+<TMPL_LOOP Items>
+	<TMPL_IF new_date>
+		<h2 class="date"><TMPL_VAR new_date></h2>
+	</TMPL_IF>
+
+	<div class="entry<TMPL_IF channel_nick> <TMPL_VAR channel_nick></TMPL_IF>">
+	
+	<div class="person-info">
+		<a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title ESCAPE="HTML">">
+			<TMPL_IF channel_face>
+				<img class="face" src="<TMPL_VAR channel_face ESCAPE="HTML">" alt=""><br />
+			<TMPL_ELSE>
+				<img class="face" src="http://planet.gnome.org/heads/nobody.png"; alt=""><br />
+			</TMPL_IF>
+			<TMPL_VAR channel_name>
+			<TMPL_IF channel_real><br /><TMPL_VAR channel_real></TMPL_IF>
+			<TMPL_IF channel_nick><br />(<TMPL_VAR channel_nick>)</TMPL_IF>
+		</a>
+		<TMPL_IF channel_gsoc2008>
+		<p><a href="http://www.gnome.org/projects/soc/"; title="Google Summer of Code 2008"><img src="http://planet.gnome.org/heads/logos/gsoc2008.png"; alt="GSoC 2007" /></a></p>
+		</TMPL_IF>
+	</div>
+	
+		<div class="post">
+			<div class="post-header">
+				<TMPL_IF title>
+				<h3 class="post-title"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h3>
+				</TMPL_IF>
+			</div>
+			<div class="post-contents">
+			<TMPL_VAR content>
+			</div>
+			<div class="post-footer">
+				<p><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR date></a></p>
+			</div>
+			<b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
+			<b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
+		</div>
+
+	</div>
+</TMPL_LOOP>
+</div>
+
+
+<div id="copyright">
+Copyright &copy; 2003-2007, <a href="http://www.gnome.org/";>The GNOME Project</a><br />
+Planet GNOME automatically reposts blog entries from the GNOME community. Entries on this page are owned by their authors. We do not edit, endorse or vouch for the contents of individual posts.<br />
+<a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>. Hosted by <a href="http://redhat.com/";>Red Hat</a>.<br />
+</div>
+
+
+</body>
+
+</html>
diff --git a/themes/news/config.ini b/themes/news/config.ini
index a93011a..7d7489f 100644
--- a/themes/news/config.ini
+++ b/themes/news/config.ini
@@ -5,6 +5,7 @@
 [Planet]
 template_files:
   index.html.tmpl
+  index-3.0.html.tmpl
   simple.html.tmpl
   feeds.html.tmpl
   sidebar.html.tmpl
@@ -13,6 +14,7 @@ template_files:
   rss20.xml.tmpl
   opml.xml.xslt
   foafroll.xml.xslt
+  index-ruler.html.tmpl
 
 template_directories:
   /var/cache/gnomeweb/venus/themes/common
diff --git a/themes/news/index-2.0.html.tmpl b/themes/news/index-2.0.html.tmpl
new file mode 100644
index 0000000..7e14479
--- /dev/null
+++ b/themes/news/index-2.0.html.tmpl
@@ -0,0 +1,222 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+
+<head>
+	<title><TMPL_VAR name></title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="shortcut icon" type="image/png" href="http://planet.gnome.org/img/gnome-16.png";>
+	<link rel="alternate" type="application/atom+xml" title="<TMPL_VAR title ESCAPE="HTML"> Atom 1.0" href="<TMPL_VAR link ESCAPE="HTML">atom.xml">
+	<link rel="alternate" type="application/rss+xml" title="<TMPL_VAR title ESCAPE="HTML"> RSS 2.0" href="<TMPL_VAR link ESCAPE="HTML">rss20.xml">
+
+	<link rel="stylesheet" href="http://planet.gnome.org/nlayout.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/planet.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/generic.css"; type="text/css">
+	<link rel="stylesheet" href="http://blogs.gnome.org/wp-content/mu-plugins/bug-links/bug-links.css"; type="text/css">
+
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js";></script>
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.lazyload.min.js";></script>
+	<script type="text/javascript"><!-- $(function(){ $('.post img').lazyload(); }); --></script>
+</head>
+
+<body>
+
+
+<div id="gnome-sites">
+<ul><li class="home"><a href="http://www.gnome.org/"; title="Home">Home</a></li><li><a href="http://news.gnome.org"; title="News">News</a></li><li><a href="http://www.gnome.org/projects/"; title="Projects">Projects</a></li><li><a href="http://art.gnome.org"; title="Art">Art</a></li><li><a href="http://www.gnome.org/support/"; title="Support">Support</a></li><li><a href="http://developer.gnome.org"; title="Development">Development</a></li><li><a href="http://www.gnome.org/community/"; title="Community">Community</a></li></ul>
+</div> <!-- /gnome-sites -->
+
+
+<div id="page">
+
+
+<div id="header">
+
+<!-- Google CSE Search Box Begins -->
+<div id="search">
+<form id="searchbox_007525575524326405779:c0gv0y410u0" action="http://www.google.com/cse";>
+<input type="hidden" name="cx" value="007525575524326405779:c0gv0y410u0">
+<input name="q" type="text" size="15">
+<!--<input type="submit" name="sa" value="Search">-->
+<input type="hidden" name="cof" value="FORID:0">
+</form>
+<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_007525575524326405779%3Ac0gv0y410u0";></script>
+</div> <!-- /search -->
+<!-- Google CSE Search Box Ends -->
+
+<div id="masthead">
+<a href="/" title="Home" rel="home"><img src="http://planet.gnome.org/img/logo.png"; alt="Home" id="site-logo" width="64" height="64"></a>
+<div id="site-title">
+<p id="site-name"><a href="/" title="Home" rel="home"><TMPL_VAR title ESCAPE="HTML"></a></p>
+<p id="site-slogan">24 hours a day, 7 days a week, 365 days per year<span title="Yeah, yeah... 366 days per leap year :-)" style="cursor: pointer;">*</span>, this is... <TMPL_VAR title ESCAPE="HTML">!</p>
+</div> <!-- /site-title -->
+<a id="footer-link" href="#footer">About <TMPL_VAR title ESCAPE="HTML"></a>
+</div> <!-- /masthead -->
+
+</div> <!-- /header -->
+
+<script type="text/javascript" src="http://www.gnome.org/friends/ruler/ruler.js";></script>
+
+<div id="content">
+
+<TMPL_IF banner_message>
+<div class="banner"><TMPL_VAR banner_message></div>
+</TMPL_IF>
+
+<TMPL_LOOP Items>
+
+<TMPL_IF new_date>
+<h2 class="date"><TMPL_VAR new_date></h2>
+</TMPL_IF>
+
+<div class="entry<TMPL_IF channel_nick> <TMPL_VAR channel_nick></TMPL_IF>">
+
+<div class="person-info">
+<a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title ESCAPE="HTML">"><TMPL_IF channel_face><img class="face" src="<TMPL_VAR channel_face ESCAPE="HTML">" alt=""><br><TMPL_ELSE><img class="face" src="http://planet.gnome.org/heads/nobody.png"; alt=""><br></TMPL_IF><TMPL_VAR channel_name><TMPL_IF channel_real><br><TMPL_VAR channel_real></TMPL_IF><TMPL_IF channel_nick><br>(<TMPL_VAR channel_nick>)</TMPL_IF></a>
+<TMPL_IF channel_opw2010><p><a href="http://live.gnome.org/GnomeWomen/OutreachProgram2010"; title="GNOME Outreach Program for Women 2010"><img src="http://planet.gnome.org/heads/logos/opw2010.png"; alt="OPW 2010" /></a></p></TMPL_IF>
+<TMPL_IF channel_gsoc2010><p><a href="http://live.gnome.org/SummerOfCode2010"; title="Google Summer of Code 2010"><img src="http://planet.gnome.org/heads/logos/gsoc2010.png"; alt="GSoC 2010" /></a></p></TMPL_IF>
+<TMPL_IF channel_guadec><p><a href="http://www.guadec.org/"; title="The GNOME Conference"><img src="http://planet.gnome.org/heads/logos/guadec.png"; alt="The GNOME Conference" /></a></p></TMPL_IF>
+</div>
+
+<div class="post">
+
+<div class="post-header">
+<TMPL_IF title><h3 class="post-title"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h3></TMPL_IF>
+</div> <!-- /post-header -->
+
+<div class="post-contents <TMPL_IF channel_fixedwidth>post-fixedwidth</TMPL_IF>">
+<TMPL_VAR content>
+</div> <!-- /post-contents -->
+
+<div class="post-footer">
+<p><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR date></a></p>
+</div> <!-- /post-footer -->
+
+<b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
+<b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
+
+</div> <!-- /post -->
+
+</div> <!-- /entry -->
+
+</TMPL_LOOP>
+
+</div> <!-- /content -->
+
+
+<div id="feeds">
+	<h3><a href="feeds.html">Feeds</a></h3>
+	<div id="feedlist"></div>
+</div>
+
+<div id="footer">
+
+<div class="column">
+<div class="section">
+<h3><TMPL_VAR title ESCAPE="HTML"></h3>
+<p><b><TMPL_VAR title ESCAPE="HTML"> is a window into the world, work and lives of GNOME <a href="http://planet.gnome.org/heads/";>hackers and contributors</a>.</b></p>
+
+<p>Brought to you by the <a href="http://www.planetplanet.org/";>Planet</a> aggregator, cron, <a href="http://www.python.org/";>Python</a>, <a href="http://www.redhat.com/";>Red Hat</a> (who kindly host the GNOME servers). Design by <a href="http://bethesignal.org/";>Jeff Waugh</a>, inspired by earlier work from <a href="http://www.actsofvolition.com/";>Steven Garrity</a>, <a href="http://www.gnome.org/~seth/";>Seth Nickell</a> and <a href="http://www.isity.net/";>Diana Fong</a>.</p>
+
+<p><TMPL_VAR title ESCAPE="HTML"> is edited by Juanje Ojeda, Alberto Ruiz and Jeff Waugh. Please <a href="mailto:jojeda gnome org,aruiz gnome org,jdub gnome org?Subject=planet gnome org">mail them</a> if you have a question. If you would like your blog added to the feed, please <a href="https://bugzilla.gnome.org/enter_bug.cgi?product=website;component=planet.gnome.org";>file a bug</a>. Make sure to read the <a href="http://live.gnome.org/PlanetGnome";><TMPL_VAR title ESCAPE="HTML"> guidelines</a> first, as it should cover most questions and as it contains detailed instructions for a blog addition.</p>
+
+<p>Updated on <TMPL_VAR date> UTC. Entries are normalised to UTC time.</p>
+</div>
+</div>
+
+<div class="column">
+<div class="section">
+<h3>GNOME World Wide</h3>
+<p><a href="http://live.gnome.org/GnomeWorldWide";><img src="http://people.gnome.org/~jdub/random/GnomeWorldWideSmall.jpg"; alt=""></a></p>
+<p>GNOME communities around the world by region and language:</p>
+<ul>
+  <li><a href="http://www.gnomebangalore.org/?q=blog";>Bangalore, India</a></li>
+  <li><a href="http://planeta.br.gnome.org/";>Brazil</a></li>
+  <li><a href="http://gnome.cult.bg/";>Bulgaria</a></li>
+  <li><a href="http://planeta.gnome.cl/";>Chile</a></li>
+  <li><a href="http://planet.gnomefr.org/";>Francophile</a></li>
+  <li><a href="http://planet.gnome-ev.de/";>Germany</a></li>
+  <li><a href="http://planet.gnome.gr/";>Greece</a></li>
+  <li><a href="http://planeta.es.gnome.org/";>Hispano</a></li>
+  <li><a href="http://it.gnome.org/planet/";>Italy</a></li>
+  <li><a href="http://gnome.or.kr/pgk/";>Korea</a></li>
+  <li><a href="http://planet.nl.gnome.org/";>Netherlands</a></li>
+  <li><a href="http://www.gnome.org.tr/";>Turkey</a></li>
+  <li><a href="http://www.uk.gnome.org/planet/";>United Kingdom</a></li>
+</ul>
+</div>
+</div>
+
+<div id="fineprint" class="section">
+<h3><img src="img/footer-logo.png" alt="GNOME" title="GNOME"></h3>
+<p>Copyright  2003-2009, <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
+<a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>.<br>
+Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.</p>
+<p id="ownership">Planet GNOME automatically reposts blog entries from the GNOME community. Entries on this page are owned by their authors. We do not edit, endorse or vouch for the contents of individual posts.</p>
+</div> <!-- /fineprint -->
+
+</div> <!-- /footer -->
+
+
+</div> <!-- /page -->
+
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.cookie.min.js";></script>
+	<script type="text/javascript">
+	function toggleFeeds() {
+		$("#feedlist").slideToggle(function() {
+			$("#feeds h3").toggleClass("open");
+		});
+	}
+	$(document).ready(function() {
+		var hidden = $.cookie("hidden") ? $.cookie("hidden").split(",") : new Array();
+		// hide posts by disabled folks
+		if (hidden.length > 0) for (i in hidden) {
+			$("div." + hidden[i]).hide();
+		}
+		$("#feeds h3 a").click(function(e) {
+			e.preventDefault();
+			if ($("#feedlist ul").length == 0) {
+				$("#feedlist").load('feeds.html', '', function(r,t,x) {
+					$('<input type="checkbox" checked>')
+						.change(function() {
+							var nick = $(this).parent().attr("class");
+							var i = $.inArray(nick, hidden);
+							if ($(this).attr("checked")) {
+								if (hidden[i]) hidden.splice(i, 1);
+								$("div." + nick).show();
+							} else {
+								if (!hidden[i]) hidden[hidden.length] = nick;
+								$("div." + nick).hide();
+							}
+							$.cookie("hidden", hidden.join(","),
+								{expires: 365});
+						})
+						.prependTo("#feedlist ul li");
+					// remove checks from disabled folks
+					for (i in hidden) {
+						$("#feedlist ul li." + hidden[i] + " input")
+							.removeAttr("checked");
+					}
+					toggleFeeds();
+				});
+			} else {
+				toggleFeeds();
+			}
+		});
+	});
+	</script>
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 6);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=6"; style="border:0" alt=""/></p></noscript>
+<!-- End Piwik Tag -->
+</body>
+
+</html>
diff --git a/themes/news/index-regular.html.tmpl b/themes/news/index-regular.html.tmpl
new file mode 100644
index 0000000..db68657
--- /dev/null
+++ b/themes/news/index-regular.html.tmpl
@@ -0,0 +1,332 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+
+<head>
+	<title><TMPL_VAR name></title>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="shortcut icon" type="image/png" href="http://planet.gnome.org/img/gnome-16.png";>
+	<link rel="alternate" type="application/atom+xml" title="<TMPL_VAR title ESCAPE="HTML"> Atom 1.0" href="<TMPL_VAR link ESCAPE="HTML">atom.xml">
+	<link rel="alternate" type="application/rss+xml" title="<TMPL_VAR title ESCAPE="HTML"> RSS 2.0" href="<TMPL_VAR link ESCAPE="HTML">rss20.xml">
+	<link href='http://fonts.googleapis.com/css?family=Cantarell' rel='stylesheet' type='text/css'>
+	<link href='http://fonts.googleapis.com/css?family=Cantarell:400,700' rel='stylesheet' type='text/css'>
+	<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="http://planet.gnome.org/nlayout.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/planet.css"; type="text/css">
+	<link rel="stylesheet" href="http://planet.gnome.org/generic.css"; type="text/css">
+	<link rel="stylesheet" href="http://blogs.gnome.org/wp-content/mu-plugins/bug-links/bug-links.css"; type="text/css">
+
+	<style rel="stylesheet" type="text/css">
+	#global_domain_bar
+	{
+    background: none repeat scroll 0 0 #FFFFFF;
+    height: 10px;
+    border: 0 none;
+    font-size: 100%;
+    margin: 0;
+    padding: 0;
+    vertical-align: baseline;
+    color: #2E3436;
+    font-family: Cantarell,'Droid Sans',Ubuntu,'DejaVu Sans',Arial,sans-serif;
+    font-size: 14px;
+    line-height: 1.7em;
+	}
+
+	#global_domain_bar a
+	{
+		-moz-border-radius: 5px 5px 5px 5px;
+		-webkit-border-radius: 5px;
+		border-radius: 5px 5px 5px 5px;
+		background: url("http://planet.gnome.org/img/30/favicon.png";) no-repeat scroll 8px 7px #FFFFFF;
+		color: #555753;
+		float: right;
+		font-size: 12px;
+		margin-right: 30px;
+		padding: 4px 12px 2px 26px;
+		text-decoration: none;
+		line-height: 1.7em;
+	}
+	
+	#page
+	{
+		background: url("http://planet.gnome.org/img/30/html-bg.png";) repeat-x scroll center top #FFFFFF;
+		font-family: Cantarell,'Droid Sans',Ubuntu,'DejaVu Sans',Arial,sans-serif;
+	}
+	
+		
+	a
+	{ 
+		color: #0489B7;
+	}
+	
+	#global_domain_bar div {
+		max-width: 940px;
+		margin: 0 auto;
+	}
+	
+	div.post-contents
+	{
+		background: white;
+	}
+	
+	.post-title a
+	{
+		color: #0489B7;
+		font-weight: bold;
+	}
+	
+	#footer, #feeds
+	{
+    background: none repeat scroll 0 0 #D3D7CF;
+    color: #555753;
+	}
+	
+	#footer a
+	{
+    color: inherit;
+	}
+	
+	#footer-grass
+	{
+    background: url("http://planet.gnome.org/img/30/grass.png";) repeat-x scroll center top transparent;
+    height: 39px;
+    margin-top: -33px;
+	}
+	
+	#footer-art
+	{
+		margin-left: auto;
+		margin-right: auto;
+		clear: left;
+		height: 180px;
+		margin-top: 0;
+		width: 940px;
+		background-image: url("http://planet.gnome.org/img/30/default.png";);
+	}
+	
+	#planet-banner
+	{
+    margin-left: auto;
+    margin-right: auto;
+    clear: left;
+    margin-top: 0;
+    width: 65em;
+    padding: 0 1em;
+	}
+	
+	
+	#planet-subtitle
+	{
+		color: #555753;
+		font-size: 100%;
+		font-weight: bold;
+		margin: 0;
+		padding 0;
+		padding-top: 14px;
+	}
+	
+	#planet-logo
+	{
+		vertical-align: middle;
+		padding-bottom: 25px;
+		margin-left:    26px;
+		padding-right:  50px;
+	}
+	
+	.post
+	{
+		color: #555753;
+		line-height: 1.6;
+	}
+	</style>
+
+
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js";></script>
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.lazyload.min.js";></script>
+	<script type="text/javascript"><!-- $(function(){ $('.post img').lazyload(); }); --></script>
+</head>
+
+<body>
+
+<div id="page">
+
+
+	<div id="global_domain_bar">
+		<div>
+			<a href="http://www.gnome.org";><strong>GNOME</strong>.ORG</a>
+		</div>
+  </div>
+
+	<div id="planet-banner">
+		<p id="planet-subtitle">
+			<img id="planet-logo" src="http://planet.gnome.org/img/30/planet-logo.png";  alt="Planet GNOME" title="Planet GNOME"/>
+			24 hours a day, 7 days a week, 365 days per year...
+		</p>
+	</div>
+
+  <!-- Fog ruler -->
+	<!--script type="text/javascript" src="http://www.gnome.org/friends/ruler/ruler.js";></script-->
+
+	<div id="content">
+
+	<TMPL_IF banner_message>
+	<div class="banner"><TMPL_VAR banner_message></div>
+	</TMPL_IF>
+
+	<TMPL_LOOP Items>
+
+		<TMPL_IF new_date>
+			<h2 class="date"><TMPL_VAR new_date></h2>
+		</TMPL_IF>
+
+		<div class="entry<TMPL_IF channel_nick> <TMPL_VAR channel_nick></TMPL_IF>">
+			<div class="person-info">
+				<a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title ESCAPE="HTML">"><TMPL_IF channel_face><img class="face" src="<TMPL_VAR channel_face ESCAPE="HTML">" alt=""><br><TMPL_ELSE><img class="face" src="http://planet.gnome.org/heads/nobody.png"; alt=""><br></TMPL_IF><TMPL_VAR channel_name><TMPL_IF channel_real><br><TMPL_VAR channel_real></TMPL_IF><TMPL_IF channel_nick><br>(<TMPL_VAR channel_nick>)</TMPL_IF></a>
+				<TMPL_IF channel_opw2011><p><a href="http://live.gnome.org/GnomeWomen/OutreachProgram2011"; title="GNOME Outreach Program for Women 2011"><img src="http://planet.gnome.org/heads/logos/opw2011.png"; alt="OPW 2011" /></a></p></TMPL_IF>
+				<TMPL_IF channel_gsoc2011><p><a href="http://live.gnome.org/SummerOfCode2011"; title="Google Summer of Code 2011"><img src="http://planet.gnome.org/heads/logos/gsoc2011.png"; alt="GSoC 2011" /></a></p></TMPL_IF>
+				<TMPL_IF channel_guadec><p><a href="http://www.guadec.org/"; title="The GNOME Conference"><img src="http://planet.gnome.org/heads/logos/guadec.png"; alt="The GNOME Conference" /></a></p></TMPL_IF>
+			</div>
+
+			<div class="post">
+				<div class="post-header">
+					<TMPL_IF title><h3 class="post-title"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h3></TMPL_IF>
+				</div> <!-- /post-header -->
+
+				<div class="post-contents <TMPL_IF channel_fixedwidth>post-fixedwidth</TMPL_IF>">
+					<TMPL_VAR content>
+				</div> <!-- /post-contents -->
+
+				<div class="post-footer">
+					<p><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR date></a></p>
+				</div> <!-- /post-footer -->
+
+				<b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
+				<b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
+			</div> <!-- /post -->
+	</div> <!-- /entry -->
+
+	</TMPL_LOOP>
+
+</div> <!-- /content -->
+
+<div id="footer-art"> &nbsp; </div>
+<div id="footer-grass"> &nbsp; </div>
+
+<div id="feeds">
+	<h3><a href="feeds.html">Feeds</a></h3>
+	<div id="feedlist"></div>
+</div>
+
+<div id="footer">
+
+<div class="column">
+<div class="section">
+<h3><TMPL_VAR title ESCAPE="HTML"></h3>
+<p><b><TMPL_VAR title ESCAPE="HTML"> is a window into the world, work and lives of GNOME <a href="http://planet.gnome.org/heads/";>hackers and contributors</a>.</b></p>
+
+<p>Brought to you by the <a href="http://www.planetplanet.org/";>Planet</a> aggregator, cron, <a href="http://www.python.org/";>Python</a>, <a href="http://www.redhat.com/";>Red Hat</a> (who kindly host the GNOME servers). Design by <a href="http://vinicius.depizzol.com.br/blog/";>Vinicius Depizzol</a> and <a href="http://aruiz.typepad.com";>Alberto Ruiz</a>, inspired by earlier work from <a href="http://bethesignal.org/";>Jeff Waugh</a>, <a href="http://www.actsofvolition.com/";>Steven Garrity</a>, <a href="http://www.gnome.org/~seth/";>Seth Nickell</a> and <a href="http://www.isity.net/";>Diana Fong</a>.</p>
+
+<p><TMPL_VAR title ESCAPE="HTML"> is edited by Juanje Ojeda, Alberto Ruiz and Jeff Waugh. Please <a href="mailto:jojeda gnome org,aruiz gnome org,jdub gnome org?Subject=planet gnome org">mail them</a> if you have a question. If you would like your blog added to the feed, please <a href="https://bugzilla.gnome.org/enter_bug.cgi?product=website;component=planet.gnome.org";>file a bug</a>. Make sure to read the <a href="http://live.gnome.org/PlanetGnome";><TMPL_VAR title ESCAPE="HTML"> guidelines</a> first, as it should cover most questions and as it contains detailed instructions for a blog addition.</p>
+
+<p>Updated on <TMPL_VAR date> UTC. Entries are normalised to UTC time.</p>
+</div>
+</div>
+
+<div class="column">
+<div class="section">
+<h3>GNOME World Wide</h3>
+<p><a href="http://live.gnome.org/GnomeWorldWide";><img src="http://people.gnome.org/~jdub/random/GnomeWorldWideSmall.jpg"; alt=""></a></p>
+<p>GNOME communities around the world by region and language:</p>
+<ul>
+  <li><a href="http://planeta.br.gnome.org/";>Brazil</a></li>
+  <li><a href="http://planeta.gnome.cl/";>Chile</a></li>
+  <li><a href="http://planet.gnomefr.org/";>Francophile</a></li>
+  <li><a href="http://planet.gnome.gr/";>Greece</a></li>
+  <li><a href="http://planeta.es.gnome.org/";>Hispano</a></li>
+  <li><a href="http://planet.nl.gnome.org/";>Netherlands</a></li>
+  <li><a href="http://www.gnome.org.tr/";>Turkey</a></li>
+
+	<!-- Broken planets -->
+  <!--li><a href="http://www.gnomebangalore.org/?q=blog";>Bangalore, India</a></li-->
+  <!--li><a href="http://gnome.cult.bg/";>Bulgaria</a></li-->
+  <!--li><a href="http://planet.gnome-ev.de/";>Germany</a></li-->
+  <!--li><a href="http://it.gnome.org/planet/";>Italy</a></li-->
+  <!--li><a href="http://gnome.or.kr/pgk/";>Korea</a></li-->
+  <!--li><a href="http://www.uk.gnome.org/planet/";>United Kingdom</a></li-->
+</ul>
+</div>
+</div>
+
+<div id="fineprint" class="section">
+<h3><img src="http://planet.gnome.org/img/30/gnome-logo.png"; alt="GNOME" title="GNOME"></h3>
+<p>Copyright  2003-2011, <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
+<a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>.<br>
+Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.</p>
+<p id="ownership">Planet GNOME automatically reposts blog entries from the GNOME community. Entries on this page are owned by their authors. We do not edit, endorse or vouch for the contents of individual posts.</p>
+</div> <!-- /fineprint -->
+
+</div> <!-- /footer -->
+
+
+</div> <!-- /page -->
+
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.cookie.min.js";></script>
+	<script type="text/javascript">
+	function toggleFeeds() {
+		$("#feedlist").slideToggle(function() {
+			$("#feeds h3").toggleClass("open");
+		});
+	}
+	$(document).ready(function() {
+		var hidden = $.cookie("hidden") ? $.cookie("hidden").split(",") : new Array();
+		// hide posts by disabled folks
+		if (hidden.length > 0) for (i in hidden) {
+			$("div." + hidden[i]).hide();
+		}
+		$("#feeds h3 a").click(function(e) {
+			e.preventDefault();
+			if ($("#feedlist ul").length == 0) {
+				$("#feedlist").load('feeds.html', '', function(r,t,x) {
+					$('<input type="checkbox" checked>')
+						.change(function() {
+							var nick = $(this).parent().attr("class");
+							var i = $.inArray(nick, hidden);
+							if ($(this).attr("checked")) {
+								if (hidden[i]) hidden.splice(i, 1);
+								$("div." + nick).show();
+							} else {
+								if (!hidden[i]) hidden[hidden.length] = nick;
+								$("div." + nick).hide();
+							}
+							$.cookie("hidden", hidden.join(","),
+								{expires: 365});
+						})
+						.prependTo("#feedlist ul li");
+					// remove checks from disabled folks
+					for (i in hidden) {
+						$("#feedlist ul li." + hidden[i] + " input")
+							.removeAttr("checked");
+					}
+					toggleFeeds();
+				});
+			} else {
+				toggleFeeds();
+			}
+		});
+	});
+	</script>
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 6);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=6"; style="border:0" alt=""/></p></noscript>
+<!-- End Piwik Tag -->
+</body>
+
+</html>
diff --git a/themes/news/index.html.tmpl b/themes/news/index.html.tmpl
index 32283bd..9077bc8 100644
--- a/themes/news/index.html.tmpl
+++ b/themes/news/index.html.tmpl
@@ -6,145 +6,213 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<link rel="shortcut icon" type="image/png" href="http://planet.gnome.org/img/gnome-16.png";>
-	<link rel="alternate" type="application/atom+xml" title="Planet GNOME Atom 1.0" href="http://planet.gnome.org/atom.xml";>
-	<link rel="alternate" type="application/rss+xml" title="Planet GNOME RSS 2.0" href="http://planet.gnome.org/rss20.xml";>
-
+	<link rel="alternate" type="application/atom+xml" title="<TMPL_VAR title ESCAPE="HTML"> Atom 1.0" href="<TMPL_VAR link ESCAPE="HTML">atom.xml">
+	<link rel="alternate" type="application/rss+xml" title="<TMPL_VAR title ESCAPE="HTML"> RSS 2.0" href="<TMPL_VAR link ESCAPE="HTML">rss20.xml">
+	<link href='http://fonts.googleapis.com/css?family=Cantarell' rel='stylesheet' type='text/css'>
+	<link href='http://fonts.googleapis.com/css?family=Cantarell:400,700' rel='stylesheet' type='text/css'>
+	<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'>
 	<link rel="stylesheet" href="http://planet.gnome.org/nlayout.css"; type="text/css">
 	<link rel="stylesheet" href="http://planet.gnome.org/planet.css"; type="text/css">
 	<link rel="stylesheet" href="http://planet.gnome.org/generic.css"; type="text/css">
 	<link rel="stylesheet" href="http://blogs.gnome.org/wp-content/mu-plugins/bug-links/bug-links.css"; type="text/css">
 
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js";></script>
-	<script type="text/javascript" src="http://planet.gnome.org/jquery.cookie.min.js";></script>
-	<script type="text/javascript">
-	function toggleFeeds() {
-		$("#feedlist").slideToggle(function() {
-			$("#feeds h3").toggleClass("open");
-		});
+	<style rel="stylesheet" type="text/css">
+	#global_domain_bar
+	{
+    background: none repeat scroll 0 0 #FFFFFF;
+    height: 10px;
+    border: 0 none;
+    font-size: 100%;
+    margin: 0;
+    padding: 0;
+    vertical-align: baseline;
+    color: #2E3436;
+    font-family: Cantarell,'Droid Sans',Ubuntu,'DejaVu Sans',Arial,sans-serif;
+    font-size: 14px;
+    line-height: 1.7em;
 	}
-	$(document).ready(function() {
-		var hidden = $.cookie("hidden") ? $.cookie("hidden").split(",") : new Array();
-		// hide posts by disabled folks
-		if (hidden.length > 0) for (i in hidden) {
-			$("div." + hidden[i]).hide();
-		}
-		$("#feeds h3 a").click(function(e) {
-			e.preventDefault();
-			if ($("#feedlist ul").length == 0) {
-				$("#feedlist").load('feeds.html', '', function(r,t,x) {
-					$('<input type="checkbox" checked>')
-						.change(function() {
-							var nick = $(this).parent().attr("class");
-							var i = $.inArray(nick, hidden);
-							if ($(this).attr("checked")) {
-								if (hidden[i]) hidden.splice(i, 1);
-								$("div." + nick).show();
-							} else {
-								if (!hidden[i]) hidden[hidden.length] = nick;
-								$("div." + nick).hide();
-							}
-							$.cookie("hidden", hidden.join(","),
-								{expires: 365});
-						})
-						.prependTo("#feedlist ul li");
-					// remove checks from disabled folks
-					for (i in hidden) {
-						$("#feedlist ul li." + hidden[i] + " input")
-							.removeAttr("checked");
-					}
-					toggleFeeds();
-				});
-			} else {
-				toggleFeeds();
-			}
-		});
-	});
-	</script>
-</head>
-
-<body>
-
-
-<div id="gnome-sites">
-<ul><li class="home"><a href="http://www.gnome.org/"; title="Home">Home</a></li><li><a href="http://news.gnome.org"; title="News">News</a></li><li><a href="http://www.gnome.org/projects/"; title="Projects">Projects</a></li><li><a href="http://art.gnome.org"; title="Art">Art</a></li><li><a href="http://www.gnome.org/support/"; title="Support">Support</a></li><li><a href="http://developer.gnome.org"; title="Development">Development</a></li><li><a href="http://www.gnome.org/community/"; title="Community">Community</a></li></ul>
-</div> <!-- /gnome-sites -->
-
-
-<div id="page">
 
+	#global_domain_bar a
+	{
+		-moz-border-radius: 5px 5px 5px 5px;
+		-webkit-border-radius: 5px;
+		border-radius: 5px 5px 5px 5px;
+		background: url("http://planet.gnome.org/img/30/favicon.png";) no-repeat scroll 8px 7px #FFFFFF;
+		color: #555753;
+		float: right;
+		font-size: 12px;
+		margin-right: 30px;
+		padding: 4px 12px 2px 26px;
+		text-decoration: none;
+		line-height: 1.7em;
+	}
+	
+	#page
+	{
+		background: url("http://planet.gnome.org/img/30/html-bg.png";) repeat-x scroll center top #FFFFFF;
+		font-family: Cantarell,'Droid Sans',Ubuntu,'DejaVu Sans',Arial,sans-serif;
+	}
+	
+		
+	a
+	{ 
+		color: #0489B7;
+	}
+	
+	#global_domain_bar div {
+		max-width: 940px;
+		margin: 0 auto;
+	}
+	
+	div.post-contents
+	{
+		background: white;
+	}
+	
+	.post-title a
+	{
+		color: #0489B7;
+		font-weight: bold;
+	}
+	
+	#footer, #feeds
+	{
+    background: none repeat scroll 0 0 #D3D7CF;
+    color: #555753;
+	}
+	
+	#footer a
+	{
+    color: inherit;
+	}
+	
+	#footer-grass
+	{
+    background: url("http://planet.gnome.org/img/30/grass.png";) repeat-x scroll center top transparent;
+    height: 39px;
+    margin-top: -33px;
+	}
+	
+	#footer-art
+	{
+		margin-left: auto;
+		margin-right: auto;
+		clear: left;
+		height: 180px;
+		margin-top: 0;
+		width: 940px;
+		background-image: url("http://planet.gnome.org/img/30/default.png";);
+	}
+	
+	#planet-banner
+	{
+    margin-left: auto;
+    margin-right: auto;
+    clear: left;
+    margin-top: 0;
+    width: 65em;
+    padding: 0 1em;
+	}
+	
+	
+	#planet-subtitle
+	{
+		color: #555753;
+		font-size: 100%;
+		font-weight: bold;
+		margin: 0;
+		padding 0;
+		padding-top: 14px;
+	}
+	
+	#planet-logo
+	{
+		vertical-align: middle;
+		padding-bottom: 25px;
+		margin-left:    26px;
+		padding-right:  50px;
+	}
+	
+	.post
+	{
+		color: #555753;
+		line-height: 1.6;
+	}
+	</style>
 
-<div id="header">
 
-<!-- Google CSE Search Box Begins -->
-<div id="search">
-<form id="searchbox_007525575524326405779:c0gv0y410u0" action="http://www.google.com/cse";>
-<input type="hidden" name="cx" value="007525575524326405779:c0gv0y410u0">
-<input name="q" type="text" size="15">
-<!--<input type="submit" name="sa" value="Search">-->
-<input type="hidden" name="cof" value="FORID:0">
-</form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_007525575524326405779%3Ac0gv0y410u0";></script>
-</div> <!-- /search -->
-<!-- Google CSE Search Box Ends -->
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js";></script>
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.lazyload.min.js";></script>
+	<script type="text/javascript"><!-- $(function(){ $('.post img').lazyload(); }); --></script>
+</head>
 
-<div id="masthead">
-<a href="/" title="Home" rel="home"><img src="http://planet.gnome.org/img/logo.png"; alt="Home" id="site-logo" width="64" height="64"></a>
-<div id="site-title">
-<p id="site-name"><a href="/" title="Home" rel="home">GNOME News</a></p>
-<p id="site-slogan">GNOME: Read all about it!</p>
-</div> <!-- /site-title -->
-<a id="footer-link" href="#footer">About GNOME News</a>
-</div> <!-- /masthead -->
+<body>
 
-</div> <!-- /header -->
+<script type="text/javascript" src="http://www-old.gnome.org/friends/ruler/a11y-ruler.js";>  </script>
 
+<div id="page">
 
-<div id="content">
 
-<TMPL_IF banner_message>
-<div class="banner"><TMPL_VAR banner_message></div>
-</TMPL_IF>
+	<div id="global_domain_bar">
+		<div>
+			<a href="http://www.gnome.org";><strong>GNOME</strong>.ORG</a>
+		</div>
+  </div>
 
-<TMPL_LOOP Items>
+	<div id="planet-banner">
+		<p id="planet-subtitle">
+			<img id="planet-logo" src="http://planet.gnome.org/img/30/planet-logo.png";  alt="Planet GNOME" title="Planet GNOME"/>
+			24 hours a day, 7 days a week, 365 days per year...
+		</p>
+	</div>
 
-<TMPL_IF new_date>
-<h2 class="date"><TMPL_VAR new_date></h2>
-</TMPL_IF>
+  <!-- Fog ruler -->
+	<!--script type="text/javascript" src="http://www.gnome.org/friends/ruler/ruler.js";></script-->
 
-<div class="entry<TMPL_IF channel_nick> <TMPL_VAR channel_nick></TMPL_IF>">
+	<div id="content">
 
-<div class="person-info">
-<a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title ESCAPE="HTML">"><TMPL_IF channel_face><img class="face" src="<TMPL_VAR channel_face ESCAPE="HTML">" alt=""><br><TMPL_ELSE><img class="face" src="http://planet.gnome.org/heads/nobody.png"; alt=""><br></TMPL_IF><TMPL_VAR channel_name><TMPL_IF channel_real><br><TMPL_VAR channel_real></TMPL_IF><TMPL_IF channel_nick><br>(<TMPL_VAR channel_nick>)</TMPL_IF></a>
-<TMPL_IF channel_gsoc2008><p><a href="http://www.gnome.org/projects/soc/"; title="Google Summer of Code 2008"><img src="http://planet.gnome.org/heads/logos/gsoc2008.png"; alt="GSoC 2008" /></a></p></TMPL_IF>
-</div>
+	<TMPL_IF banner_message>
+	<div class="banner"><TMPL_VAR banner_message></div>
+	</TMPL_IF>
 
-<div class="post">
+	<TMPL_LOOP Items>
 
-<div class="post-header">
-<TMPL_IF title><h3 class="post-title"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h3></TMPL_IF>
-</div> <!-- /post-header -->
+		<TMPL_IF new_date>
+			<h2 class="date"><TMPL_VAR new_date></h2>
+		</TMPL_IF>
 
-<div class="post-contents">
-<TMPL_IF channel_fixedwidth><pre></TMPL_IF>
-<TMPL_VAR content>
-<TMPL_IF channel_fixedwidth></pre></TMPL_IF>
-</div> <!-- /post-contents -->
+		<div class="entry<TMPL_IF channel_nick> <TMPL_VAR channel_nick></TMPL_IF>">
+			<div class="person-info">
+				<a href="<TMPL_VAR channel_link ESCAPE="HTML">" title="<TMPL_VAR channel_title ESCAPE="HTML">"><TMPL_IF channel_face><img class="face" src="<TMPL_VAR channel_face ESCAPE="HTML">" alt=""><br><TMPL_ELSE><img class="face" src="http://planet.gnome.org/heads/nobody.png"; alt=""><br></TMPL_IF><TMPL_VAR channel_name><TMPL_IF channel_real><br><TMPL_VAR channel_real></TMPL_IF><TMPL_IF channel_nick><br>(<TMPL_VAR channel_nick>)</TMPL_IF></a>
+				<TMPL_IF channel_opw2011><p><a href="http://live.gnome.org/GnomeWomen/OutreachProgram2011"; title="GNOME Outreach Program for Women 2011"><img src="http://planet.gnome.org/heads/logos/opw2011.png"; alt="OPW 2011" /></a></p></TMPL_IF>
+				<TMPL_IF channel_gsoc2011><p><a href="http://live.gnome.org/SummerOfCode2011"; title="Google Summer of Code 2011"><img src="http://planet.gnome.org/heads/logos/gsoc2011.png"; alt="GSoC 2011" /></a></p></TMPL_IF>
+				<TMPL_IF channel_guadec><p><a href="http://www.guadec.org/"; title="The GNOME Conference"><img src="http://planet.gnome.org/heads/logos/guadec.png"; alt="The GNOME Conference" /></a></p></TMPL_IF>
+			</div>
 
-<div class="post-footer">
-<p><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR date></a></p>
-</div> <!-- /post-footer -->
+			<div class="post">
+				<div class="post-header">
+					<TMPL_IF title><h3 class="post-title"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR title></a></h3></TMPL_IF>
+				</div> <!-- /post-header -->
 
-<b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
-<b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
+				<div class="post-contents <TMPL_IF channel_fixedwidth>post-fixedwidth</TMPL_IF>">
+					<TMPL_VAR content>
+				</div> <!-- /post-contents -->
 
-</div> <!-- /post -->
+				<div class="post-footer">
+					<p><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_VAR date></a></p>
+				</div> <!-- /post-footer -->
 
-</div> <!-- /entry -->
+				<b class="vt lt"></b><b class="vt rt"></b><b class="hz to"></b><b class="hz bo"></b>
+				<b class="cr tl"></b><b class="cr tr"></b><b class="cr bl"></b><b class="cr br"></b>
+			</div> <!-- /post -->
+	</div> <!-- /entry -->
 
-</TMPL_LOOP>
+	</TMPL_LOOP>
 
 </div> <!-- /content -->
 
+<div id="footer-art"> &nbsp; </div>
+<div id="footer-grass"> &nbsp; </div>
 
 <div id="feeds">
 	<h3><a href="feeds.html">Feeds</a></h3>
@@ -155,12 +223,12 @@
 
 <div class="column">
 <div class="section">
-<h3>GNOME News</h3>
-<p><b>GNOME News provides insight into the what is happening at GNOME.</b></p>
+<h3><TMPL_VAR title ESCAPE="HTML"></h3>
+<p><b><TMPL_VAR title ESCAPE="HTML"> is a window into the world, work and lives of GNOME <a href="http://planet.gnome.org/heads/";>hackers and contributors</a>.</b></p>
 
-<p>Brought to you by the <a href="http://www.planetplanet.org/";>Planet</a> aggregator, cron, <a href="http://www.python.org/";>Python</a>, <a href="http://www.redhat.com/";>Red Hat</a> (who kindly host the GNOME servers). Design by <a href="http://bethesignal.org/";>Jeff Waugh</a>, inspired by earlier work from <a href="http://www.actsofvolition.com/";>Steven Garrity</a>, <a href="http://www.gnome.org/~seth/";>Seth Nickell</a> and <a href="http://www.isity.net/";>Diana Fong</a>.</p>
+<p>Brought to you by the <a href="http://www.planetplanet.org/";>Planet</a> aggregator, cron, <a href="http://www.python.org/";>Python</a>, <a href="http://www.redhat.com/";>Red Hat</a> (who kindly host the GNOME servers). Design by <a href="http://vinicius.depizzol.com.br/blog/";>Vinicius Depizzol</a> and <a href="http://aruiz.typepad.com";>Alberto Ruiz</a>, inspired by earlier work from <a href="http://bethesignal.org/";>Jeff Waugh</a>, <a href="http://www.actsofvolition.com/";>Steven Garrity</a>, <a href="http://www.gnome.org/~seth/";>Seth Nickell</a> and <a href="http://www.isity.net/";>Diana Fong</a>.</p>
 
-<p>Planet GNOME is edited by Jeff Waugh. Please <a href="mailto:jdub gnome org?Subject=planet gnome org">mail him</a> if you have a question or would like your blog added to the feed.</p>
+<p><TMPL_VAR title ESCAPE="HTML"> is edited by Juanje Ojeda, Alberto Ruiz and Jeff Waugh. Please <a href="mailto:jojeda gnome org,aruiz gnome org,jdub gnome org?Subject=planet gnome org">mail them</a> if you have a question. If you would like your blog added to the feed, please <a href="https://bugzilla.gnome.org/enter_bug.cgi?product=website;component=planet.gnome.org";>file a bug</a>. Make sure to read the <a href="http://live.gnome.org/PlanetGnome";><TMPL_VAR title ESCAPE="HTML"> guidelines</a> first, as it should cover most questions and as it contains detailed instructions for a blog addition.</p>
 
 <p>Updated on <TMPL_VAR date> UTC. Entries are normalised to UTC time.</p>
 </div>
@@ -172,26 +240,28 @@
 <p><a href="http://live.gnome.org/GnomeWorldWide";><img src="http://people.gnome.org/~jdub/random/GnomeWorldWideSmall.jpg"; alt=""></a></p>
 <p>GNOME communities around the world by region and language:</p>
 <ul>
-  <li><a href="http://www.gnomebangalore.org/?q=blog";>Bangalore, India</a></li>
-  <li><a href="http://br.gnome.org/";>Brazil</a></li>
-  <li><a href="http://gnome.cult.bg/";>Bulgaria</a></li>
+  <li><a href="http://planeta.br.gnome.org/";>Brazil</a></li>
   <li><a href="http://planeta.gnome.cl/";>Chile</a></li>
   <li><a href="http://planet.gnomefr.org/";>Francophile</a></li>
-  <li><a href="http://planet.gnome-ev.de/";>Germany</a></li>
   <li><a href="http://planet.gnome.gr/";>Greece</a></li>
   <li><a href="http://planeta.es.gnome.org/";>Hispano</a></li>
-  <li><a href="http://it.gnome.org/planet/";>Italy</a></li>
-  <li><a href="http://gnome.or.kr/pgk/";>Korea</a></li>
   <li><a href="http://planet.nl.gnome.org/";>Netherlands</a></li>
   <li><a href="http://www.gnome.org.tr/";>Turkey</a></li>
-  <li><a href="http://www.uk.gnome.org/planet/";>United Kingdom</a></li>
+
+	<!-- Broken planets -->
+  <!--li><a href="http://www.gnomebangalore.org/?q=blog";>Bangalore, India</a></li-->
+  <!--li><a href="http://gnome.cult.bg/";>Bulgaria</a></li-->
+  <!--li><a href="http://planet.gnome-ev.de/";>Germany</a></li-->
+  <!--li><a href="http://it.gnome.org/planet/";>Italy</a></li-->
+  <!--li><a href="http://gnome.or.kr/pgk/";>Korea</a></li-->
+  <!--li><a href="http://www.uk.gnome.org/planet/";>United Kingdom</a></li-->
 </ul>
 </div>
 </div>
 
 <div id="fineprint" class="section">
-<h3><img src="img/footer-logo.png" alt="GNOME" title="GNOME"></h3>
-<p>Copyright  2003-2008, <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
+<h3><img src="http://planet.gnome.org/img/30/gnome-logo.png"; alt="GNOME" title="GNOME"></h3>
+<p>Copyright  2003-2011, <a href="http://www.gnome.org/";>The GNOME Project</a>.<br>
 <a href="http://validator.w3.org/check/referer";>Optimised</a> for <a href="http://www.w3.org/";>standards</a>.<br>
 Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.</p>
 <p id="ownership">Planet GNOME automatically reposts blog entries from the GNOME community. Entries on this page are owned by their authors. We do not edit, endorse or vouch for the contents of individual posts.</p>
@@ -202,6 +272,51 @@ Hosted by <a href="http://www.redhat.com/";>Red Hat</a>.</p>
 
 </div> <!-- /page -->
 
+	<script type="text/javascript" src="http://planet.gnome.org/jquery.cookie.min.js";></script>
+	<script type="text/javascript">
+	function toggleFeeds() {
+		$("#feedlist").slideToggle(function() {
+			$("#feeds h3").toggleClass("open");
+		});
+	}
+	$(document).ready(function() {
+		var hidden = $.cookie("hidden") ? $.cookie("hidden").split(",") : new Array();
+		// hide posts by disabled folks
+		if (hidden.length > 0) for (i in hidden) {
+			$("div." + hidden[i]).hide();
+		}
+		$("#feeds h3 a").click(function(e) {
+			e.preventDefault();
+			if ($("#feedlist ul").length == 0) {
+				$("#feedlist").load('feeds.html', '', function(r,t,x) {
+					$('<input type="checkbox" checked>')
+						.change(function() {
+							var nick = $(this).parent().attr("class");
+							var i = $.inArray(nick, hidden);
+							if ($(this).attr("checked")) {
+								if (hidden[i]) hidden.splice(i, 1);
+								$("div." + nick).show();
+							} else {
+								if (!hidden[i]) hidden[hidden.length] = nick;
+								$("div." + nick).hide();
+							}
+							$.cookie("hidden", hidden.join(","),
+								{expires: 365});
+						})
+						.prependTo("#feedlist ul li");
+					// remove checks from disabled folks
+					for (i in hidden) {
+						$("#feedlist ul li." + hidden[i] + " input")
+							.removeAttr("checked");
+					}
+					toggleFeeds();
+				});
+			} else {
+				toggleFeeds();
+			}
+		});
+	});
+	</script>
 <!-- Piwik --> 
 <script type="text/javascript">
 var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
@@ -214,7 +329,6 @@ piwikTracker.enableLinkTracking();
 } catch( err ) {}
 </script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=5"; style="border:0" alt="" /></p></noscript>
 <!-- End Piwik Tracking Code -->
-
 </body>
 
 </html>
diff --git a/themes/news/rss20.xml.tmpl b/themes/news/rss20.xml.tmpl
index 7fd4908..22b9dae 100644
--- a/themes/news/rss20.xml.tmpl
+++ b/themes/news/rss20.xml.tmpl
@@ -1,11 +1,17 @@
 <?xml version="1.0"?>
-<rss version="2.0">
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom";>
 
 <channel>
 	<title><TMPL_VAR name></title>
 	<link><TMPL_VAR link ESCAPE="HTML"></link>
 	<language>en</language>
 	<description><TMPL_VAR name ESCAPE="HTML"> - <TMPL_VAR link ESCAPE="HTML"></description>
+	<TMPL_IF pubsubhubbub_hub>
+	<atom:link rel="hub" href="<TMPL_VAR pubsubhubbub_hub ESCAPE="HTML">"/>
+	</TMPL_IF>
+	<TMPL_IF fullurl>
+	<atom:link rel="self" href="<TMPL_VAR fullurl ESCAPE="HTML">" type="application/rss+xml"/>
+	</TMPL_IF>
 
 <TMPL_LOOP Items>
 <item>
diff --git a/themes/news/simple.html.tmpl b/themes/news/simple.html.tmpl
index 29e2b01..f8f81d3 100644
--- a/themes/news/simple.html.tmpl
+++ b/themes/news/simple.html.tmpl
@@ -36,8 +36,8 @@
 			<TMPL_IF channel_real><br /><TMPL_VAR channel_real></TMPL_IF>
 			<TMPL_IF channel_nick><br />(<TMPL_VAR channel_nick>)</TMPL_IF>
 		</a>
-		<TMPL_IF channel_gsoc2008>
-		<p><a href="http://www.gnome.org/projects/soc/"; title="Google Summer of Code 2008"><img src="http://planet.gnome.org/heads/logos/gsoc2008.png"; alt="GSoC 2007" /></a></p>
+		<TMPL_IF channel_gsoc2010>
+		<p><a href="http://live.gnome.org/SummerOfCode2010"; title="Google Summer of Code 2010"><img src="http://planet.gnome.org/heads/logos/gsoc2010.png"; alt="GSoC 2010" /></a></p>
 		</TMPL_IF>
 	</div>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]