# HG changeset patch
# User kahpa
# Date 2015-10-05 12:40:15
# Node ID b9e6b50107d0bad8e1559888853a6a18ae6069db
# Parent  4e6f50744248dcaaa2305b2ef8dd01dafe995829

new donations page

diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html
--- a/ennstatus/templates/base.html
+++ b/ennstatus/templates/base.html
@@ -38,9 +38,9 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
           <ul class="dropdown-menu">
-            <li><a href="{{ url_for('root.about') }}">Who we are</a></li>
-            <li><a>What we do?</a></li>
-            <li><a href="{{ url_for('root.partners') }}">Our partners</a></li>
+            <li><a href="{{ url_for('root.about') }}">Organization</a></li>
+            <li><a>Activities</a></li>
+            <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
           </ul>
         </li>
         <li class="dropdown">
@@ -60,20 +60,8 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
           <ul class="dropdown-menu">
-            <li class="dropdown-submenu">
-              <a>Donate</a>
-              <ul class="dropdown-menu">
-                <li><a href="{{ url_for('donate.wiretransfer') }}">Wiretransfer</a></li>
-                <li><a href="{{ url_for('donate.snailmail') }}">Snailmail</a></li>
-                <li><a href="{{ url_for('donate.paypal') }}">Paypal</a></li>
-                <li><a href="{{ url_for('donate.bitcoin') }}">Bitcoin</a></li>
-                <li><a href="{{ url_for('donate.flattr') }}">Flattr</a></li>
-                <li><a href="{{ url_for('donate.bpm') }}">BPM</a></li>
-                <li class="divider"></li>
-                <li><a href="{{ url_for('donate.received') }}">Received donations</a></li>
-              </ul>
-            </li>
-            <li><a href="{{ url_for('root.member') }}">Become a member</a></li>
+            <li><a href="{{ url_for('donate.index') }}">Donate</a></li>
+            <li><a href="{{ url_for('root.member') }}">Join us</a></li>
             <li class="dropdown-submenu">
               <a>Special programs</a>
               <ul class="dropdown-menu">
@@ -87,7 +75,6 @@
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('root.contact') }}">General</a></li>
             <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
-            <li><a>Press</a></li>
           </ul>
         </li>
       </ul>
diff --git a/ennstatus/templates/donate/index.html b/ennstatus/templates/donate/index.html
--- a/ennstatus/templates/donate/index.html
+++ b/ennstatus/templates/donate/index.html
@@ -2,82 +2,176 @@
 
 {% set title = "Donate" %}
 
+{% block styles %}
+  {{ super() }}
+  <style>
+    .bitpay-donate { margin:20px 0;}
+    .bitpay-donate fieldset {border:0;}
+    .bitpay-donate input {padding:4px 10px;}
+    .bitpay-donate select {padding:3px 10px;}
+    .bitpay-donate ul, .bitpay-donate li {padding:0;margin:0;list-style:none;}
+    .bitpay-donate li {padding:10px 0;}
+    .bitpay-donate-field {clear:both;}
+    .bitpay-donate-field label {float:left;width:100px;}
+    .bitpay-donate-field div {float:left;}
+    .bitpay-donate-field-email {width:80%;}
+    .bitpay-donate-field-price {width:40%;}
+    .bitpay-donate-field-currency {width:40%;}
+    .bitpay-donate-button-wrapper {clear:both;margin:auto;text-align:center;}
+    input.bitpay-donate-error {border:2px solid red;}
+  </style>
+{% endblock %}
+
 {% block content %}
   <div class="col-md-4 text-center">
     <img src="{{ url_for('static', filename='images/Support.png') }}" class="img-rounded" alt="WhoIs" width="160"></img>
-    <h2>Act Now!</h2>
+    <h2>Support us!</h2>
   </div>
   <div class="col-md-8">
-    <blockquote>
-      <p>"<em>The limits of tyrants are prescribed by the endurance of those whom they oppress</em>"</p>
-      <small>Frederick Douglas  <citi"Source Title"></cite></small>
-    </blockquote>
-
-    <p>Act <strong>now</strong> supporting a <strong>#FreeInternet</strong> either by
-    <ul>
-      <li>becoming an active / support <a href="{{ url_for('static', filename='files/MembershipForm.pdf') }}">member</a></li>
-      <li>sponsoring bandwidth</li>
-      <li>traditional donations</li>
-      <li>or what you might judge as useful for us.</li>
-    </ul>   
-    <div class="col-md-4">    
+    <div class="jumbotron">
+      <h2>Take action fo a <strong>#FreeInternet</strong>! Support us today!</h2>
+      <p>As a non-profit organization we are 100% community funded. Donations from our members and supporters will be used to <strong>power Tor nodes</strong>, <strong>print flyers and posters</strong> or cover administrative charges.</p>
+      <h3><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a></h3>
+    </div>
+  </div>
+  <div class="col-md-12">
+    <div class="col-md-4">
       <div class="thumbnail">
         <center>
