Numerous small copy changes here and there, blog feed on front page, added a press article

Gemfile

@@ -46,6 +46,7 @@ gem 'rinku'
 gem 'image_optim'
 gem 'image_optim_pack'
 gem 'ipaddress'
+gem 'feedjira'
 
 platform :mri, :rbx do
   gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic

Gemfile.lock

@@ -71,6 +71,13 @@ GEM
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.2)
+      faraday (>= 0.7.4, < 0.10)
+    feedjira (2.1.0)
+      faraday (>= 0.9)
+      faraday_middleware (>= 0.9)
+      loofah (>= 2.0)
+      sax-machine (>= 1.0)
     ffi (1.9.10)
     ffi-compiler (0.1.3)
       ffi (>= 1.0.0)
@@ -116,6 +123,8 @@ GEM
       rack (~> 1.4)
       rest-client (~> 1.0)
     json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     m (1.4.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -201,6 +210,7 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.22)
+    sax-machine (1.3.2)
     scrypt (2.1.1)
       ffi-compiler (>= 0.0.2)
       rake
@@ -285,6 +295,7 @@ DEPENDENCIES
   erubis
   fabrication
   faker
+  feedjira
   filesize
   gandi
   geoip

app/index.rb

@@ -31,11 +31,29 @@ get '/?' do
   end
 
   if SimpleCache.expired?(:sites_count)
-    @sites_count = SimpleCache.store :sites_count, Site.count.roundup(100), 600 # 10 Minutes
+    @sites_count = SimpleCache.store :sites_count, Site.count.roundup(100), 10.minutes
   else
     @sites_count = SimpleCache.get :sites_count
   end
 
