Merge pull request #276 from bitcoin/org

Add non-profit organizations to the community page

_less/ie.css

@@ -170,6 +170,15 @@ body{
 	border-top:0;
 }
 
+.resourcesorg div div{
+	zoom:1;
+	display:inline;
+	padding:20px 0;
+}
+.resourcesorg div{
+	border-top:expression(this.parentNode.className=='resourcesorg'&&this.parentNode.getElementsByTagName('DIV')[0]!=this?'1px solid #e0e0e0':'0');
+}
+
 .downloadbox{
 	zoom:1;
 	display:inline;

_less/screen.less

@@ -685,6 +685,31 @@ li p{
 	margin:6px 0;
 }
 
+.resourcesorg{
+	margin-bottom:40px;
+	text-align:left;
+	font-size:0;
+}
+.resourcesorg div{
+	border-top:1px solid #e0e0e0;
+}
+.resourcesorg div:first-child,.resourcesorg div div{
+	border-top:0;
+}
+.resourcesorg div div{
+	width:278px;
+	font-size:16px;
+	display:inline-block;
+	vertical-align:top;
+}
+.resourcesorg img{
+	margin-right:5px;
+	width:24px;
+	height:24px;
+	position:relative;
+	bottom:-6px;
+}
+
 .chatbox{
 	text-align:center;
 }
@@ -1511,6 +1536,13 @@ h2 .rssicon{
 		padding-left:0;
 		margin-left:0;
 	}
+	.resourcesorg div div{
+		width:auto;
+		display:block;
+	}
+	.resourcesorg div{
+		border-top:0;
+	}
 }
 
 /* Deprecated styles (should be removed when translations are updated) */

_templates/community.html

@@ -96,6 +96,85 @@ id: community
   </div>
 </div>
 </div>
+
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'id' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' or 'zh_CN' or 'zh_TW' %}
+<h2>{% translate nonprofit community en %}</h2>
+{% else %}
+<h2>{% translate nonprofit %}</h2>
+{% endcase %}
+<div class="resourcesorg">
+<div>
+  <div>
+    <h3><img src="/img/flags/ALL.png">International</h3>
+    <p>
+      <a href="https://bitcoinfoundation.org/">The Bitcoin Foundation</a>
+    </p>
+  </div>
+  <div>
+    <h3><img src="/img/flags/AR.png">Argentina</h3>
+    <p>
+      <a href="http://www.bitcoinargentina.org/">Fundación Bitcoin Argentina</a>
+    </p>
+  </div>
+  <div>
+    <h3><img src="/img/flags/AU.png">Australia</h3>
+    <p>
+      <a href="https://plus.google.com/111744062512117128149/posts">The Bitcoin Association of Australia</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3><img src="/img/flags/AT.png">Autria</h3>
+    <p>
+      <a href="http://bitcoin-austria.at/">Bitcoin Austria</a>
+    </p>
+  </div>
+  <div>
+    <h3><img src="/img/flags/CA.png">Canada</h3>
+    <p>
+      <a href="http://bitcoinembassy.ca/">Bitcoin Embassy</a><br>
+      <a href="http://www.bitcoinalliance.ca/">Bitcoin Alliance of Canada</a>
+    </p>
+  </div>
+  <div>
+    <h3><img src="/img/flags/IL.png">Israel</h3>
+    <p>
+      <a href="http://www.bitcoin.org.il/">איגוד הביטקוין הישראלי</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3><img src="/img/flags/DE.png">Germany</h3>
+    <p>
+      <a href="http://www.bundesverband-bitcoin.de/">Bundesverband Bitcoin e.V.</a>
+    </p>
+  </div>
+  <div>
+    <h3><img src="/img/flags/IT.png">Italy</h3>
+    <p>
+      <a href="https://www.bitcoin-italia.org/">Bitcoin Foundation Italia</a>
+    </p>
+  </div>
+  <div>
+    <h3><img src="/img/flags/NL.png">Netherlands</h3>
+    <p>
+      <a href="http://stichtingbitcoin.nl/">Stichting Bitcoin Nederland</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3><img src="/img/flags/CH.png">Switzerland</h3>
+    <p>
+      <a href="http://bitcoinassociation.ch/">Bitcoin Association Switzerland</a>
+    </p>
+  </div>
+</div>
+</div>
+
 <div class="introlink">{% translate wikiportal %}</div>
 
 {% endcase %}

_translations/en.yml

@@ -94,6 +94,7 @@ en:
     meetupgroup: "Bitcoin Meetup Groups"
     meetupbitcointalk: "Bitcoin Meetups On BitcoinTalk"
     meetupwiki: "Bitcoin Meetups On The Wiki"
+    nonprofit: "Non-profit organizations"
     wikiportal: "Visit the <a href=\"https://en.bitcoin.it/wiki/Bitcoin:Community_portal\">Community portal</a> on the wiki."
   choose-your-wallet:
     title: "Choose your wallet - Bitcoin"

img/flags/LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2013 Go Squared Ltd. http://www.gosquared.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.