FVDE/ennstatus Changeset - 2e6cd1aea609 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 2e6cd1aea609

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

Dennis Fink - 9 years ago 2016-05-30 22:09:09
dennis.fink@c3l.lu

Merged dev

3 files changed with 9 insertions and 5 deletions:

ennstatus/templates/donate/index.html

ennstatus/templates/root/contact.html

setup.py

0 comments (0 inline, 0 general)

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -76,27 +76,29 @@ @@
        </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>
                     {{ config['ENNSTATUS_ADDRESS'] }}<br>
                     {{ config['ENNSTATUS_ADRESS_CO'] }}<br>
                     {{ config['ENNSTATUS_HOUSE_NAME'] }}<br>
                     {{ config['ENNSTATUS_STREET'] }}<br>
                     {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>
                     {{ config['ENNSTATUS_COUNTRY'] }}
+                    {{ config['ENNSTATUS_COUNTRY'] }}<br>{{ config['ENNSTATUS_CONTINENT'] }}
           </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

ennstatus/templates/root/contact.html

➞

Show inline comments

@@ @@ -22,27 +22,29 @@ @@
 {% 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">
     <h2>General</h2>
     <p>Please mail all general inquiries to:</p>
     <address>
       <strong>Frënn vun der Ënn, ASBL</strong><br>
         {{ config['ENNSTATUS_ADDRESS'] }}<br>
         {{ config['ENNSTATUS_ADDRESS_CO'] }}<br>
         {{ config['ENNSTATUS_HOUSE_NAME'] }}<br>
         {{ config['ENNSTATUS_STREET'] }}<br>
         {{ config['ENNSTATUS_POSTAL_CODE'] }}, {{ config['ENNSTATUS_CITY'] }}<br>
         {{ config['ENNSTATUS_COUNTRY'] }}<br>
+        {{ config['ENNSTATUS_COUNTRY'] }}<br>, {{ config['ENNSTATUS_CONTINENT'] }}
         <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> : {{ 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>{{ config['ENNSTATUS_PHONE_NUMBER'] }}<br>
     </address>

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.5.0',
+      version='5.6.0',
       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)