@@ -107,9 +107,10 @@

                 -->

 	      <td>

               <div class="project">

-                <a href="https://atlas.torproject.org/"><img

+                <a href="https://metrics.torproject.org/rs.html"><img

                 src="$(IMGROOT)/icon-TorStatus.jpg" alt="Atlas Icon"></a>

-                <h3><a href="https://atlas.torproject.org/">Relay Search</a></h3>

+                <h3><a href="https://metrics.torproject.org/rs.html">Relay

+                Search</a></h3>

                 <p>Site providing an overview of the Tor network.</p>

                 </div>

               </td>

@@ -109,7 +109,7 @@

               <div class="project">

                 <a href="https://atlas.torproject.org/"><img

                 src="$(IMGROOT)/icon-TorStatus.jpg" alt="Atlas Icon"></a>

-                <h3><a href="https://atlas.torproject.org/">Atlas</a></h3>

+                <h3><a href="https://atlas.torproject.org/">Relay Search</a></h3>

                 <p>Site providing an overview of the Tor network.</p>

                 </div>

               </td>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

-#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true"

+#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"

 <div id="home">

@@ -91,9 +91,9 @@

               -->

               <td>

                 <div class="project">

-                <a href="https://www.atagar.com/arm/"><img

-                src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon"></a>

-                <h3><a href="https://www.atagar.com/arm/">Arm</a></h3>

+                <a href="https://nyx.torproject.org/"><img

+                src="$(IMGROOT)/icon-Nyx.jpg" alt="Nyx Icon"></a>

+                <h3><a href="https://nyx.torproject.org/">Nyx</a></h3>

                 <p>Terminal (command line) application for monitoring

                 and configuring Tor.</p>

                 </div>

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

-#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true"

 <div id="home">

@@ -2,7 +2,7 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

-#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

+#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"

 <div id="home">

@@ -4,6 +4,7 @@

 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

+

 <div id="home">

     <div id="content" class="clearfix">

     	<div id="maincol">

@@ -152,7 +152,7 @@

       <!-- END MAINCOL -->

       <div id="sidecol">

         <div class="joblink">

-          <a href="<page about/jobs-browserdeveloper>">We're hiring! &raquo;</a>

+          <a href="<page about/jobs>">We're hiring! &raquo;</a>

         </div>

       <!-- BLOG WIDGET -->

 #include <blog-recent.wmi>

@@ -148,6 +148,9 @@

       </div>

       <!-- END MAINCOL -->

       <div id="sidecol">

+        <div class="joblink">

+          <a href="<page about/jobs-browserdeveloper>">We're hiring! &raquo;</a>

+        </div>

       <!-- BLOG WIDGET -->

 #include <blog-recent.wmi>

       <!-- END BLOG WIDGET -->

@@ -65,7 +65,10 @@

                 browse the Internet.</p>

                 </div>

               </td>

-              <td><meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser.">

+              <td>

+                <div class="project">

+                <a href="https://guardianproject.info/apps/orbot/"><img

+                src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a>

                 <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>

                 <p>Tor for Google Android devices.</p>

                 </div>

@@ -65,10 +65,7 @@

                 browse the Internet.</p>

                 </div>

               </td>

-              <td>

-                <div class="project">

-                <a href="https://guardianproject.info/apps/orbot/"><img

-                src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a>

+              <td><meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser.">

                 <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3>

                 <p>Tor for Google Android devices.</p>

                 </div>

@@ -2,38 +2,6 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

-  <div id="banner-container" class="onions-bg">

-    <div id="banner-contents-container">

-      <div id="banner-logo-container">

-        <img id="banner-logo" alt="Tor Onion-Heart Logo"

-             src="images/onion-heart.png"/>

-      </div>

-      <div id="banner-text">

-        <div id="banner-tagline">

-          <span>

-            <noscript>Protecting Journalists, Activists & Whistleblowers Since 2006</noscript>

-          </span></div>

-        <div id="banner-heart">

-          <span>

-            Tor is at the heart of Internet freedom

-          </span>

-        </div>

