Changeset - 812e07309710
[Not reviewed]
Merge v5.3.1 default
0 3 0
Dennis Fink - 9 years ago 2016-02-27 12:43:21
dennis.fink@c3l.lu
Merged dev an updated version number
3 files changed with 5 insertions and 4 deletions:
0 comments (0 inline, 0 general)
ennstatus/templates/root/contact.html
Show inline comments
 
@@ -28,43 +28,43 @@
 
  </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 27402030<br>
 
      <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 27402030<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 27402030<br>
 
      <abbr title="Phone"><span class="glyphicon glyphicon-earphone"></span></abbr> : </strong>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
 
    </address>
 

	
 
  </div>
 
{% endblock %}
ennstatus/templates/root/ennstatus.html
Show inline comments
 
@@ -22,32 +22,33 @@
 
{% block content %}
 
  <div class="col-md-offset-1 col-md-11">
 
    <h2>About Ënnstatus</h2>
 
    <div class="col-md-6">
 
      <h3>API</h3>
 
      <p>We provide a <a href="http://json.org/">JSON</a> API for exporting the current status of our servers</p>
 
      <h4>Exporting all servers</h4>
 
      <p>Under the endpoint <a href="{{ url_for('api.export') }}">/api/export</a>, you can find an export of all our servers</p>
 
    </div>
 
    <div class="col-md-6">
 
      <h3>Used libraries:</h3>
 
      <ul>
 
        <li><a href="http://flask.pocoo.org/">Flask</a></li>
 
        <li><a href="https://github.com/mbr/flask-bootstrap">Flask-Bootstrap</a></li>
 
        <li><a href="http://flask-httpauth.readthedocs.org/en/latest/">Flask-HTTPAuth</a></li>
 
        <li><a href="http://packages.python.org/Flask-Mail/">Flask-Mail</a></li>
 
        <li><a href="http://https://github.com/miguelgrinberg/flask-moment/">Flask-Moment</a></li>
 
        <li><a href="https://flask-wtf.readthedocs.org/en/latest/">Flask-WTF</a></li>
 
        <li><a href="https://pypi.python.org/pypi/pygeoip/">pygeoip</a></li>
 
        <li><a href="https://pypi.python.org/pypi/jsonschema/">jsonschema</a></li>
 
        <li><a href="https://pypi.python.org/pypi/strict-rfc3339">strict-rfc3339</a></li>
 
        <li><a href="http://docs.python-requests.org/en/latest/">requests</a></li>
 
        <li><a href="https://github.com/isislovecruft/python-gnupg">python-gnupg</a></li>
 
        <li><a href="http://click.pocoo.org/">click</a></li>
 
        <li><a href="http://babel.pocoo.org/">Babel</a></li>
 
        <li><a href="http://videojs.com/">video.js</a></li>
 
      </ul>
 
      <p>Flag icons provided by: <a href="http://www.famfamfam.com/lab/icons/flags/">famfamfam</a></p>
 
      <p>Other icons provided by: <a href="http://glyphicons.com/">Glyphicons</a></p>
 
      <p>Fork us on <a href="https://bitbucket.org/fvde/ennstatus-relaunched">Bitbucket</a></p>
 
    </div>
 
  </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',
 
      version='5.3.1',
 
      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',
0 comments (0 inline, 0 general)