-          <a href="{{ url_for('donate.wiretransfer') }}"><img src="{{ url_for('static', filename='images/WireTransfer.png') }}" width="135" height="135"></img></a>
-          <h5>Wire Transfer</h5>
-          <p>The easiest way.</p>
-          <a class="btn btn-info" href="{{ url_for('donate.wiretransfer') }}">Take Action Now</a>
+          <h3>Wire Transfer </h3>
         </center>
+        <div class="well well-sm">
+          <p>
+            <strong>Account holder:</strong> Frënn vun der Ënn A.S.B.L.<br>
+            <strong>BIC/SWIFT:</strong> BCEELULL<br>
+            <strong>IBAN:</strong> LU65 0019 4055 6782 7000<br>
+          </p>
+       </div>
+       <div class="well well-sm">
+       <p>
+         <strong>Account holder:</strong> Chaos Computer Club Lëtzebuerg A.S.B.L.<br>
+         <strong>BIC/SWIFT:</strong> BCEELULL<br>
+         <strong>IBAN:</strong> LU29 0019 2855 3890 4000<br>
+         <strong>Subject:</strong> * to FVDE<br>
+       </p>
+       </div>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
-          <a href="{{ url_for('donate.snailmail') }}"><img src="{{ url_for('static', filename='images/SnailMail.png') }}" width="135" height="135"></img></a>
-          <h5>SnailMail</h5>
-          <p>As anonymous as possible.</p>
-          <a class="btn btn-info" href="{{ url_for('donate.snailmail') }}">Take Action Now</a>
+          <h3>SnailMail</h3>
+        </center>
+        <div class="well well-sm">
+          <address>
+            <strong>Frënn vun der Ënn, ASBL</strong><br>
+                    BPM 381892<br>
+                    34, Rue Gabriel Lippmann34, Rue Gabriel Lippmann<br>
+                    L-5365, Munsbach<br>
+                    Luxembourg<br>
+          </address>
+        </div>
+      </div>
+      <div class="thumbnail">
+        <center>
+          <h3>Bitcoin</h3>
+
         </center>
+        <div class="well well-sm">
+          <p>
+            <strong>Bitcoin Address:</strong> 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC
+          </p>
+        </div>
+        <form class="bitpay-donate form-horizontal" action="https://bitpay.com/checkout" method="POST" onsubmit="return checkRequiredFields(this);">
+          <input name="action" type="hidden" value="checkout">
+          <div class="form-group">
+            <label class="col-sm-2 control-label">Email:</label>
+            <div class="col-sm-10">
+              <input class="bitpay-donate-field-email form-control" name="orderID" type="email" placeholder="Email address (optional)" maxlenght=50 autocapitalize=off autocorrect=off />
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="col-sm-2 control-label">Amount:</label>
+            <div class="col-sm-10">
+              <input class="bitpay-donate-field-price form-control" style="display: inline;" name="price" type="number" value="0.1" placeholder="Amount" maxlenght="10" min="0.000006" step="0.000001" />
+              <select class="bitpay-donate-field-currency form-control" style="display: inline;" value="" name="currency">
+                <option selected="selected" value="BTC">BTC</option>
+                <option value="USD">USD</option>
+                <option value="EUR">EUR</option>
+                <option value="GBP">GBP</option>
+                <option value="AUD">AUD</option>
+                <option value="BGN">BGN</option>
+                <option value="BRL">BRL</option>
+                <option value="CAD">CAD</option>
+                <option value="CHF">CHF</option>
+                <option value="CNY">CNY</option>
+                <option value="CZK">CZK</option>
+                <option value="DKK">DKK</option>
+                <option value="HKD">HKD</option>
+                <option value="HRK">HRK</option>
+                <option value="HUF">HUF</option>
+                <option value="IDR">IDR</option>
+                <option value="ILS">ILS</option>
+                <option value="INR">INR</option>
+                <option value="JPY">JPY</option>
+                <option value="KRW">KRW</option>
+                <option value="LTL">LTL</option>
+                <option value="LVL">LVL</option>
+                <option value="MXN">MXN</option>
+                <option value="MYR">MYR</option>
+                <option value="NOK">NOK</option>
+                <option value="NZD">NZD</option>
+                <option value="PHP">PHP</option>
+                <option value="PLN">PLN</option>
+                <option value="RON">RON</option>
+                <option value="RUB">RUB</option>
+                <option value="SEK">SEK</option>
+                <option value="SGD">SGD</option>
+                <option value="THB">THB</option>
+                <option value="TRY">TRY</option>
+                <option value="ZAR">ZAR</option>
+              </select>
+            </div>
+          </div>
+          <input type="hidden" name="data" value="k3TZs7wPLcCaurVVZ8iW/MCwDwe94LwJrA22SKBNMwOmVLQ3AAW4TncxqpNFPVNScSCIqoQR+zwgYJSRtFBFciNwQ7Ezcnqb3JptfVNnDubnNy1KVTFCYXZ8m/83aFxFC0p6Lyf07a0HCEWTBMQhmVjFLuQYSa57kYQd+fzlL+lbi5pkBW8ok884l1ELYq6W">
+          <div class="bitpay-donate-button-wrapper form-group">
+            <input class="bitpay-donate-button" name="submit" src="https://bitpay.com/img/donate-button.svg" onerror="this.onerror=null; this.src='https://bitpay.com/img/donate-button-md.png'" width="126" height="48" type="image" alt="BitPay, the easy way the easy way to pay with bitcoins." border="0">
+          </div>
+        </form>
       </div>
     </div>
     <div class="col-md-4">
       <div class="thumbnail">
         <center>