-      </div>

-      <a id="banner-donate-button-link"

-         href="./donate/donate-homepage-en">

-        <div id="banner-donate-button-container">

-          <div id="banner-donate-button">

-            <div id="banner-donate-button-text">

-              <span>Donate Now! &#187;</span>

-            </div>

-          </div>

-        </div>

-      </a>

-    </div>

-  </div>

-  <div id="banner-spacer"></div>

-  <script src="js/donation_banner.js"></script>

-

 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

 <div id="home">

@@ -2,6 +2,38 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

+  <div id="banner-container" class="onions-bg">

+    <div id="banner-contents-container">

+      <div id="banner-logo-container">

+        <img id="banner-logo" alt="Tor Onion-Heart Logo"

+             src="images/onion-heart.png"/>

+      </div>

+      <div id="banner-text">

+        <div id="banner-tagline">

+          <span>

+            <noscript>Protecting Journalists, Activists & Whistleblowers Since 2006</noscript>

+          </span></div>

+        <div id="banner-heart">

+          <span>

+            Tor is at the heart of Internet freedom

+          </span>

+        </div>

+      </div>

+      <a id="banner-donate-button-link"

+         href="./donate/donate-homepage-en">

+        <div id="banner-donate-button-container">

+          <div id="banner-donate-button">

+            <div id="banner-donate-button-text">

+              <span>Donate Now! &#187;</span>

+            </div>

+          </div>

+        </div>

+      </a>

+    </div>

+  </div>

+  <div id="banner-spacer"></div>

+  <script src="js/donation_banner.js"></script>

+

 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

 <div id="home">

@@ -118,7 +118,7 @@

                 -->

               <td>

                 <div class="project">

-                <a href="<page projects/obfsproxy>"><img

+                <a href="<page docs/pluggable-transports>"><img

                 src="$(IMGROOT)/icon-Obfsproxy.jpg" alt="Pluggable Transports Icon"></a>

                 <h3><a href="<page docs/pluggable-transports>">Pluggable Transports</a></h3>

                 <p>Pluggable transports help you circumvent censorship.</p>

@@ -2,30 +2,6 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

-<!-- Donation banner for fundraising campaign. -->

-<div id="donation-banner">

-  <a href="donate/donate-hpbanner.html.en">

-    <noscript>

-      <!-- We don't have JavaScript, so show our default champion. -->

-      <img id="donation-banner-image-noscript" src="images/homepage-banner-ss.jpg" />

-    </noscript>

-    <!-- Placeholder for the champion banner image that will be added

-         by JavaScript. -->

-    <img id="donation-banner-image"" />

-   </a>

-  <a href="donate/donate-hpbanner.html.en">

-     <div id="donate-button">Please Donate!</div>

-  </a>

-</div>

-

-<script>

-  <!-- Show a different champion at random. -->

-  var alternates = ["cd", "lp", "rd", "rr", "ss"];

-  var alternate = alternates[Math.floor(Math.random() * alternates.length)];

-  var image = document.getElementById("donation-banner-image");

-  image.src = "images/homepage-banner-" + alternate + ".jpg";

-</script>

-

 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

 <div id="home">

@@ -18,25 +18,16 @@

   </a>

 </div>

-#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

-

-<!-- Script for populating the donation banner. -->

 <script>

   <!-- Show a different champion at random. -->

   var alternates = ["cd", "lp", "rd", "rr", "ss"];

-  var altTexts = {

-     "cd" : '"Privacy and anonymity matter to all of us." -- Cory Doctorow, Novelist, Technology Activist, Co-Editor of Boing Boing',

-     "lp" : '"Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support." -- Laura Poitras, Oscar-winning Documentary Filmmaker, Citizenfour',

-     "rd" : '"Please help the strongest privacy tool in the world become more sustainable!" -- Roger Dingledine, Founder, The Tor Project',

-     "rr" : '"The internet cannot heal itself in the face of tyrants. Tor is the salve that heals that wound; Tor is what allows us to route around Tyranny." -- Rabbi Rob Thomas, Director of The Tor Project',

-     "ss" : '"Tor is an essential part of the internet freedom infrastructure." -- Shari Steele, Executive Director of the Tor Project',

-  };

   var alternate = alternates[Math.floor(Math.random() * alternates.length)];

   var image = document.getElementById("donation-banner-image");

   image.src = "images/homepage-banner-" + alternate + ".jpg";

