From 7a1f4f44ad9e355997cbf0ec9bbe82cd36b2a7f1 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <software@dsx.cc>
Date: Sun, 14 Dec 2014 01:28:39 +0100
Subject: [PATCH] more planet templating

---
 app/assets/stylesheets/planet.css.scss | 15 +++++++++++
 app/controllers/planet_controller.rb   |  1 +
 app/views/layouts/application.html.erb |  1 +
 app/views/planet/index.html.erb        | 37 ++++++++++++++++++++------
 config/locales/en.yml                  | 12 +++++++--
 5 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/planet.css.scss b/app/assets/stylesheets/planet.css.scss
index 6346359..d63e5bd 100644
--- a/app/assets/stylesheets/planet.css.scss
+++ b/app/assets/stylesheets/planet.css.scss
@@ -3,3 +3,18 @@
     max-width: 100%;
   }
 }
+
+.planet-page {
+  .col-md-3 {
+    padding-top: 30px;
+
+    h4 {
+      font-weight: normal;
+      margin-top: 35px;
+    }
+
+    ul {
+      padding-left: 20px;
+    }
+  }
+}
diff --git a/app/controllers/planet_controller.rb b/app/controllers/planet_controller.rb
index 03abc1e..1d67b90 100644
--- a/app/controllers/planet_controller.rb
+++ b/app/controllers/planet_controller.rb
@@ -5,6 +5,7 @@ class PlanetController < ApplicationController
   def index
     @entries = Planet::Models::Entry.order(:published_at => :desc)
       .paginate(:page => params[:page], :per_page => 10)
+    @subscriptions = Planet::Models::Feed.order(:title => :asc)
   end
 
   def feed
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 364beb9..1f39e6b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,6 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <%= auto_discovery_link_tag :atom, news_feed_url(subdomain: 'blog'), {:title => t('newsfeed')} %>
+  <%= auto_discovery_link_tag :atom, planet_feed_url(subdomain: 'planet'), {:title => t('planet_feed')} %>
   <%= stylesheet_link_tag 'application', :media => 'all' %>
   <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
diff --git a/app/views/planet/index.html.erb b/app/views/planet/index.html.erb
index 398ea03..3aec661 100644
--- a/app/views/planet/index.html.erb
+++ b/app/views/planet/index.html.erb
@@ -1,19 +1,23 @@
 <%- content_for :page_title do %>
   <%= t 'pages.planet.menu_title' %>
 <% end %>
+<% content_for :wrapper_class, 'planet-page' %>
 
-<div class="page-header">
-  <h1><%= t 'pages.planet.headline' %> <small><%= t 'pages.planet.subline' %></small></h1>
+<div class="hero" id="masthead">
+  <div class="container">
+    <h1><%= t 'pages.planet.headline' %></h1>
+    <h2 class="lead"><%= t 'pages.planet.subline' %></h2>
+  </div>
 </div>
 
-<div class="container-fluid">
+<div class="container">
   <div class="row">
-    <div class="col-md-8">
+    <div class="col-md-9">
       <%- @entries.each do |entry| %>
         <div class="blogcontent bloglist-item planet-item">
           <div class="page-header clearfix">
             <h1>
-              <%= entry.feed.title %> - <%= link_to entry.title, entry.url %>
+              <%= entry.feed.title %>: <%= link_to entry.title, entry.url %>
               <small><%= l entry.published_at, format: :blog_headline %></small>
             </h1>
           </div>
@@ -22,10 +26,27 @@
         </div>
       <% end %>
     </div>
-    <div class="col-md-4">
-      foo
+    <div class="col-md-3">
+      <h4><%= t 'pages.planet.disclaimer_headline' %></h4>
+      <p class="text-muted"><%= t 'pages.planet.disclaimer' %></p>
+
+      <h4><%= t 'pages.planet.subscribe_headline' %></h4>
+      <p class="text-muted"><%= t('pages.planet.subscribe', feed_link: link_to(t('pages.planet.feed_link_title'), planet_feed_path)).html_safe %></p>
+
+      <h4><%= t 'pages.planet.subscriptions_headline' %></h4>
+      <ul>
+        <%- @subscriptions.each do |subscription| %>
+          <li>
+            <%= link_to subscription.title, subscription.site_url %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12 text-center">
+      <%= will_paginate @entries, renderer: BootstrapPagination::Rails %>
     </div>
   </div>
 </div>
 
-<%= will_paginate @entries, renderer: BootstrapPagination::Rails %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4eab5a2..dd696a9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,8 @@ en:
     footer:
       copyleft: "CC-BY The diaspora* Foundation"
   title: "The diaspora* Project"
-  newsfeed: Newsfeed
+  newsfeed: "The diaspora* Blog (Atom)"
+  planet_feed: "The diaspora* Planet (Atom)"
   layouts:
     application:
       wiki: Wiki
@@ -192,8 +193,15 @@ en:
       subline: "official announcements"
       menu_title: Blog
     planet:
-      headline: Planet
+      headline: "The diaspora* planet"
+      subline: "blog posts by our community"
       menu_title: Planet
+      disclaimer_headline: "The diaspora* planet"
+      disclaimer: "The planet is a collection of blog posts written by members of our community and represents the views of individual community members. All posts are owned by their authors, see the original posts for further information."
+      subscribe_headline: "Subscribe"
+      subscribe: "You can stay up-to-date by subscribing to the planets %{feed_link}."
+      feed_link_title: "Atom feed"
+      subscriptions_headline: "Subscriptions"
     tutorials:
       headline: "diaspora* tutorials"
       byline: "Step-by-step guides to help you"