+  if SimpleCache.expired?(:blog_feed_html)
+    @blog_feed_html = ''
+
+    begin
+      xml = HTTP.timeout(read: 2, write: 2, connect: 2).get('https://blog.neocities.org/feed.xml').to_s
+      feed = Feedjira::Feed.parse xml
+      feed.entries[0..2].each do |entry|
+        @blog_feed_html += %{<a href="#{entry.url}">#{entry.title.split('.').first}</a> <span style="float: right">#{entry.published.strftime('%b %-d, %Y')}</span><br>}
+      end
+    rescue
+      @blog_feed_html = 'The latest news on Neocities can be found on our blog.'
+    end
+
+    @blog_feed_html = SimpleCache.store :blog_feed_html, @blog_feed_html, 8.hours
+  else
+    @blog_feed_html = SimpleCache.get :blog_feed_html
+  end
+
   erb :index, layout: :index_layout
 end
 

views/_footer.erb

@@ -17,7 +17,6 @@
           <% end %>
           <li><a href="http://status.neocitiesops.net/">Status</a></li>
           <li><a href="/terms" rel="nofollow">Terms</a></li>
-          <li><a href="/privacy" rel="nofollow">Privacy</a></li>
           <li><a href="/contact" rel="nofollow">Contact</a></li>
         </ul>
       </nav>

views/about.erb

@@ -10,19 +10,17 @@
     <h1>Neocities is bringing back the fun, creativity and independence that made the web great.</h1>
 
     <p>
-      We are tired of living in an online world where people are isolated from each other on boring web sites with generic templates defining what people are
+      We are tired of living in an online world where people are isolated from each other on boring, generic social networks that don't let us truly express ourselves. It's time we took back our personalities from these sterilized, lifeless,
-      supposed to know or communicate with each other. It's time we took back our personalities from these sterilized, lifeless,
+      monetized, data mined, monitored addiction machines and let our creativity flourish again.
-      monetized, data mined, monitored entities and let our creativity flourish again.
     </p>
 
     <p>
       That's where Neocities comes in. We provide a canvas for people to make any web site they want.
       Whether it be a web site about something they're good at, something they love, something they hate, or
       their own completely customized profile where they can introduce themselves in a way that actually matters to them.
-      We can do this without selling out to the marketing industry, and we're going to prove it.
     </p>
     <p>
-      It's a tough project. We've got big problems to solve (restrained from easier solutions by our principles), and big ambitions. We have a lot of work to do. <strong>But our goal is clear: to enable you to harness the creativity, beauty, and power of creating your own web site. To rebuild the web we lost to monotony, and make it fun again.</strong>
+      <strong>Our goal: to enable you to harness the creativity, beauty, and power of creating your own web site. To rebuild the web we lost to automation and monotony, and make it fun again.</strong>
     </p>
     <p>
       Neocities is just getting started, and we've got a lot of amazing things in store. I strongly believe that, with your help, we're really going to shake things up on the web. Thank you for believing in us (and yourselves).
@@ -40,14 +38,14 @@
     <ul>
       <li><strong>Helping the web.</strong> We are here to empower people to develop independent, creative sites.</li>
       <li><strong>Free.</strong> We will always have a free web site option.</li>
-      <li><strong>Open source.</strong> Neocities.org is <a href="https://github.com/neocities">completely open source</a>, and we share code back with the community.</li>
+      <li><strong>Open source.</strong> Neocities believes in <a href="https://github.com/neocities">open source</a>, and we share code back with the community.</li>
-      <li><strong>A no-ad zone.</strong> We'll never put ads or watermarks on sites, and we don't sell user data to marketers.</li>
+      <li><strong>Not an advertising company.</strong> We'll never put ads or watermarks on sites, and we don't sell your data to marketers.</li>
-      <li><strong>Anti lock-in.</strong> Redirecting to new sites, easy site downloading, and support for custom domains.</li>
+      <li><strong>Anti lock-in.</strong> Easy site downloading, and support for custom domains.</li>
       <li><strong>Sustainable.</strong> We want to grow, but that growth cannot risk the site (or compromise our principles).</li>
     </ul>
 
     <p style="margin-top:20px">
-      If you share our values, we would love your support. Spread the word! We also have a <a href="/supporter">supporter plan</a> to help pay for the site, and we accept <a href="/donate">donations</a> through multiple options (including Bitcoin... and Dogecoin).
+      If you share our values, we would love your support. Spread the word! We also have a <a href="/supporter">supporter plan</a> to help pay for the site, and we accept <a href="/donate">donations</a> through multiple options (including Bitcoin).
     </p>
   </article>
   <%== erb :'_team', layout: false %>

views/index.erb

@@ -59,21 +59,21 @@
   <div class="col intro">
     <h2 class="section-header">Create your own free website.<br>Unlimited creativity, zero ads.</h2>
     <p class="intro-text">
-     Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites</a> that are bringing back the lost individual creativity of the web. We offer free web hosting and tools that allow anyone to make a website. Join us!
+     Neocities is a social network of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> web sites</a> that are bringing back the lost individual creativity of the web. We offer free web hosting and tools that allow you to create your own web site. Join us!
     </p>
     <ul class="intro-List">
       <li class="intro-Tools">
         <span class="intro-Icon"></span>
-        <h3 class="delta">Learn how to make a website from scratch</h3>
+        <h3 class="delta">Powerful features to help you build</h3>
         <p class="base">
-          Never coded before? Our fun interactive tutorial will show you the ropes! Join Penelope the cat in crafting your own personal spot on the web. We make it easy with our built-in HTML editor and simple file uploading.
+          We’ve made it easy to build your web site and explore other sites. Neocities features an in-browser HTML editor, custom domain support, fast site performance, easy file uploading, RSS feeds, folder support, and so much more.
       </li>
 
       <li class="intro-Social">
         <span class="intro-Icon"></span>
         <h3 class="delta">Share your web creation with the world</h3>
         <p class="base">
-          Follow your favorite Neocities sites to keep up with all their latest updates. Discover new websites related to your interests using tags. Post comments and share your faves.
+          It's your web site, your vision. Make it as normal or crazy as you want. You're the artist, you're in control.
         </p>
       </li>
     </ul>
@@ -198,7 +198,7 @@
 <div class="row content right">
   <div class="col col-50"><div class="screenshot" style="background-image:url(/img/front-browse-screenshot.jpg);"></div></div>
   <div class="col col-50 text">
-    <h3><i class="fa fa-globe"></i> It's time to bring back web surfing.</h3>
+    <h3><i class="fa fa-globe"></i> Welcome back, web surfing</h3>
     <p>All Neocities sites are viewable in our <a href="/browse">website gallery</a>. And it's easy to browse sites with our optional surf bar.</p>
     <p>Using tags (our version of Web Rings) you can easily discover new sites related to your interests.</p>
   </div>
@@ -232,22 +232,21 @@
       </p>
     </div>
 
-
     <div class="col col-50">
       <h3><i class="fa fa-tachometer"></i>More space, speed, and security</h3>
-      <p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. Whether it’s your personal home page or a busy professional site, your site loads fast. And if you need more space, <a href="/supporter">we've got you covered</a>. We also provide Snowden-grade SSL cryptography on all sites, preventing snoops from seeing what you browse.</p>
+      <p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. Whether it’s your personal home page or a busy professional site, your site loads fast. We also force 100% strong SSL on all sites, preventing snoops from seeing what you browse.</p>
     </div>
   </div>
 
   <div class="row">
     <div class="col col-50">
       <h3><i class="fa fa-wrench"></i>Developer tools</h3>
-      <p>Our fast static hosting comes with a great in-browser HTML editor, easy file uploading, RSS feeds for every site, <a href="/api">powerful APIs</a> for building developer applications, and much more! Upgrade to a <a href="/supporter">supporter plan</a> to get support for custom domains and WebDAV publishing.</p>
+      <p>Our fast static hosting comes with a great in-browser HTML editor, easy file uploading, RSS feeds for every site, <a href="/api">APIs</a> for building developer applications, and much more!
     </div>
 
     <div class="col col-50">
-      <h3><i class="fa fa-university"></i>Open Company</h3>
+      <h3><i class="fa fa-university"></i>Open Source</h3>
-      <p>Neocities is a member of the <a href="http://www.opencompany.org/" target="_blank">Open Company Initative</a>, working to help improve trustability in tech companies. We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site for inspection, and strive for openness in our company's operations. We want to win your trust—not lock you in.</p>
+      <p>We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site for inspection. We want to win your trust—not lock you in.</p>
     </div>
 
 
@@ -277,15 +276,16 @@
   <h2>What are you waiting for? <a href="#new">Start building your website now!</a></h2>
 </section>
 
+<!--
 <section class="section thankyou">
   <div class="row">
     <p>Sponsored by</p>
-    <a href="//www.discourse.org"><img src="/img/discourse-logo.png" alt="Discourse" style="width:233px;"></a>
+    <h2>Your Company Name Here</h2>
-    <p>With special thanks to our <a href="/thankyou">Kickstarter backers</a></p>
+    <p>Interested in sponsoring Neocities? <a href="mailto:sponsorships@neocities.org">Let's get in touch.</a></p>
-    <p>Interested in sponsoring us? <a href="mailto:sponsorships@neocities.org">Let's get in touch!</a></p>
   </div>
 </section>
 </main>
+-->
 
 <footer class="footer-Base" role="contentinfo">
   <div class="footer-Intro">
@@ -315,11 +315,17 @@
         <div class="col col-33">
           <div class="f-Col f-Col-3 clearfix">
             <span class="footer-icon"></span>
-            <h2 class="delta">Latest News</h2>
+            <h2 class="delta">From Our Blog</h2>
+            <!--
             <p class="tiny">
+              <a href="#">Neocities now has SSL Sites</a><br>
               The latest news on Neocities can be found on our blog.
             </p>
-            <a href="//blog.neocities.org" title="Read about Neocities news and updates" class="action-Link">Read More</a>
+          -->
+            <p class="tiny">
+              <%== @blog_feed_html %>
+            </p>
+            <a href="//blog.neocities.org" title="Read about Neocities news and updates" class="action-Link">Read More Posts</a>
           </div>
         </div>
       </div>

views/press.erb

@@ -1,7 +1,7 @@
 <div class="header-Outro with-columns press">
   <div class="row content">
     <div class="col col-66">
-      <h1>Press</h1>
+      <h1>Neocities In The Press</h1>
     </div>
     <div class="col col-32">
     </div>
@@ -12,8 +12,16 @@
   <div class="content misc-page columns right-col press">
     <div class="col-left">
       <div class="col col-66" style="min-height: 43em;">
-        <h2>Latest News</h2>
         <div class="press-news">
+          <h3><a href="https://www.nytimes.com/2016/06/08/technology/the-webs-creator-looks-to-reinvent-it.html"><strong>New York Times</strong>: The Web's Creator Looks to Reinvent It</a></h3>
+          <blockquote>
+            Twenty-seven years ago, Tim Berners-Lee created the World Wide Web as a way for scientists to easily find information. It has since become the world’s most powerful medium for knowledge, communications and commerce — but that doesn’t mean Mr. Berners-Lee is happy with all of the consequences.
+          </blockquote>
+          <br>
+          <blockquote>
+            So on Tuesday, Mr. Berners-Lee gathered in San Francisco with other top computer scientists — including Brewster Kahle, head of the nonprofit Internet Archive and an internet activist — to discuss a new phase for the web.
+          </blockquote>
+
           <h3><a href="http://motherboard.vice.com/read/theres-an-entire-conference-dedicated-to-geocities-style-websites"><strong>Vice</strong>: There's An Entire Conference Dedicated to Geocities-Style Websites</a></h3>
           <blockquote>
             It's easy to assume that those attending the Web 1.0 Conference in Portland, Oregon are caught up on an obsolete era of the internet. The conference's organizers, however, think the lowly HTML website may very well be the future of the web.