Add donations and contributors pages

app/assets/stylesheets/contributors.css.scss

@@ -0,0 +1,19 @@
+.contributors {
+
+  .col-md-4 {
+    margin-bottom: 5rem;
+    .img-circle {
+      box-shadow: 0 0 2px black;
+    }
+  }
+
+  .services a {
+    display: inline-block;
+    padding: 5px;
+    border-bottom: 1px solid #fff;
+
+    &:hover {
+      border-bottom: 1px solid #ccc;
+    }
+  }
+}

app/views/layouts/application.html.erb

@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="row">
-        <div class="col-md-3">
+        <div class="col-md-2">
           <ul>
             <li>
               <a href="https://github.com/diaspora/">
@@ -70,7 +70,7 @@
             </li>
           </ul>
         </div>
-        <div class="col-md-3">
+        <div class="col-md-2">
           <ul>
             <li>
               <a href="https://github.com/diaspora/diaspora/issues">
@@ -84,7 +84,7 @@
             </li>
           </ul>
         </div>
-        <div class="col-md-3">
+        <div class="col-md-2">
           <ul>
             <li>
               <a href="https://webchat.freenode.net/?channels=diaspora">
@@ -98,7 +98,17 @@
             </li>
           </ul>
         </div>
-        <div class="col-md-3">
+        <div class="col-md-2">
+          <ul>
+            <li>
+              <%= link_to t('.contributors'), contributors_url %>
+            </li>
+            <li>
+              <%= link_to t('.donations'), donations_url %>
+            </li>
+          </ul>
+        </div>
+        <div class="col-md-4">
           <div class="dropdown dropup">
             <button class="btn btn-defalt dropdown-toggle" data-toggle="dropdown">
               <%= t '.choose_language' %>

app/views/pages/contributors.erb