-          <a href="{{ url_for('donate.paypal') }}"><img src="{{ url_for('static', filename='images/PayPal_Logo.png') }}" width="135" height="135"></img></a>
-          <h5>PayPal</h5>
-          <p>All major cards accepted.</p>
-          <a class="btn btn-info" href="{{ url_for('donate.paypal') }}">Take Action Now</a>
-        </center>
+          <h3>PayPal <small><span class="label label-danger">high fees</span></small></h3>
+          <p>Use your existing PayPal account or check-out as guest. (Credit cards accepted)</p>
+        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+    		  <input type="hidden" name="cmd" value="_s-xclick">
+    		  <input type="hidden" name="hosted_button_id" value="JKNKAGHS65QN4">
+    		  <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+    		  <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+    		</form>
+      </center>
       </div>
-    </div>
-    <!-- Second row of possibilities -->
-    <div class="col-md-4">
       <div class="thumbnail">
         <center>
-          <a href="{{ url_for('donate.bitcoin') }}"><img src="{{ url_for('static', filename='images/BitCoin_Logo.png') }}" width="135" height="135"></img></a>
-          <h5>BitCoin</h5>
-          <p>A free alternative method.</p>
-          <a class="btn btn-info" href="{{ url_for('donate.bitcoin') }}">Take Action Now</a>
+          <h3>Flattr</h3>
+          <p>Flattr us!</p>
+          <a href="https://flattr.com/submit/auto?user_id=FVDE&url=https%3A%2F%2Fenn.lu/donate/flattr" target="_blank">
+            <img src="https://button.flattr.com/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></img>
+          </a>
         </center>
       </div>
-    </div>
-    <div class="col-md-4">
       <div class="thumbnail">
         <center>
-          <a href="{{ url_for('donate.flattr') }}"><img src="{{ url_for('static', filename='images/Flattr_Logo.png') }}" width="135" height="135"></img></a>
-          <h5>Flattr</h5>
-          <p>Flattr us!</p>
-          <a class="btn btn-info" href="{{ url_for('donate.flattr') }}">Take Action Now</a>
-        </center>
-      </div>
-    </div>
-    <div class="col-md-4">
-      <div class="thumbnail">
-        <center>
-          <a href="{{ url_for('donate.bpm') }}"><img src="{{ url_for('static', filename='images/BPM.gif') }}" width="135" height="135"></img></a>
-          <h5>BPM Points</h5>
-          <p>For our parcel station!</p>
-          <a class="btn btn-info" href="{{ url_for('donate.bpm') }}">Take Action Now</a>
+          <h3>BPM Points</h3>
+          <p>For our parcel station and international mail boxes.</p>
+          <div class="well well-sm">
+            <p>
+              Send your BPM voucher code to: <br>
+              <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a>
+            </p>
+          </div>
         </center>
       </div>
     </div>
diff --git a/ennstatus/templates/root/contact.html b/ennstatus/templates/root/contact.html
--- a/ennstatus/templates/root/contact.html
+++ b/ennstatus/templates/root/contact.html
@@ -24,17 +24,17 @@
     <p>Please mail all general inquiries to:</p>
     <address>
       <strong>Frënn vun der Ënn, ASBL</strong><br>
-              BPM 381892<br>
-              {{ address['address'] }}<br>
-              {{ address['postal_code'] }}, {{ address['city'] }}<br>
-              {{ address['country'] }}<br>
-              <br>
+        BPM 381892<br>
+        {{ address['address'] }}<br>
+        {{ address['postal_code'] }}, {{ address['city'] }}<br>
+        {{ address['country'] }}<br>
+        <br>
       <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:info@enn.lu">info@enn.lu</a> <span class="glyphicon glyphicon-lock"></span> GPG: <a href="http://keyserver.cypherpunk.lu:11371/pks/lookup?search=info@enn.lu&op=vindex" target="_blank">0x02225522</a><br>
       <abbr title="Website"><span class="glyphicon glyphicon-cloud"></span></abbr> : <a href="//enn.lu/">enn.lu/</a> <strong>or</strong> <a href="//{{ config['ENNSTATUS_ONION_ADDRESS'] }}/" target="_blank">{{ config['ENNSTATUS_ONION_ADDRESS'] }}</a><br>
       <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : +352-691-71-77-44<br>
       <abbr title="Fax"><span class="glyphicon glyphicon-phone-alt"></span></abbr> : +352-20-21-18-60
     </address>
- 
+
     <h2>Abuse</h2>
     <p>For further details about abuse handling, have a look over <a href="{{ url_for('root.abuse') }}">here</a>.</p>
     <address>