Merge branch 'next'

Conflicts:
	www/banners.json
	www/mirrors.json
	www/news.json
	www/releases.json
	www/templates/base.html
	www/templates/index.html
	www/templates/static/artwork.html
	www/templates/static/development.html
	www/templates/static/screenshots.html
	www/webapp/backend/tracker.py
	www/webapp/handlers.py

diff --git a/www/templates/static/donation.html b/www/templates/static/donation.html
index cb12bee4db830b5b81198ff9cc9067969ca90d6c..831ec50b46f04bc3d247d86221ac20682c722e39 100644 (file)
--- a/www/templates/static/donation.html
+++ b/www/templates/static/donation.html
@@ -58,3 +58,6 @@
        <br class="clear" />
 
        {% end block %}
+
+{% block sidebar %}
+{% end block %}

diff --git a/www/templates/static/features.html b/www/templates/static/features.html
index 649464eafdd842b02b72d416f87d50190125f945..63c7199180523d25e4d1c329052346555b8b81f5 100644 (file)
--- a/www/templates/static/features.html
+++ b/www/templates/static/features.html
@@ -255,7 +255,7 @@
                <p>
                {% if lang == "de" %}
                        Um dem Administrator die Auswerung der Geschehnisse möglichst zu vereinfachen
-                       werden Logs grafisch ausgewertet, sodass Fehler oder Probleme auf dem
+                       werden Logs grafisch ausgewertet, sodass Fehler oder Probleme auf den
                        ersten Blick erkannt werden können.
 
                        <ul>
@@ -290,7 +290,4 @@
                          <li><a href="#{{ _("monitoring") }}">{{ _("monitoring") }}</a></li>
         </ul>
 
-               
-       
-
 {% end block %}

diff --git a/www/templates/static/imprint.html b/www/templates/static/imprint.html
index 8d1dd5d55b0393cd1b02cf70d0e1ffea855d5fc5..24976820d1b68c6286a984b9ea319bf0a4718cb1 100644 (file)
--- a/www/templates/static/imprint.html
+++ b/www/templates/static/imprint.html
@@ -114,3 +114,6 @@
        <br class="clear" />
 
 {% end block %}
+
+{% block sidebar %}
+{% end block %}

diff --git a/www/templates/static/pr.html b/www/templates/static/pr.html
index 883c073b61e9c61bd411f21c16967977a4eee8e0..65a2d675c158877ea9b85df266582b5163a86c6b 100644 (file)
--- a/www/templates/static/pr.html
+++ b/www/templates/static/pr.html
@@ -221,4 +221,6 @@
                        <li><a href="#{{ _("Sponsoring") }}">{{ _("Sponsoring") }}</a></li>
                                <li><a href="#{{ _("friends of ipfire") }}">{{ _("friends of ipfire") }}</a></li>
                </ul>
+               
+{{ modules.SidebarBanner(banner) }}
 {% end block %}

diff --git a/www/webapp.init b/www/webapp.init
index 7fda8376c95da5a83805e8128594ce604b6d3b93..bf509ab6194bb916541445481a4fcda89b400bfc 100755 (executable)
--- a/www/webapp.init
+++ b/www/webapp.init
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 HOMEDIR=$(dirname $(readlink $0))
-LOGFILE=/srv/logs/www/webapp.error.log
+LOGFILE=/var/log/webapp/error.log
 
 case "$1" in
        start)