FVDE/ennstatus Changeset - 472f27065608 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 472f27065608

Parent rev.

Child rev.

[Not reviewed]

Merge feature-rtkit

0 3 5

Dennis Fink - 7 years ago 2017-10-15 20:31:30
dennis.fink@c3l.lu

Merged dev

8 files changed with 27 insertions and 16 deletions:

.hgignore

ennstatus/static/images/partners/Logo-Piratepartei2014.png

bin+new file

ennstatus/static/images/partners/edri_logo_web.png

bin+new file

ennstatus/static/images/partners/flokinet.png

bin+new file

ennstatus/static/images/partners/logo-c3l.png

bin+new file

ennstatus/static/images/partners/torservers.png

bin+new file

ennstatus/templates/root/about.html

ennstatus/templates/root/partners.html

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

@@ @@ -17,6 +17,7 @@ run.py @@
 *.csv
 *.json
 *.orig
 Ennstatus.egg-info/*
 doc/*
 build/*

ennstatus/static/images/partners/Logo-Piratepartei2014.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/static/images/partners/edri_logo_web.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/static/images/partners/flokinet.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/static/images/partners/logo-c3l.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/static/images/partners/torservers.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/templates/root/about.html

➞

Show inline comments

@@ @@ -42,17 +42,17 @@ @@
       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>Max Wahl</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>
         <dt>President</dt><dd>{{ config['ENNSTATUS_PRESIDENT'] }}</dd>
         <dt>Secretary</dt><dd>{{ config['ENNSTATUS_SECRETARY'] }}</dd>
         <dt>Treasurer</dt><dd>{{ config['ENNSTATUS_TREASURER'] }}</dd>
         <dt>International Ambassador</dt><dd>{{ config['ENNSTATUS_INTERNATIONAL_AMBASSADOR'] }}</dd>
         <dt>Developers</dt><dd>{{ config['ENNSTATUS_DEVELOPERS'] }}</dd>
       </dl>
     </p>
     <h3>Statutes</h3>
     <p>Our statutes can be looked up <a href="//statutes.enn.lu">here</a>!</p>
   </div>
 {% endblock %}

ennstatus/templates/root/partners.html

➞

Show inline comments

@@ @@ -26,23 +26,33 @@ @@
       <h2>Partners</h2>
     </div>
   </div>
   <div class="col-md-8">
     <h2>Partners</h2>
     <p class="lead">We are constantly looking for new partners who want join us in our endevaour for a free Internet. At the moment we are beeing supported by the following organizations:</p>
     <dl>
       <dt><a href="https://torservers.net/" target="_blank">TorServers.net</a></dt>
       <dd>Central information point for the international Tor operators community.</dd>
       <br>
       <dt><a href="http://c3l.lu/" target="_blank">Chaos Computer Club Lëtzebuerg</a></dt>
       <dd>NPO with strong interests in IT-Security, citizen rights and pivacy. Our mother organization.</dd>
       <br>
       <dt><a href="http://piratepartei.lu/" target="_blank">Piratepartei Lëtzebuerg</a></dt>
       <dd>The Luxembourg Pirate Party.</dd>
     </dl>
     <div class="row">
       <div class="col-md-4">
         <a href="https://edri.org" target="_blank"><img src="{{ url_for('static', filename='images/partners/edri_logo_web.png') }}" alt="European Digital Rights" class="img-responsive"></img></a>
       </div>
       <div class="col-md-4">
         <a href="http://c3l.lu" target="_blank"><img src="{{ url_for('static', filename='images/partners/logo-c3l.png') }}" alt="Chaos Computer Club Lëtzebuerg" class="img-responsive"></img></a>
       </div>
        <div class="col-md-4">
         <a href="https://torservers.net" target="_blank"><img src="{{ url_for('static', filename='images/partners/torservers.png') }}" alt="Zwiebelfreunde eV" class="img-responsive"></img></a>
       </div>
     </div>
     <div class="row">
      <div class="col-md-4">
         <a href="https://piratepartei.lu" target="_blank"><img src="{{ url_for('static', filename='images/partners/Logo-Piratepartei2014.png') }}" alt="Pirate Partei" class="img-responsive"></img></a>
      </div>
      <div class="col-md-4">
        <a href="https://flokinet.is/" target="_blank"><img src="{{ url_for('static', filename='images/partners/flokinet.png') }}" alt="FlokiNET" class="img-responsive"></img></a>
      </div>
      <div class="col-md-4">
      </div>
     </div>
     <h3>Becoming a Partner?</h3>
     <p>We'd be glad to see you or your organization/company as our partner. If you are interested in supporting us by one of the following means, don't hesitate to <a href="{{ url_for('root.contact') }}">contact</a> us.
        <ul>
          <li>Traditional donations to run Tor exit nodes</li>
          <li>Sponsoring Servers, Bandwidth or equipment</li>
          <li>Helping us to spread the word about Tor and Internet privacy</li>

0 comments (0 inline, 0 general)