# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-08-08 21:39:22
# Node ID e57442129ec23ca26aa7b325206b0c81e26a2046
# Parent  51ac306b4e1a25665d924867bddf1d7a1ef0af8f

Added new about text

diff --git a/ennstatus/templates/root/about.html b/ennstatus/templates/root/about.html
--- a/ennstatus/templates/root/about.html
+++ b/ennstatus/templates/root/about.html
@@ -1,31 +1,40 @@
 {% extends "base.html" %}
 
-{% set title = "About" %}
+{% set title = "Who we are" %}
 
-{% block content %}
+  {% block content %}
+    <!--
     <div class="col-md-4 text-center">
       <img class="img-rounded" alt="WhoIs" src="{{ url_for('static', filename='images/WhoIs.png') }}" width="160" height="189"></img>
-      <h3>About</h3>
-    </div>
-    <div class="col-md-8">
-      <blockquote>
-        <p><em>In a time of universal deceit - telling the truth is a revolutionary act.</em></p>
-        <small>George Orwell <cite title="Source Title">1984</cite></small>
-      </blockquote>
-
-      <p><em>Frënn vun der Ënn</em> is a non-profit organization, based in Luxembourg (EU) with the purposes of keeping anonymity, privacy and freedom of speech alive. We've been funded in January 2013 and our Statutes can be looked up <a href="//statutes.enn.lu">here</a>.</p>
-
-      <p></p>
-      <h3>Anonymity</h3>
+      <h3>Who we are</h3>
+      </div> --!>
+      <div class="col-md-1">
+      </div>
+    <div class="col-md-11">
+      <h2>Who we are</h2>
+      <h3>Organization</h3>
+      <p>Frënn vun der Ënn a.s.b.l. is a non-profit organization based in Luxembourg (EU). It has been funded by members of Chaos Computer Club Lëtzebuerg a.s.b.l. in 2013.</p>
       <p>
-        Anonymity is one of our last best hopes and possibilities to protect our fundamental rights as citizens of this world. As the Internet is the most important entity these societies have ever seen, its very powerful as well. With a lot of power comes a lot of responsibility. Some governments, corporations and people try to undermine our rights by trying to prohibit us the right of anonymity under the pretending of the most social engineered sentence of our modern society: "If you have nothing to hide, surveillance won't disturb you."
+        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>
-
-      <h3>Freedom of Expression</h3>
-      <p>Protecting the right of Freedom of Expression is no task for journalists, (h)acktivists and others anymore, but it became a fight in which we all need to stand together. As our organization puts its accent on <strong>anonymity</strong>, this is one way to uphold this most important right.</p>
-
-
-      <h3>Voice</h3>
-      <p>Providing a usable anonymizing network on the Internet today is an ongoing challenge. We want software that meets users' needs. We also want to keep the network up and running in a way that handles as many users as possible. Security and usability don't have to be at odds: As Tor's usability increases, it will attract more users, which will increase the possible sources and destinations of each communication, thus increasing security for everyone. We're making progress, but we need your help. Please consider a <a href="{{ url_for('donate.index') }}">donation</a></p>
+      <p>The name Frënn vun der Ënn is Luxembourgish and stands for Friends of the Onion. The onion is used as a logo by the Tor Project Inc. and many other related organizations.</p>
+      <h3>Administrative Council & Staff</h3>
+      <ul>
+        <li><b>President:</b> Sam Grüneisen</li>
+        <li><b>Secretary:</b> Gilles Hamen</li>
+        <li><b>Treasurer:</b> Patrick Kahr</li>
+        <li><b>Developers:</b> Dennis Fink, Sam Grüneisen</li>
+        <li><b>SysAdmins:</b> Sam Grüneisen, Patrick Kahr, Dennis Fink</li>
+      </ul>
+      <h3>Statutes</h3>
+      <p>Our statutes can be looked up here!</p>
     </div>
 {% endblock %}