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

Changeset - a69daac094df

Parent rev.

Child rev.

[Not reviewed]

Merge version_5

0 3 0

Dennis Fink - 9 years ago 2015-10-13 22:27:08
dennis.fink@c3l.lu

Merged in kahpa/ennstatus-relaunched/version_5 (pull request #13)

Version_5

3 files changed with 7 insertions and 2 deletions:

ennstatus/templates/base.html

ennstatus/templates/donate/index.html

ennstatus/templates/root/abuse.html

0 comments (0 inline, 0 general)

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -35,12 +35,13 @@ @@
     </div>
     <div class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="https://wiki.enn.lu/doku.php?id=news" target="blank">News</a></li>
             <li><a href="{{ url_for('root.about') }}">Organization</a></li>
             <li><a href="{{ url_for('root.partners') }}">Partners</a></li>
           </ul>
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>
@@ @@ -57,12 +58,13 @@ @@
           </ul>
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('donate.index') }}">Donate</a></li>
             <li><a href="{{ url_for('donate.received') }}">Donation history</a></li>
             <li><a href="{{ url_for('root.member') }}">Join us</a></li>
             <li class="dropdown-submenu">
               <a>Special programs</a>
               <ul class="dropdown-menu">
                 <li><a href="{{ url_for('root.bridgeprogram')}}">Bridge program</a></li>
               </ul>
@@ @@ -70,12 +72,14 @@ @@
           </ul>
         </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('root.contact') }}">General</a></li>
             <li><a href="https://twitter.com/FrennVunDerEnn" target="blank">Twitter</a></li>
             <li><a href="http://lists.enn.lu/listinfo/discuss" target="blank">Mailing List</a></li>
             <li><a href="{{ url_for('root.abuse') }}">Abuse</a></li>
           </ul>
         </li>
       </ul>
     </div>
   </div>

ennstatus/templates/donate/index.html

➞

Show inline comments

@@ @@ -28,13 +28,14 @@ @@
     <h2>Support us!</h2>
   </div>
   <div class="col-md-8">
     <div class="jumbotron">
       <h2>Take action for a <strong>#FreeInternet</strong>! Support us today!</h2>
       <p>As a non-profit organization we are 100% community funded. Donations from our members and supporters will be used to <strong>power Tor nodes</strong>, <strong>print flyers and posters</strong> or cover administrative charges.</p>
       <h3><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a></h3>
       <h3><a href="{{ url_for('donate.received') }}"><span class="label label-info">Donation history</span></a>
       <a href="{{ url_for('root.bridgeprogram') }}"><span class="label label-primary">Adopt a Tor Bridge</span></a></h3>
     </div>
   </div>
   <div class="col-md-12">
     <div class="col-md-4">
       <div class="thumbnail">
         <center>

ennstatus/templates/root/abuse.html

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
     <ul>
       <li>the offending IP address'</li>
       <li>the type &amp; address' of the abused service(s)</li>
       <li>your contact information</li>
     </ul><br>
     <p>
       For transparency reasons we publish monthly <a><strong>abuse mail statistics</strong></a>.
+      For transparency reasons we publish monthly <a href="https://wiki.enn.lu/doku.php?id=abuse_statistics" target="blank"><strong>abuse mail statistics</strong></a>.
     </p>
     <h3>Abuse contact</h3>
     <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>
     </address>
     <h3>RIPE Contact</h3>

0 comments (0 inline, 0 general)