FVDE/ennstatus Changeset - 25bdbbb76c7f · Chaos Computer Club Lëtzebuerg Projects

Changeset - 25bdbbb76c7f

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

Dennis Fink - 10 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:

ennstatus/static/css/ennstatus.css

ennstatus/templates/root/about.html

setup.py

0 comments (0 inline, 0 general)

ennstatus/static/css/ennstatus.css

➞

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/>.
 */
 blockquote {
     border: none;
+}
 .thumbnail {
     border: none;
+}
 .container {
     margin-top:1%;
+}
 .navbar-default {
    background-color: #00ae18;
    /* border-radius: 50px; */
+}
 h1, h2, h3, h4 {
    color: #00ae18;
+}
 .navbar-default .navbar-brand {
    color: #fff;
+}
 .navbar-default img.navbar-brand {
   padding: 10px 0 10px 10px;
+}
 .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
    color: #333;
+}
 .navbar-default .navbar-nav > li > a {
    color: #fff;
+}
 .dropdown-menu {
    background-color: #00ae18;
+}
 .dropdown-menu > li > a {
   color: #fff;
+}
 .dropdown-menu > li > a:hover {
    background-color: #00bf1a;
    color: #333;
+}
 .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
    background-color: #00bf1a;
    color: #fff;
+}
 .dropdown-menu .divider {
     background-color: #00bf1a;
+}
 a, a:hover, a:active, a:visited {
     color: #af24cb;
+}
 /* fancy bootstrap checkboxes */
 .form-group input[type="checkbox"] {
     display: none;
+}
 .form-group input[type="checkbox"] + .btn-group > label span {
     width: 20px;
+}
 .form-group input[type="checkbox"] + .btn-group > label span:first-child {
     display: none;
+}
 .form-group input[type="checkbox"] + .btn-group > label span:last-child {
     display: inline-block;
+}
 .form-group input[type="checkbox"]:checked + .btn-group > label span:first-child {
     display: inline-block;
+}
 .form-group input[type="checkbox"]:checked + .btn-group > label span:last-child {
     display: none;
+}
 .form-group input[type="radio"] {
     display: none;
+}
 .form-group input[type="radio"] + .btn-group > label span {
     width: 20px;
+}
 .form-group input[type="radio"] + .btn-group > label span:first-child {
     display: none;
+}
 .form-group input[type="radio"] + .btn-group > label span:last-child {
     display: inline-block;
+}
 .form-group input[type="radio"]:checked + .btn-group > label span:first-child {
     display: inline-block;
+}
 .form-group input[type="radio"]:checked + .btn-group > label span:last-child {
     display: none;
+}
 .checkbox label, .radio label {
     padding-left: 12px;
+}
 .btn {
     margin-top: 5px;
     margin-bottom: 5px;
+}
 .highlighted-label {
     font-size: 24px;
     margin-bottom: 10px;
     font-weight: 500;
     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

 {# Ë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 = "Who we are" %}
 {% block content %}
   <div class="col-md-offset-1 col-md-11">
     <h2>Who we are</h2>
     <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',
                    'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
                    ('License :: OSI Approved :: '
                     'GNU General Public License v3 or later (GPLv3+)'),
+                   ]
+      )

0 comments (0 inline, 0 general)