# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2013-11-17 16:06:47
# Node ID 3abda675c94aa5e8e618f0ab037af8576158cb15
# Parent  10a3ee9cb0c8339f22102c2fd9511c804fc83981

updated ennstatus

diff --git a/ennstatus/__init__.py b/ennstatus/__init__.py
--- a/ennstatus/__init__.py
+++ b/ennstatus/__init__.py
@@ -1,26 +1,28 @@
 from flask import Flask
 from flask_bootstrap import Bootstrap
 from flask.ext.compress import Compress
-from flask_sslify import SSLify
+#from flask_sslify import SSLify
 
 from ennstatus.log import init_logging
 
 app = Flask(__name__)
-app.config.from_object('config')
+app.config.from_envvar('ENNSTATUS_SETTINGS')
 
 Bootstrap(app)
 Compress(app)
-SSLify(app, permanent=True)
+#SSLify(app, permanent=True)
 
 from ennstatus.views import root_page
 from ennstatus.api.views import api_page
 from ennstatus.donate.views import donate_page
 from ennstatus.status.views import status_page
+from ennstatus.stats.views import stats_page
 
 app.register_blueprint(root_page)
 app.register_blueprint(api_page, url_prefix='/api')
 app.register_blueprint(donate_page, url_prefix='/donate')
 app.register_blueprint(status_page, url_prefix='/status')
+app.register_blueprint(stats_page, url_prefix='/stats')
 
 init_logging(app)
 
diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html
--- a/ennstatus/templates/base.html
+++ b/ennstatus/templates/base.html
@@ -74,7 +74,7 @@
           </ul>
         </li>
         <li>
-          <a href="http://stats.enn.lu">Statistics</a>
+          <a href="{{ url_for('stats.index') }}">Statistics</a>
         </li>
       </ul>
     </div>
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
@@ -3,7 +3,6 @@
 {% set title = "About" %}
 
 {% block content %}
-  <div class="row">
     <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>
@@ -29,5 +28,4 @@
       <h3>Voice</h3>
       <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."</p>
     </div>
-  </div>
 {% endblock %}
diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -25,7 +25,7 @@
     {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'OBFS', 'Last Updated (UTC)'] %}
   {% endif %}
   <h2>{{ server_type }}</h2>
-  <table class="table table-bordered table-striped table-condensed">
+  <table class="table table-bordered table-striped">
     <thead>
       <tr>
         {% for name in headers %}
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,10 @@ setup(name='Ennstatus',
                                   'static/videos/*',
                                   'templates/*.html',
                                   'templates/api/extract/xml/*.xml',
-                                  'templates/api/donate/*.html',
+                                  'templates/donate/*.html',
                                   'templates/root/*.html',
-                                  'templates/status/*.html'
+                                  'templates/status/*.html',
+                                  'templates/stats/*.html'
                                   ]},
       install_requires=['Flask', 'pygeoip', 'Flask-Bootstrap',
                         'Flask-Compress', 'Flask-SSLify'],