From eed42b755830a6481a7f7e976c74601cae93630d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 17 Jan 2017 00:35:31 -0800 Subject: [PATCH] Numerous small copy changes here and there, blog feed on front page, added a press article --- Gemfile | 1 + Gemfile.lock | 11 +++++++++++ app/index.rb | 20 ++++++++++++++++++- public/img/discourse-logo.png | Bin 17160 -> 0 bytes views/_footer.erb | 1 - views/about.erb | 16 +++++++-------- views/index.erb | 36 ++++++++++++++++++++-------------- views/press.erb | 12 ++++++++++-- 8 files changed, 69 insertions(+), 28 deletions(-) delete mode 100644 public/img/discourse-logo.png diff --git a/Gemfile b/Gemfile index fdf97428..9b7fe692 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 0bf1e9b7..d3553f8f 100644 --- a/Gemfile.lock +++ b/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 diff --git a/app/index.rb b/app/index.rb index 32bc5857..1b26cccf 100644 --- a/app/index.rb +++ b/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 += %{#{entry.title.split('.').first} #{entry.published.strftime('%b %-d, %Y')}
} + 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 diff --git a/public/img/discourse-logo.png b/public/img/discourse-logo.png deleted file mode 100644 index 13a22eeff0efcfaf75ee1a30b735795297e720c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17160 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 diff --git a/views/_footer.erb b/views/_footer.erb index 180638f5..1a3009f7 100644 --- a/views/_footer.erb +++ b/views/_footer.erb @@ -17,7 +17,6 @@ <% end %>
  • Status
  • Terms
    • -
  • Privacy
  • Contact
    • diff --git a/views/about.erb b/views/about.erb index b7744d48..86e85d7c 100644 --- a/views/about.erb +++ b/views/about.erb @@ -10,19 +10,17 @@

    Neocities is bringing back the fun, creativity and independence that made the web great.

    - 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 - supposed to know or communicate with each other. It's time we took back our personalities from these sterilized, lifeless, - monetized, data mined, monitored entities and let our creativity flourish again. + 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, + monetized, data mined, monitored addiction machines and let our creativity flourish again.

    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.

    - 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. 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. + 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.

    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 @@

    • Helping the web. We are here to empower people to develop independent, creative sites.
    • Free. We will always have a free web site option.
      • -
    • Open source. Neocities.org is completely open source, and we share code back with the community.
      • -
    • A no-ad zone. We'll never put ads or watermarks on sites, and we don't sell user data to marketers.
      • -
    • Anti lock-in. Redirecting to new sites, easy site downloading, and support for custom domains.
      • +
    • Open source. Neocities believes in open source, and we share code back with the community.
      • +
    • Not an advertising company. We'll never put ads or watermarks on sites, and we don't sell your data to marketers.
      • +
    • Anti lock-in. Easy site downloading, and support for custom domains.
    • Sustainable. We want to grow, but that growth cannot risk the site (or compromise our principles).

    - If you share our values, we would love your support. Spread the word! We also have a supporter plan to help pay for the site, and we accept donations through multiple options (including Bitcoin... and Dogecoin). + If you share our values, we would love your support. Spread the word! We also have a supporter plan to help pay for the site, and we accept donations through multiple options (including Bitcoin).

    <%== erb :'_team', layout: false %> diff --git a/views/index.erb b/views/index.erb index 8e68058b..3515316d 100644 --- a/views/index.erb +++ b/views/index.erb @@ -59,21 +59,21 @@

    Create your own free website.
    Unlimited creativity, zero ads.

    - Neocities is a community of <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites 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 <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> web sites 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!

    • -

      Learn how to make a website from scratch

      +

      Powerful features to help you build

      - 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.

    • Share your web creation with the world

      - 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.

    @@ -198,7 +198,7 @@
    -

    It's time to bring back web surfing.

    +

    Welcome back, web surfing

    All Neocities sites are viewable in our website gallery. And it's easy to browse sites with our optional surf bar.

    Using tags (our version of Web Rings) you can easily discover new sites related to your interests.

    @@ -232,22 +232,21 @@

    -

    More space, speed, and security

    -

    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, we've got you covered. We also provide Snowden-grade SSL cryptography on all sites, preventing snoops from seeing what you browse.

    +

    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.

    Developer tools

    -

    Our fast static hosting comes with a great in-browser HTML editor, easy file uploading, RSS feeds for every site, powerful APIs for building developer applications, and much more! Upgrade to a supporter plan to get support for custom domains and WebDAV publishing.

    +

    Our fast static hosting comes with a great in-browser HTML editor, easy file uploading, RSS feeds for every site, APIs for building developer applications, and much more!

    -

    Open Company

    -

    Neocities is a member of the Open Company Initative, working to help improve trustability in tech companies. We publish 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.

    +

    Open Source

    +

    We publish the code that powers the site for inspection. We want to win your trust—not lock you in.

    @@ -277,15 +276,16 @@

    What are you waiting for? Start building your website now!

    +