-  image.alt = altTexts[alternate];

 </script>

+#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

+

 <div id="home">

     <div id="content" class="clearfix">

     	<div id="maincol">

@@ -18,16 +18,25 @@

   </a>

 </div>

+#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

+

+<!-- Script for populating the donation banner. -->

 <script>

   <!-- Show a different champion at random. -->

   var alternates = ["cd", "lp", "rd", "rr", "ss"];

+  var altTexts = {

+     "cd" : '"Privacy and anonymity matter to all of us." -- Cory Doctorow, Novelist, Technology Activist, Co-Editor of Boing Boing',

+     "lp" : '"Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support." -- Laura Poitras, Oscar-winning Documentary Filmmaker, Citizenfour',

+     "rd" : '"Please help the strongest privacy tool in the world become more sustainable!" -- Roger Dingledine, Founder, The Tor Project',

+     "rr" : '"The internet cannot heal itself in the face of tyrants. Tor is the salve that heals that wound; Tor is what allows us to route around Tyranny." -- Rabbi Rob Thomas, Director of The Tor Project',

+     "ss" : '"Tor is an essential part of the internet freedom infrastructure." -- Shari Steele, Executive Director of the Tor Project',

+  };

   var alternate = alternates[Math.floor(Math.random() * alternates.length)];

   var image = document.getElementById("donation-banner-image");

   image.src = "images/homepage-banner-" + alternate + ".jpg";

+  image.alt = altTexts[alternate];

 </script>

-#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

-

 <div id="home">

     <div id="content" class="clearfix">

     	<div id="maincol">

@@ -2,6 +2,30 @@

 # Revision: $Revision$

 # Translation-Priority: 1-high

+<!-- Donation banner for fundraising campaign. -->

+<div id="donation-banner">

+  <a href="donate/donate-hpbanner.html.en">

+    <noscript>

+      <!-- We don't have JavaScript, so show our default champion. -->

+      <img id="donation-banner-image-noscript" src="images/homepage-banner-ss.jpg" />

+    </noscript>

+    <!-- Placeholder for the champion banner image that will be added

+         by JavaScript. -->

+    <img id="donation-banner-image"" />

+   </a>

+  <a href="donate/donate-hpbanner.html.en">

+     <div id="donate-button">Please Donate!</div>

+  </a>

+</div>

+

+<script>

+  <!-- Show a different champion at random. -->

+  var alternates = ["cd", "lp", "rd", "rr", "ss"];

+  var alternate = alternates[Math.floor(Math.random() * alternates.length)];

+  var image = document.getElementById("donation-banner-image");

+  image.src = "images/homepage-banner-" + alternate + ".jpg";

+</script>

+

 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"

 <div id="home">

@@ -151,15 +151,6 @@

       </div>

       <!-- END MAINCOL -->

       <div id="sidecol">

-      <div id="helpus">

-          <h2>A Call for Help</h2>

-      <div class="fauxhead"></div>

-          <div class="user">

-            <h3>

-              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Tor needs a new Executive Directory</a>

-            </h3>

-          </div>

-      </div>

       <!-- BLOG WIDGET -->

 #include <blog-recent.wmi>

       <!-- END BLOG WIDGET -->

@@ -151,7 +151,7 @@

       </div>

       <!-- END MAINCOL -->

       <div id="sidecol">

-      <div id="home-helpus">

+      <div id="helpus">

           <h2>A Call for Help</h2>

       <div class="fauxhead"></div>

           <div class="user">

@@ -152,11 +152,11 @@

       <!-- END MAINCOL -->

       <div id="sidecol">

       <div id="home-helpus">

-          <h2>A New Leader for Tor</h2>