@@ -0,0 +1,134 @@
+<% content_for :page_title, t('.menu_title') %>
+<% content_for :wrapper_class, 'index-page' %>
+
+<div id="masthead" class="hero">
+  <div class="container">
+    <h1><%= t '.headline' %></h1>
+    <h2 class="lead"><%= t '.byline' %></h2>
+  </div>
+</div>
+<div class="container contributors">
+  <div class="row minor-top-spacing">
+    <div class="col-md-12">
+      <p><%= t('.intro', join_us: link_to(t('pages.contributors.join_us'), "https://wiki.diasporafoundation.org/Getting_started_with_contributing")).html_safe %></p>
+      <p><%= t('.contacting', how_we_communicate: link_to(t('.how_we_communicate_link'), "https://wiki.diasporafoundation.org/How_we_communicate")).html_safe %></p>
+    </div>
+  </div>
+  <div class="row minor-top-spacing text-center">
+    <div class="col-md-4">
+      <p>
+        <%= image_tag 'pages/contributors/denschub.jpg', class: 'img-responsive img-circle center-block' %>
+      </p>
+      <h4>
+        Dennis Schubert
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://pod.geraspora.de/u/denschub", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/denschub", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/supertux.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Benjamin Neff
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://nerdpol.ch/u/supertux", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/supertux88", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/jhass.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Jonne Haß
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://social.mrzyx.de/u/mrzyx", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/jhass/", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/svbergerem.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Steffen Van Bergerem
+      </h4>
+      <p>
+         [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://pod.omgsrsly.net/svbergerem", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/svbergerem", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/senya.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Senya
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://socializer.cc/u/senya", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/cmrd-senya", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/fla.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Fla
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://diaspora-fr.org/u/fla", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/flaburgan", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/goob.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Goob
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://pod.orkz.net/u/goob", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/goobertron ", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/waithamai.jpg', class: 'img-responsive img-circle center-block' %>
+      <h4>
+        Waithamai Dragonqueen
+      </h4>
+      <p>
+        [email protected]
+      </p>
+      <p class="services">
+        <%= link_to(image_tag('pages/contributors/services/diaspora.png'), "https://pod.geraspora.de/u/waithamai", title: t('.diaspora_profile')) %>
+        <%= link_to(image_tag('pages/contributors/services/github.png'), "https://github.com/waithamai", title: t('.github_profile')) %>
+      </p>
+    </div>
+    <div class="col-md-4">
+      <%= image_tag 'pages/contributors/you.jpg', class: 'img-responsive img-circle center-block', alt: t('.you') %>
+      <h4>
+        <%= t '.you' =%>
+      </h4>
+      <p>
+        <%= t('.you_join', join_us: link_to(t('pages.contributors.join_us'), "https://wiki.diasporafoundation.org/Getting_started_with_contributing")).html_safe %>
+      </p>
+    </div>
+  </div>
+</div>

app/views/pages/donations.erb

@@ -0,0 +1,30 @@
+<% content_for :page_title, t('.menu_title') %>
+<% content_for :wrapper_class, 'index-page' %>
+
+<div id="masthead" class="hero">
+  <div class="container">
+    <h1><%= t '.headline' %></h1>
+    <h2 class="lead"><%= t '.byline' %></h2>
+  </div>
+</div>
+<div class="container">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="page-header">
+        <h3><%= t '.help_your_podmin' %></h3>
+      </div>
+      <p><%= t '.podmins_details' %></p>
+    </div>
+  </div>
+</div>
+<div class="container">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="page-header">
+        <h3><%= t '.help_development' %></h3>
+      </div>
+      <p><%= t '.development_details' %></p>
+      <p><%= t('.bountysource_details', bountysource: link_to('Bountysource', 'https://www.bountysource.com/teams/diaspora')).html_safe %></p>
+      <p><%= t('.bountysource_more_info', bountysource_blogpost: link_to('our blog post', 'https://blog.diasporafoundation.org/14-support-diaspora-development-via-bountysource')).html_safe %></p>
+  </div>
+</div>

config/locales/en.yml

@@ -25,6 +25,8 @@ en:
       irc_development: "IRC - Development"
       discussion_general: "Discussion & support"
       discussion_development: "Discussion - Development"
+      contributors: "Contributors"
+      donations: "Donations"
       choose_language: "Choose language"
       translate: "Add a translation"
       cc_license_alt: "Creative Commons License"
@@ -132,6 +134,28 @@ en:
       reshare_alt: Reshare
       mention_alt: Mention
       heart_alt: Heart
+    contributors:
+      menu_title: "Contributors"
+      headline: "Contributors"
+      byline: "Community heroes"
+      intro: "diaspora* is made, built, managed and promoted only by its community. Discover some of the volunteers who are contributing to the project. And you're welcome to %{join_us}!"
+      join_us: "join us"
+      contacting: "Please note that if you want a quick answer, you should not contact these persons directly. See %{how_we_communicate} to communicate with us."
+      how_we_communicate_link: "the official ways"
+      you: "You?"
+      you_join: "Come and %{join_us}!"
+      github_profile: "Github profile"
+      diaspora_profile: "diaspora* profile"
+    donations:
+      menu_title: "Donations"
+      headline: "Donate to diaspora*"
+      byline: "And help the network to grow!"
+      help_your_podmin: "Support the network by donating to your podmin"
+      podmins_details: "The pod administrators are the ones who make the diaspora* network alive. But each node has a cost. To help your podmin keep the server up and running, you can make a donation. If they activate this feature, there should be a \"Donate\" section in the left column of the main page (Stream). You can there choose the donation system you prefer between those made available by you podmin. The diaspora* software allows to set paypal, liberapay and bitcoin donations."
+      help_development: "Help diaspora* development"
+      development_details: "diaspora* is developed by volunteers, but you can still make donations to show your interest and encourage them to invest more time in diaspora* development."
+      bountysource_details: "We use %{bountysource} to handle donations to the project. This platform allows you to put money directly on tasks (github issues). When a developer writes the code filling the task (fixing the issue) and their work is accepted by the diaspora* core team, they then get the money attached to the issue on bountysource. That means you are now the ones driving the priorities of the diaspora* project! Of course, if you don't have a specific issue in mind, you can give money to the diaspora* team directly and we will attach it ourselves depending on our priorities."
+      bountysource_more_info: "For more info on Bountysource, see %{bountysource_blogpost}."
     get_involved:
       headline: "Get involved!"
       byline: "The future of the social web starts with you"

config/routes.rb

@@ -6,6 +6,8 @@
   constraints subdomain: /^(|www)$/i do
     controller :pages do
       get :about
+      get :contributors
+      get :donations
       get :formatting
       get :get_involved
       get :other_docs