Changeset - 869fdb4b488f
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
virii - 8 years ago 2017-02-16 17:56:02

Removed bitpay.
New front quote.
Changed from globe to atlas.
5 files changed with 13 insertions and 86 deletions:
ennstatus/templates/base.html
1
1
ennstatus/templates/donate/index.html
7
80
ennstatus/templates/root/index.html
2
2
ennstatus/templates/status/macros.html
2
2
setup.py
1
1
0 comments (0 inline, 0 general)
ennstatus/templates/base.html
➞
Show inline comments
 
@@ -102,25 +102,25 @@
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>
 
          <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 class="divider"></li>
 
            <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>
 
            <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>
 
          </ul>
 
        </li>
 
        <li class="dropdown">
 
          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistics <b class="caret"></b></a>
 
          <ul class="dropdown-menu">
 
            <li><a href="https://stats.enn.lu/">Nodes Traffic</a></li>
 
            <li><a href="https://stats.enn.lu/">Traffic</a></li>
 
            <li class="divider"></li>
 
            <li><a href="{{ url_for('statistics.worldmap') }}">Worldmap</a></li>
 
          </ul>
 
        </li>
 
      </ul>
 
    </div>
 
  </div>
 
  {% endblock %}
 
  <div class="row" id="content">
 
  {% with messages = get_flashed_messages(with_categories=True) %}
 
    {% if messages %}
 
      <div class="col-md-12">
ennstatus/templates/donate/index.html
➞
Show inline comments
 
