Changeset - 2cf4ef444cd9
[Not reviewed]
Dennis Fink - 9 years ago 2016-02-27 13:12:51
dennis.fink@c3l.lu
Merged dev
4 files changed with 11 insertions and 8 deletions:
0 comments (0 inline, 0 general)
README.rst
Show inline comments
 
=========
 
Ënnstatus
 
=========
 

	
 
Ënnstatus is a web application written in Python_ Flask_, to provide viewers
 
with vital information about the organisation and Tor_ servers of `Frënn vun
 
der Ënn A.S.B.L.`_
 

	
 
.. _Python: https://python.org
 
.. _Flask: http://flask.pooco.org
 
.. _Tor: https://torproject.lu
 
.. _Frënn vun der Ënn A.S.B.L.: https://enn.lu
 

	
 
TOC
 
===
 

	
 
- Contribute_
 

	
 
  - Versioning_
 
  - Repository_
 

	
 
    - `Branch Structure`_
 
    - `Feature Requests`_
 
    - `Pull Requests`_
 

	
 
- Authors_
 

	
 
  - `Development Lead`_
 
  - `Contributors`_
 

	
 
.. _Contribute:
 

	
 
Contibute
 
=========
 

	
 
Versioning
 
----------
 

	
 
This project uses the `Semantic Versioning`_ system.
 

	
 
.. _Repository:
 

	
 
Repository
 
----------
 

	
 
.. _Branch Structure:
 

	
 
Branch Structure
 
++++++++++++++++
 

	
 
The branch structure of this project is very similiar to the `git-flow`_
 
branching model, but with some modifications (we don't have release branches).
 

	
 
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
 
  increased!
 
- **feature-***: In these branches, we will implement new features. These will
 
  branch off from the *dev* branch and merged back into the *dev* branch, if
 
  the feature is completed!
 

	
 
.. _Semantic Versioning: http://semver.org/
 
.. _git-flow: http://nvie.com/posts/a-successful-git-branching-model/
 

	
 
.. _Feature Requests:
 

	
 
Feature Requests
 
++++++++++++++++
 

	
 
We welcome feature requests. Please make sure they are within scope of Ënnstatus
 
goals and submit them in `Bitbucket Issues`_ with the *proposal* kind selected.
 
The more complete and compelling the request, the more likely it will be
 
implemented. Gathering community support will help as well!
 

	
 
.. _Pull Requests:
 

	
 
Pull Requests
 
+++++++++++++
 

	
 
1. Please check to make sure your plans fall within Ënnstatus scope
 
2. Fork Ënnstatus
 
3. Branch off the *dev* branch
 
4. Implement your changes
 
5. Submit a Pull Request
 

	
 
Pull Requests will not be accepted without adhering to the following:
 

	
 
1. Conform to existing coding styles
 
2. Serve a single atomic purpose (add one feature or fix one bug)
 
3. Introduce only changes that further the PR's singular purpose
 

	
 
.. _Bitbucket Issues: https://bitbucket.org/fvde/ennstatus-relaunched/issues
 

	
 
.. _Authors:
 

	
 
Authors
 
=======
 

	
 
Ënnstatus is written and maintained by Dennis Fink.
 

	
 
.. _Development Lead:
 

	
 
Development Lead
 
----------------
 

	
 
- Dennis Fink <dennis.fink@c3l.lu>
 

	
 
Contributors
 
------------
 

	
 
- virii <virii@c3l.lu>
 
- kahpa <kahpa@enn.lu> 
ennstatus/templates/donate/index.html
Show inline comments
 
@@ -18,198 +18,202 @@
 
{% 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>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 clearfix">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>SnailMail</h3>
 
        </center>
 
        <div class="well well-sm">
 
          <div class="pull-right">
 
            <form class="form-inline" role="form" method="POST" action"{{ url_for('donate.index') }}">
 
              {{ form.hidden_tag() }}
 
              <div class="form-group">
 
                {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
 
                <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
 
              </div>
 
            </form>
 
          </div>
 
          <address>
 
            <strong>Frënn vun der Ënn, ASBL</strong><br>
 
                    BPM 381892<br>
 
                    {{ address['address'] }}<br>
 
                    {{ address['postal_code'] }}, {{ address['city'] }}<br>
 
                    {{ address['country'] }}
 
          </address>
 
        </div>
 
      </div>
 
    </div>
 
    <div class="col-md-4">
 
      <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>
 
  </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">
 
    		  <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>
 
          <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>
 
    <div class="col-md-4">
 
      <div class="thumbnail">
 
        <center>
 
          <h3>BPM Points</h3>
 
          <div class="well well-sm">
 
          <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>
 
  </div>
 
{% endblock %}
ennstatus/templates/root/contact.html
Show inline comments
 
{# Ënnstatus
 
   Copyright (C) 2015  Dennis Fink
 

	
 
   This program is free software: you can redistribute it and/or modify
 
   it under the terms of the GNU General Public License as published by
 
   the Free Software Foundation, either version 3 of the License, or
 
   (at your option) any later version.
 

	
 
   This program is distributed in the hope that it will be useful,
 
   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 = "Contact" %}
 

	
 
{% block content %}
 
  <div class="col-md-4">
 
    <img src="{{ url_for('static', filename='images/Contact.png') }}" class="img-responsive img-rounded center-block" alt="WhoIs" width="160"></img>
 
    <div class="text-center">
 
      <h2>Contact</h2>
 
    </div>
 
  </div>
 
  <div class="col-md-8 clearfix">
 
    <h2 class="pull-left">General</h2>
 
    <div class="pull-right">
 
      <form class="form-inline" role="form" method="POST" action="{{ url_for('root.contact') }}">
 
        {{ form.hidden_tag()}}
 
        <div class="form-group">
 
          {{ form.country(class_='form-control input-sm', onchange='this.form.submit()') }}
 
          <noscript>{{ form.submit(class_='btn btn-enn btn-sm') }}</noscript>
 
        </div>
 
      </form>
 
    </div>
 
  </div>
 
  <div class="col-md-8">
 
    <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>
 
      <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>
 
{% endblock %}
setup.py
Show inline comments
 
from setuptools import setup, find_packages
 

	
 

	
 
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.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',
 
      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',
 
          ]
 
      },
 
      classifiers=['Development Status :: 5 - Production/Stable',
 
                   'Environment :: Web Environment',
 
                   'Operating System :: POSIX',
 
                   'Programming Language :: Python',
 
                   'Programming Language :: Python :: 3',
 
                   'Programming Language :: Python :: 3.3',
 
                   'Topic :: Internet',
 
                   'Topic :: Internet :: WWW/HTTP',
 
                   'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
 
                   'Topic :: Internet :: WWW/HTTP :: WSGI',
 
                   'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
 
                   ('License :: OSI Approved :: '
 
                    'GNU General Public License v3 or later (GPLv3+)'),
 
                   ]
 
      )
0 comments (0 inline, 0 general)