+          <h2>A Call for Help</h2>

       <div class="fauxhead"></div>

           <div class="user">

             <h3>

-              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Help Tor Find a New Executive Director</a>

+              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Tor needs a new Executive Directory</a>

             </h3>

           </div>

       </div>

@@ -155,9 +155,9 @@

           <h2>A New Leader for Tor</h2>

       <div class="fauxhead"></div>

           <div class="user">

-            <h4>

+            <h3>

               <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Help Tor Find a New Executive Director</a>

-            </h4>

+            </h3>

           </div>

       </div>

       <!-- BLOG WIDGET -->

@@ -155,9 +155,9 @@

           <h2>A New Leader for Tor</h2>

       <div class="fauxhead"></div>

           <div class="user">

-            <h3>

+            <h4>

               <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Help Tor Find a New Executive Director</a>

-            </h3>

+            </h4>

           </div>

       </div>

       <!-- BLOG WIDGET -->

@@ -152,11 +152,11 @@

       <!-- END MAINCOL -->

       <div id="sidecol">

       <div id="home-helpus">

-          <h2>A Call for Help</h2>

+          <h2>A New Leader for Tor</h2>

       <div class="fauxhead"></div>

           <div class="user">

             <h3>

-              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Tor needs a new Executive Directory</a>

+              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Help Tor Find a New Executive Director</a>

             </h3>

           </div>

       </div>

@@ -151,7 +151,7 @@

       </div>

       <!-- END MAINCOL -->

       <div id="sidecol">

-      <div id="helpus">

+      <div id="home-helpus">

           <h2>A Call for Help</h2>

       <div class="fauxhead"></div>

           <div class="user">

@@ -151,6 +151,15 @@

       </div>

       <!-- END MAINCOL -->

       <div id="sidecol">

+      <div id="helpus">

+          <h2>A Call for Help</h2>

+      <div class="fauxhead"></div>

+          <div class="user">

+            <h3>

+              <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new-executive-director">Tor needs a new Executive Directory</a>

+            </h3>

+          </div>

+      </div>

       <!-- BLOG WIDGET -->

 #include <blog-recent.wmi>

       <!-- END BLOG WIDGET -->

@@ -57,10 +57,12 @@

               -->

               <td>

                 <div class="project">

-                <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a>

-                <h3><a href="https://tails.boum.org/">Tails</a></h3>

-                <p>Live CD/USB operating system preconfigured to use

-                Tor safely.</p>

+                <a href="<page projects/torbrowser>"><img

+                src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a>

+                <h3><a href="<page projects/torbrowser>">Tor

+                Browser</a></h3>

+                <p>Tor Browser contains everything you need to safely

+                browse the Internet.</p>

                 </div>

               </td>

               <td>

@@ -75,19 +77,17 @@

             <tr>

               <td>

                 <div class="project">

-                <a href="<page projects/torbrowser>"><img

-                src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a>

-                <h3><a href="<page projects/torbrowser>">Tor

-                Browser</a></h3>

-                <p>Tor Browser contains everything you need to safely

-                browse the Internet.</p>

+                <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a>

+                <h3><a href="https://tails.boum.org/">Tails</a></h3>

+                <p>Live CD/USB operating system preconfigured to use

+                Tor safely.</p>

                 </div>

               </td>

-                <!-- Icon from the Crystal set

-                author: Everaldo Coelho

-                source: http://www.everaldo.com/crystal/

-                license: LGPL v2

-                -->

+              <!-- Icon from the Crystal set

+              author: Everaldo Coelho

+              source: http://www.everaldo.com/crystal/

+              license: LGPL v2

+              -->

               <td>

                 <div class="project">

                 <a href="https://www.atagar.com/arm/"><img

@@ -137,11 +137,10 @@

               </td>

               <td>

                <div class="project">

-              <a href="https://cloud.torproject.org"><img

-              src="$(IMGROOT)/icon-Cloud.jpg" alt="Cloud Icon"></a>

-               <h3><a href="https://cloud.torproject.org">Tor cloud</a></h3>

-               <p>A user-friendly way of deploying bridges to help users

