Changeset - 25bdbbb76c7f
[Not reviewed]
Merge default
0 3 0
Dennis Fink - 9 years ago 2016-03-05 20:11:46
dennis.fink@c3l.lu
Merged hotfix-administrative-council
3 files changed with 12 insertions and 2 deletions:
0 comments (0 inline, 0 general)
ennstatus/static/css/ennstatus.css
Show inline comments
 
@@ -144,24 +144,33 @@ a, a:hover, a:active, a:visited {
 
    line-height: 1.1;
 
    box-sizing: border-box;
 
    display: inline-block;
 
}
 

	
 
.highlighted-label-big {
 
    font-size: 30px;
 
    margin-bottom: 10px;
 
    font-weight: 500;
 
    line-height: 1.1;
 
    box-sizing: border-box;
 
    display: inline-block;
 

	
 
}
 

	
 
.btn-enn {
 
    color: #fff;
 
    background-color: #00ae18;
 
    border-color: #009414;
 
}
 

	
 
footer {
 
    margin-bottom: 20px;
 
}
 

	
 
@media (min-width: 768px) {
 
    .dl-horizontal dd {
 
        margin-left: 200px
 
    }
 
    .dl-horizontal dt {
 
        width: 180px
 
    }
 
}
ennstatus/templates/root/about.html
Show inline comments
 
@@ -25,33 +25,34 @@
 
    <h3>Organization</h3>
 
    <p class="lead">
 
      <i>Frënn vun der Ënn a.s.b.l.</i> is a non-profit organization based in Luxembourg (EU).
 
      It has been founded by members of <i>Chaos Computer Club Lëtzebuerg a.s.b.l.</i> in 2013.
 
    </p>
 
    <p>
 
      As defined in the statutes (see below), the goals of our organization are:
 
      <ul>
 
        <li>defending civil rights, especially on the internet</li>
 
        <li>defending the right to anonymity on the internet by supporting Tor Project Inc.</li>
 
        <li>fighting against censorship and ensuring free access to information</li>
 
        <li>defending the freedom of expression</li>
 
        <li>protecting privacy</li>
 
        <li>promoting free software</li>
 
      </ul>
 
    </p>
 
    <p>
 
      The name <i>Frënn vun der Ënn</i> is Luxembourgish and stands for <i>Friends of the Onion</i>.
 
      The onion is used as a logo by the Tor Project Inc. and many other related organizations.
 
    </p>
 
    <h3>Administrative Council &amp; Staff</h3>
 
    <p>
 
      <dl class="dl-horizontal" >
 
        <dt>President</dt><dd>Sam Grüneisen</dd>
 
        <dt>Secretary</dt><dd>Gilles Hamen</dd>
 
        <dt>Secretary</dt><dd>Nadine Schneider</dd>
 
        <dt>Treasurer</dt><dd>Patrick Kahr</dd>
 
        <dt>International Ambassador</dt><dd>Christophe Kemp</dd>
 
        <dt>Developers</dt><dd>Dennis Fink (Ënnstatus Lead Developer), Sam Grüneisen</dd>
 
      </dl>
 
    </p>
 
    <h3>Statutes</h3>
 
    <p>Our statutes can be looked up <a href="//statutes.enn.lu">here</a>!</p>
 
  </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.4.2',
 
      version='5.4.3',
 
      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)