Changeset - 2cf4ef444cd9
Parent rev.
Child rev.
[Not reviewed]
Merge feature-donation-statistics
0 4 0
Dennis Fink - 9 years ago 2016-02-27 13:12:51
dennis.fink@c3l.lu
Merged dev
4 files changed with 77 insertions and 74 deletions:
README.rst
1
1
ennstatus/templates/donate/index.html
72
68
ennstatus/templates/root/contact.html
3
4
setup.py
1
1
0 comments (0 inline, 0 general)
README.rst
➞
Show inline comments
 
@@ -54,7 +54,7 @@ branching model, but with some modificat
 
Description of the branches:
 

			




	
	
	
		
 
- **default**: This is the stable branch.

			




	
	
	
		
 
- **stable**: This is the main development branch.

			




	
	
	
		
 
- **dev**: This is the main development branch.

			




	
	
	
		
 
- **hotfix-***: These branches branch off from the default branch and are used to

			




	
	
	
		
 
  fix bugs which are in the stable version. They will be merged back into

			




	
	
	
		
 
  *default* and *dev*. After the bug is fixed, the *PATCH* number must be

			




        

    


    
    

    

        

                

                    ennstatus/templates/donate/index.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -111,63 +111,63 @@

			




	
	
	
		
 
          <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 />

			




	
	
	
		
 
          <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>

			




	
	
	
		
 
          <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 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>

			




	
	
	
		
 
          </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>

			




	
	
	
		
 
            <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>

			




	
	
	
		
 
  </div>

			




	
	
		
 
@@ -176,24 +176,28 @@

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <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 class="well well-sm">

			




	
	
	
		
 
            <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>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </center>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="col-md-4">

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <center>

			




	
	
	
		
 
          <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>

			




	
	
	
		
 
          <div class="well well-sm">

			




	
	
	
		
 
            <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>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </center>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
		
 
@@ -201,8 +205,8 @@

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <center>

			




	
	
	
		
 
          <h3>BPM Points</h3>

			




	
	
	
		
 
          <p>For our parcel station and international mail boxes.</p>

			




	
	
	
		
 
          <div class="well well-sm">

			




	
	
	
		
 
            <p>For our parcel station and international mail boxes.</p>

			




	
	
	
		
 
            <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>

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/contact.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -49,22 +49,21 @@

			




	
	
	
		
 
        <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

			




	
	
	
		
 
      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : {{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>

			




	
	
	
		
 
    </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>

			




	
	
	
		
 
      <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:abuse@enn.lu">abuse@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="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>+352-691-71-77-44<br>

			




	
	
	
		
 
      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>

			




	
	
	
		
 
    </address>

			




	
	
	
		
 

			




	
	
	
		
 
    <h2>Press</h2>

			




	
	
	
		
 
    <p>Press related inqueries should go to:</p>

			




	
	
	
		
 
    <address>

			




	
	
	
		
 
      <abbr title="E-Mail"><span class="glyphicon glyphicon-envelope"></span></abbr> : <a href="mailto:press@enn.lu">press@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="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>+352-691-71-77-44<br>

			




	
	
	
		
 
      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>

			




	
	
	
		
 
    </address>

			




	
	
	
		
 

			




	
	
	
		
 
  </div>

			




        

    


    
    

    

        

                

                    setup.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,7 +11,7 @@ def _get_requirements():

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
setup(name='Ennstatus',

			




	
	
	
		
 
      version='5.3.0-dev',

			




	
	
	
		
 
      version='5.3.1-dev',

			




	
	
	
		
 
      description=('Ennstatus provides the user with vital information about '

			




	
	
	
		
 
                   'the status of the organizations Tor servers.'),

			




	
	
	
		
 
      author='Frënn vun der Ënn',

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: saturn-1521620
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support