-               access the uncensored Internet.</p>

+              <a href="https://ooni.torproject.org/"><img

+              src="$(IMGROOT)/icon-OONI.png" alt="OONI"></a>

+               <h3><a href="https://ooni.torproject.org/">OONI</a></h3>

+               <p>Global observatory monitoring for network censorship.</p>

                </div>

                </td>

             </tr>

@@ -57,9 +57,7 @@

               -->

               <td>

                 <div class="project">

-                <a href="https://tails.boum.org/"><img width="75"

-                height="75"

-                src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a>

+                <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a>

                 <h3><a href="https://tails.boum.org/">Tails</a></h3>

                 <p>Live CD/USB operating system preconfigured to use

                 Tor safely.</p>

@@ -57,7 +57,8 @@

               -->

               <td>

                 <div class="project">

-                <a href="https://tails.boum.org/"><img

+                <a href="https://tails.boum.org/"><img width="75"

+                height="75"

                 src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a>

                 <h3><a href="https://tails.boum.org/">Tails</a></h3>

                 <p>Live CD/USB operating system preconfigured to use

@@ -58,7 +58,7 @@

               <td>

                 <div class="project">

                 <a href="https://tails.boum.org/"><img

-                src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon"></a>

+                src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a>

                 <h3><a href="https://tails.boum.org/">Tails</a></h3>

                 <p>Live CD/USB operating system preconfigured to use

                 Tor safely.</p>

@@ -154,123 +154,7 @@

       <!-- END MAINCOL -->

       <div id="sidecol">

       <!-- BLOG WIDGET -->

-<:

-  use strict;

-  use warnings;

-  use open ':std', ':encoding(UTF-8)';

-  use LWP::Simple;

-

-  # RSS feed url

-  my $url = 'https://blog.torproject.org/blog/feed';

-  # Number of posts to show

-  my $showPosts = "5";

-  # Maximum characters in post title to allow before truncating

-  my $titleMaxLength = "35";

-  # Maximum characters in author name to allow before truncating

-  my $authorMaxLength = "15";

-  

-  # Retreive url

-  my $data = get( $url );

-  

-  if ($data) # Url returned data

-  {

-    my $check = $data;

-    $check =~ m{<rss(.*?)>}i;

-    my $checkVal = $1;

-

-    if ($checkVal) # Is an rss feed

-    {

-      my $titleStr = $data;

-      my $linkStr = $data;

-      my $dateStr = $data;

-      my $authorStr = $data;

-    

-      print "<div class='blogFeed'>

-             <div class='blogFirstRow'>

-             <h2>Recent Blog Posts</h2>

-             </div>";

-

-      # Generate posts

-      for my $i (0..$showPosts)

-      {  

-      	

-	# Parse title

-	$titleStr =~ m{<title>(.*?)</title>}g;

-	my $titleVal = $1;

-	my $titleLength = length($titleVal);

-	my $title = $titleVal;

-

-	# Check title length and trim if necessary

-      	my $titleTrim = $title;

-        if ($titleLength > $titleMaxLength)

-      	{

-    	    my $trimLength = $titleMaxLength - 3;

-    	    my $titleTxt = substr($title, 0, $trimLength);

-    	    $titleTrim = "$titleTxt...";

-      	}

-    

-	# Parse link

-	$linkStr =~ m{<link>(.*?)</link>}g;

-	my $link = $1;

-

-	if ($i != 0)

-        {

-	  # Parse date

-	  $dateStr =~ m{<pubDate>(.*?)</pubDate>}g;

-	  my $date = $1;

-

-	  # Trim date

-	  my $dateTrim = substr($date, 0, -15);

-

-	  # Parse author

-	  $authorStr =~ m{<dc:creator>(.*?)\s*</dc:creator>}g;

-	  my $author = $1;

-

-	  # Check author length and trim if necessary

-	  my $authorLength = length($author);

-	  my $authorTrim = $author;

-	  if ($authorLength > $authorMaxLength)

-	  {

-	      my $authorTrimLength = $authorMaxLength - 3;

-	      my $authorTxt = substr($author, 0, $authorTrimLength);

-	      $authorTrim = "$authorTxt...";

-	  }

-

-	  # Begin html output

-	  print "<a href=\'$link\' title=\'$title\'>";

-	  

-	  # Required for alternating row colors - switch blogRow# to change order

-	  if (0 == $i % 2) {

-	      print "<div class='blogRow blogRow1'>";

-	  } else {

-	      print "<div class='blogRow blogRow0'>";

-	  }

-	  

-	  print "<p class='blogTitle'>$titleTrim</p>

-		<p class='blogDate'>$dateTrim</p>

-		<p class='blogAuthor'>Posted by: <em>$authorTrim</em></p>

-		</div>

-		</a>";    

-	}

-      }

-      

-    } else {	# Not an rss feed

-      print "<div class='blogRow blogRow1'>";

-      print "<br /><p class='blogDate' style=\"text-align:center;color:\#999;line-height:16px;\"><em>Recent posts are temporarily unavailable</em></p></div>";    

-    }

-  

-  } else {	# Url did not return any data

-    print "<div class='blogRow blogRow1'>";

-    print "<br /><p class='blogDate' style=\"text-align:center;color:\#999;line-height:16px;\"><em>Recent posts are temporarily unavailable</em></p></div>";    

-  }

