Merge pull request #459 from bitcoin/contributors

Add list of bitcoin.org contributors

_config.yml

@@ -123,6 +123,9 @@ aliases:
   luke-jr: Luke-Jr
   laanwj: Wladimir J. van der Laan
   mikehearn: Mike Hearn
+  saivann: Saïvann Carignan
+  harding: David Harding
+  gwb3: Garland William Binns III
 
 safe:        false
 server_port: 4000

_less/ie.css

@@ -269,6 +269,11 @@ body{
 	height:16px;
 }
 
+.credit p{
+	zoom:1;
+	display:inline;
+}
+
 .foundation{
 	width:500px;
 }

_less/rtl.less

@@ -77,6 +77,9 @@ h2 .rssicon{
 .contributors{
 	text-align:right;
 }
+.credit{
+	text-align:right;
+}
 .downloadbox div{
 	text-align:right;
 }

_less/screen.less

@@ -995,6 +995,21 @@ table td,table th{
 	white-space:nowrap;
 }
 
+.credit{
+	text-align:left;
+	margin:-10px 0;
+}
+.credit p{
+	display:inline-block;
+	width:275px;
+	vertical-align:top;
+	margin:10px 0;
+}
+.credit span{
+	display:block;
+	color:#aaa;
+}
+
 .resources{
 	text-align:left;
 }

_plugins/contributors.rb

@@ -9,14 +9,14 @@ module Jekyll
 
   class CategoryGenerator < Generator
 
-    def contributors(aliases)
+    def contributors(repo, aliases)
       contributors = []
       # Call GitHub API with 100 results per page
       page = 1
       data = []
       while page < 10 do
         begin
-          ar = JSON.parse(open("https://api.github.com/repos/bitcoin/bitcoin/contributors?page=#{page}&per_page=100","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)
+          ar = JSON.parse(open("https://api.github.com/repos/"+repo+"/contributors?page=#{page}&per_page=100","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)
         # Prevent any error to stop the build process, return an empty array instead
         rescue
           print 'GitHub API Call Failed!'
@@ -80,18 +80,21 @@ module Jekyll
     def generate(site)
       # Set site.contributors global variables for liquid/jekyll
       class << site
-        attr_accessor :contributors
+        attr_accessor :corecontributors
+        attr_accessor :sitecontributors
         alias contrib_site_payload site_payload
         def site_payload
           h = contrib_site_payload
           payload = h["site"]
-          payload["contributors"] = self.contributors
+          payload["corecontributors"] = self.corecontributors
+          payload["sitecontributors"] = self.sitecontributors
           h["site"] = payload
           h
         end
       end
-      # Populate site.contributors array
-      site.contributors = contributors(site.config['aliases'])
+      # Populate site.corecontributors and site.sitecontributors arrays
+      site.corecontributors = contributors('bitcoin/bitcoin',site.config['aliases'])
+      site.sitecontributors = contributors('bitcoin/bitcoin.org',site.config['aliases'])
     end
 
   end

_templates/about-us.html

@@ -24,3 +24,41 @@ id: about-us
 
 <h2>{% translate help %}</h2>
 <p>{% translate helptxt %}</p>
+
+<h3>{% translate maintenance %}</h3>
+
+<div class="credit">
+  <p><a href="mailto:saivann@gmail.com">Saïvann Carignan</a><span>Website maintenance</span></p>
+  <p><a>Garland William Binns III</a><span>Translation maintenance</span></p>
+  <p><a href="http://dtrt.org/">David Harding</a><span>Documentation maintenance</span></p>
+</div>
+
+<h3>{% translate documentation %}</h3>
+
+<div class="credit">
+  <p><a href="http://dtrt.org/">David Harding</a><span>Coordination and writing</span></p>
+  <p><a>Greg Sanders</a><span>Writing</span></p>
+</div>
+
+<h3>{% translate translation %}</h3>
+
+<div class="credit">
+  <p><a>Garland William Binns III</a><span>Maintenance</span></p>
+  <p><a>Simon Alexander Hinterreiter</a><span>German</span></p>
+  <p><a>Matija Mazi</a><span>Slovenian</span></p>
+  <p><a>Mihai Onosie</a><span>Romanian</span></p>
+  <p><a>Boštjan Pirnar</a><span>Slovenian</span></p>
+  <p><a>Thomas Pryds</a><span>Danish</span></p>
+</div>
+
+<h3>{% translate github %}</h3>
+
+<div class="contributors">
+  {% for c in site.sitecontributors %}
+  <div>
+    <div>{% if c.gravatar_id %}<img src="https://secure.gravatar.com/avatar/{{c.gravatar_id}}?s=140&amp;d=mm" alt="icon" />{% else %}<img alt="icon" />{% endif %}</div>
+    <div><a{% if c.login %} href="https://github.com/{{c.login}}"{% endif %}>{{ c.name | htmlescape }}</a></div>
+    <div>({{ c.contributions }})</div>
+  </div>
+  {% endfor %}
+</div>

_templates/development.html

@@ -63,7 +63,7 @@ id: development
   <h2>{% translate contributors %}</h2>
   <p>{% translate contributorsorder %}</p>
   <div class="contributors">
-    {% for c in site.contributors %}
+    {% for c in site.corecontributors %}
     <div>
       <div>{% if c.gravatar_id %}<img src="https://secure.gravatar.com/avatar/{{c.gravatar_id}}?s=140&amp;d=mm" alt="icon" />{% else %}<img alt="icon" />{% endif %}</div>
       <div><a{% if c.login %} href="https://github.com/{{c.login}}"{% endif %}>{{ c.name | htmlescape }}</a></div>

_translations/en.yml

@@ -16,7 +16,11 @@ en:
     missiontxt6: "Improve Bitcoin worldwide accessibility with internationalization."
     missiontxt7: "Remain a neutral informative resource about Bitcoin."
     help: "Help us"
-    helptxt: "You can report any problem or help to improve bitcoin.org on <a href=\"https://github.com/bitcoin/bitcoin.org#how-to-participate\">GitHub</a> by opening an issue or a pull request in English. When submitting a pull request, please take required time to discuss your changes and adapt your work. You can help with translations by joining a team on <a href=\"https://github.com/bitcoin/bitcoin.org#translation\">Transifex</a>. Please don't ask for promotion for your personal business or website, except for special cases like conferences."
+    helptxt: "You can report any problem or help to improve bitcoin.org on <a href=\"https://github.com/bitcoin/bitcoin.org#how-to-participate\">GitHub</a> by opening an issue or a pull request in English. When submitting a pull request, please take required time to discuss your changes and adapt your work. You can help with translations by joining a team on <a href=\"https://github.com/bitcoin/bitcoin.org#translation\">Transifex</a>. Please don't ask for promotion for your personal business or website, except for special cases like conferences. Many thanks to all contributors who are spending time improving bitcoin.org!"
+    maintenance: "Maintenance"
+    documentation: "Documentation"
+    translation: "Translation"
+    github: "Contributors on GitHub"
   bitcoin-for-businesses:
     title: "Bitcoin for Businesses - Bitcoin"
     pagetitle: "Bitcoin for Businesses"