@@ -10,78 +10,58 @@
 
   but WITHOUT ANY WARRANTY; without even the implied warranty of
 
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
   GNU General Public License for more details.
 

			




	
	
	
		
 
   You should have received a copy of the GNU General Public License

			




	
	
	
		
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
#}

			




	
	
	
		
 

			




	
	
	
		
 
{% extends "base.html" %}

			




	
	
	
		
 

			




	
	
	
		
 
{% 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">

			




	
	
	
		
 
    <img src="{{ url_for('static', filename='images/Support.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>

			




	
	
	
		
 
    <div class="text-center">

			




	
	
	
		
 
      <h2>Support us!</h2>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




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

			




	
	
	
		
 
    <div class="jumbotron">

			




	
	
	
		
 
      <h2>Take action for 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>

			




	
	
	
		
 
      <span class='highlighted-label'><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a></span>

			




	
	
	
		
 
      <span class='highlighted-label'><a href="{{ url_for('root.bridgeprogram') }}"><span class="label label-primary">Adopt a Tor Bridge</span></a></span>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




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

			




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

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <center>

			




	
	
	
		
 
          <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>BIC/SWIFT:</strong> BCEELULLXXX<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>BIC/SWIFT:</strong> BCEELULLXXX<br>

			




	
	
	
		
 
         <strong>IBAN:</strong> LU29 0019 2855 3890 4000<br>

			




	
	
	
		
 
         <strong>Subject:</strong> * to FVDE<br>

			




	
	
	
		
 
         <strong>Subject:</strong> Donation FVDE<br>

			




	
	
	
		
 
       </p>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




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

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <center>

			




	
	
	
		
 
          <h3>SnailMail</h3>

			




	
	
	
		
 
        </center>

			




	
	
	
		
 
        <div class="well well-sm">

			




	
	
	
		
 
           <address>

			




	
	
	
		
 
             <strong>Frënn vun der Ënn, ASBL</strong><br>

			




	
	
		
 
@@ -91,83 +71,30 @@

			




	
	
	
		
 
                    {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>

			




	
	
	
		
 
                    {{ config['ENNSTATUS_COUNTRY'] }}, {{ config['ENNSTATUS_CONTINENT'] }}<br>

			




	
	
	
		
 
          </address>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




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

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <center>

			




	
	
	
		
 
          <h3>Bitcoin</h3>

			




	
	
	
		
 
        </center>

			




	
	
	
		
 
        <div class="well well-sm">

			




	
	
	
		
 
         <center>

			




	
	
	
		
 
          <p>

			




	
	
	
		
 
            <strong>Bitcoin Address:</strong> 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC

			




	
	
	
		
 
            <b>Bitcoin Address:</b> 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC

			




	
	
	
		
 
            <a href="bitcoin:1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC?label=FVDE"><img src="{{ url_for('static', filename='images/btc.png') }}" width="200"></a>

			




	
	
	
		
 
          </p>

			




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

			




	
	
	
		
 
         </center>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




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

			




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

			




	
	
	
		
 
      <div class="thumbnail">

			




	
	
	
		
 
        <center>

			




	
	
	
		
 
          <h3>PayPal <small><span class="label label-danger">high fees</span></small></h3>

			




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

			




        

    


    
    

    

        

                

                    ennstatus/templates/root/index.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,26 +42,26 @@

			




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

			




	
	
	
		
 
  </div>

			




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

			




	
	
	
		
 
    <blockquote>

			




	
	
	
		
 
      <p>

			




	
	
	
		
 
        <em>I support <abbr title="Frënn vun der Ënn a.s.b.l.">FVDE</abbr> because even small organizations can contribute to protect fundamental civil rights. This noble goal can be pursued by making use of technology and putting knowledge to the service of users who want to maintain their privacy.</em>

			




	
	
	
		
 
        <footer>Georges, Teacher</footer>

			




	
	
	
		
 
      </p>

			




	
	
	
		
 
    </blockquote>

			




	
	
	
		
 
  </div>

			




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

			




	
	
	
		
 
    <blockquote>

			




	
	
	
		
 
      <a href="https://martianhumorist.me/141015-2/" target="blank"><h2 class="text-center">You have something to hide!</h2></a>

			




	
	
	
		
 
      <footer>The Martian Humorist</footer>

			




	
	
	
		
 
      <a href="https://vimeo.com/160952562" target="blank"><h2 class="text-center">Privacy is the right to a free mind!</h2></a>

			




	
	
	
		
 
      <footer>Edward J. Snowden</footer>

			




	
	
	
		
 
    </blockquote>

			




	
	
	
		
 
  </div>

			




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

			




	
	
	
		
 
    <div class="embed-responsive embed-responsive-16by9">

			




	
	
	
		
 
      <video id="tor-animation" width="560" height="315" controls preload="none" class="video-js vjs-default-skin vjs-big-play-centered embed-responsive-item" data-setup="">

			




	
	
	
		
 
        <source src="{{ url_for('static', filename='videos/Tor_Animation.webm') }}" type='video/webm' />

			




	
	
	
		
 
        <source src="{{ url_for('static', filename='videos/Tor_Animation.mp4') }}" type='video/mp4' />

			




	
	
	
		
 

			




	
	
	
		
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.de.vtt') }}" srclang="de" label="Deutsch">

			




	
	
	
		
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.en.vtt') }}" srclang="en" label="English">

			




	
	
	
		
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.fr.vtt') }}" srclang="fr" label="Français">

			




	
	
	
		
 
        <track src="{{ url_for('static', filename='videos/subtitles/Tor_animation.ar.vtt') }}" srclang="ar" label="العربية">

			




        

    


    
    

    

        

                

                    ennstatus/templates/status/macros.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,27 +42,27 @@

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_fingerprint(fingerprint, server_type) %}

			




	
	
	
		
 
  {% if server_type in ('exit', 'relay') %}

			




	
	
	
		
 
    {% set url_type = 'relay' %}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    {% set url_type = 'bridge' %}

			




	
	
	
		
 
  {% endif %}

			




	
	
	
		
 
  {% if '.onion' in request.url_root %}

			




	
	
	
		
 
    {% set url_root = '//%s' % config['ENNSTATUS_GLOBE_ONION_ADDRESS'] %}

			




	
	
	
		
 
  {% elif '.bit' in request.url_root %}

			




	
	
	
		
 
    {% set url_root = '//%s' % config['ENNSTATUS_GLOBE_BIT_ADDRESS'] %}

			




	
	
	
		
 
  {% else %}

			




	
	
	
		
 
    {% set url_root = '//globe.enn.lu' %}

			




	
	
	
		
 
    {% set url_root = '//atlas.enn.lu' %}

			




	
	
	
		
 
  {% endif %}

			




	
	
	
		
 
  <a href="{{ url_root }}/#/{{ url_type }}/{{ fingerprint }}">{{ fingerprint|upper}}</a>

			




	
	
	
		
 
  <a href="{{ url_root }}/#details/{{ fingerprint }}">{{ fingerprint|upper}}</a>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_name(name) %}

			




	
	
	
		
 
  <a href="http://{{ name|lower }}.enn.lu">{{ name }}</a>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_date(date) %}

			




	
	
	
		
 
  {{ moment(date).format(config['ENNSTATUS_MOMENTJS_FORMAT']) }}

			




	
	
	
		
 
  <noscript>{{ date.strftime(config['ENNSTATUS_STRFTIME_FORMAT']) }}</noscript>

			




	
	
	
		
 
{% endmacro %}

			




	
	
	
		
 

			




	
	
	
		
 
{% macro create_server_table(server_type, servers) %}

			




        

    


    
    

    

        

                

                    setup.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,25 +2,25 @@ from setuptools import setup, find_packa

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _get_requirements():

			




	
	
	
		
 

			




	
	
	
		
 
    with open('requirements.in', encoding='utf-8') as f:

			




	
	
	
		
 
        lines = f.readlines()

			




	
	
	
		
 

			




	
	
	
		
 
    lines = [line[:-1] for line in lines if not line.startswith('#')]

			




	
	
	
		
 
    return lines

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
setup(name='Ennstatus',

			




	
	
	
		
 
      version='5.6.4',

			




	
	
	
		
 
      version='5.6.5',

			




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

			




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

			




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

			




	
	
	
		
 
      author_email='info@enn.lu',

			




	
	
	
		
 
      url='https://bitbucket.org/fvde/ennstatus',

			




	
	
	
		
 
      license='GPLv3+',

			




	
	
	
		
 
      packages=find_packages(),

			




	
	
	
		
 
      install_requires=_get_requirements(),

			




	
	
	
		
 
      include_package_data=True,

			




	
	
	
		
 
      entry_points={

			




	
	
	
		
 
          'console_scripts': [

			




	
	
	
		
 
              'ennstatuscli = ennstatus.cli:cli',

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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