-  

-  print "<a href='https://blog.torproject.org' title='Tor Blog Home'>

-  <div class='blogRow blogLastRow'>

-	<p>View all blog posts &raquo;</p>

-	</div>

-	</a>

-	</div>";

-:>

+#include <blog-recent.wmi>

       <!-- END BLOG WIDGET -->

       	<div id="home-users">

           <h2>Who Uses Tor?</h2>

@@ -153,35 +153,125 @@

       </div>

       <!-- END MAINCOL -->

       <div id="sidecol">

-        <div id="home-announcements" class="clearfix">

-       	<h2>Announcements</h2>

-          <table>

-            <tr>

-              <td>

-                <div class="calendar"><span class="month">Sep</span><br><span class="day">11</span></div>

-                <p>Tor 0.2.5.7-rc is <a href="https://blog.torproject.org/blog/tor-0257-rc-out">out</a></p>

-              </td>

-            </tr>

-            <tr>

-              <td>

-                <div class="calendar"><span class="month">Sep</span><br><span class="day">7</span></div>

-                <p><a href="https://blog.torproject.org/blog/ahmia-search-after-gsoc-development">Ahmia search</a> after GSoC development</p>

-              </td>

-            </tr>

-            <tr>

-              <td>

-                <div class="calendar"><span class="month">Sep</span><br><span class="day">3</span></div>

-                <p>Tor Browser 3.6.5 and 4.0-alpha-2 are <a href="https://blog.torproject.org/blog/tor-browser-365-and-40-alpha-2-are-released">released</a></p>

-              </td>

-            </tr>

-            <tr>

-              <td>

-                <div class="calendar"><span class="month">Sep</span><br><span class="day">2</span></div>

-                <p>Tails 1.1.1 is <a href="https://blog.torproject.org/blog/tails-111-out">out</a></p>

-              </td>

-            </tr>

-          </table>

-        </div>

+      <!-- BLOG WIDGET -->

+<:

+  use strict;

+  use warnings;

+  use open ':std', ':encoding(UTF-8)';

+  use LWP::Simple;

+

+  # RSS feed url

+  my $url = 'https://blog.torproject.org/blog/feed';

+  # Number of posts to show

+  my $showPosts = "5";

+  # Maximum characters in post title to allow before truncating

+  my $titleMaxLength = "35";

+  # Maximum characters in author name to allow before truncating

+  my $authorMaxLength = "15";

+  

+  # Retreive url

+  my $data = get( $url );

+  

+  if ($data) # Url returned data

+  {

+    my $check = $data;

+    $check =~ m{<rss(.*?)>}i;

+    my $checkVal = $1;

+

+    if ($checkVal) # Is an rss feed

+    {

+      my $titleStr = $data;

+      my $linkStr = $data;

+      my $dateStr = $data;

+      my $authorStr = $data;

+    

+      print "<div class='blogFeed'>

+             <div class='blogFirstRow'>

+             <h2>Recent Blog Posts</h2>

+             </div>";

+

+      # Generate posts

+      for my $i (0..$showPosts)

+      {  

+      	

+	# Parse title

+	$titleStr =~ m{<title>(.*?)</title>}g;

+	my $titleVal = $1;

+	my $titleLength = length($titleVal);

+	my $title = $titleVal;

+

+	# Check title length and trim if necessary

+      	my $titleTrim = $title;

+        if ($titleLength > $titleMaxLength)

+      	{

+    	    my $trimLength = $titleMaxLength - 3;

+    	    my $titleTxt = substr($title, 0, $trimLength);

+    	    $titleTrim = "$titleTxt...";

+      	}

+    

+	# Parse link

+	$linkStr =~ m{<link>(.*?)</link>}g;

+	my $link = $1;

+

+	if ($i != 0)

+        {

+	  # Parse date

+	  $dateStr =~ m{<pubDate>(.*?)</pubDate>}g;

+	  my $date = $1;

+

+	  # Trim date

+	  my $dateTrim = substr($date, 0, -15);

+

+	  # Parse author

+	  $authorStr =~ m{<dc:creator>(.*?)\s*</dc:creator>}g;

+	  my $author = $1;

+

+	  # Check author length and trim if necessary

+	  my $authorLength = length($author);

+	  my $authorTrim = $author;

+	  if ($authorLength > $authorMaxLength)

+	  {

+	      my $authorTrimLength = $authorMaxLength - 3;

+	      my $authorTxt = substr($author, 0, $authorTrimLength);

+	      $authorTrim = "$authorTxt...";

+	  }

+

+	  # Begin html output

+	  print "<a href=\'$link\' title=\'$title\'>";

+	  

+	  # Required for alternating row colors - switch blogRow# to change order

+	  if (0 == $i % 2) {

+	      print "<div class='blogRow blogRow1'>";

+	  } else {

+	      print "<div class='blogRow blogRow0'>";

+	  }

+	  

+	  print "<p class='blogTitle'>$titleTrim</p>

+		<p class='blogDate'>$dateTrim</p>

+		<p class='blogAuthor'>Posted by: <em>$authorTrim</em></p>

+		</div>

+		</a>";    

+	}

+      }

+      

+    } else {	# Not an rss feed

+      print "<div class='blogRow blogRow1'>";

+      print "<br /><p class='blogDate' style=\"text-align:center;color:\#999;line-height:16px;\"><em>Recent posts are temporarily unavailable</em></p></div>";    

+    }

+  

+  } else {	# Url did not return any data

+    print "<div class='blogRow blogRow1'>";

+    print "<br /><p class='blogDate' style=\"text-align:center;color:\#999;line-height:16px;\"><em>Recent posts are temporarily unavailable</em></p></div>";    

+  }

+  

+  print "<a href='https://blog.torproject.org' title='Tor Blog Home'>

+  <div class='blogRow blogLastRow'>

+	<p>View all blog posts &raquo;</p>

+	</div>

+	</a>

+	</div>";

+:>

+      <!-- END BLOG WIDGET -->

       	<div id="home-users">

           <h2>Who Uses Tor?</h2>

 	  <div class="fauxhead"></div>

@@ -158,32 +158,26 @@

           <table>

             <tr>

               <td>

-                <div class="calendar"><span class="month">Aug</span><br><span class="day">30</span></div>

-                <p>A call to arms: <a

-                href="https://blog.torproject.org/blog/call-arms-helping-internet-services-accept-anonymous-users">Helping

-                Internet services accept anonymous users</a>.</p>

+                <div class="calendar"><span class="month">Sep</span><br><span class="day">11</span></div>

+                <p>Tor 0.2.5.7-rc is <a href="https://blog.torproject.org/blog/tor-0257-rc-out">out</a></p>

               </td>