Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

diff --git a/www/banners.json b/www/banners.json
index fe51488c7066f6687ef680d6bfaa4f7768ef205c..d9f4229e921b9a5fc0654f626faa0be456367f30 100644 (file)
--- a/www/banners.json
+++ b/www/banners.json
@@ -1 +1,5 @@
-[]
+[
+       { "uri"   : "images/banners/hetzner_hosted_by_1.jpg",
+         "title" : "<span>Hosting</span>-Sponsor",
+         "link"  : "http://www.hetzner.de/" }
+]

diff --git a/www/static/images/banners/hetzner_hosted_by_1.jpg b/www/static/images/banners/hetzner_hosted_by_1.jpg
new file mode 100644 (file)
index 0000000..a796748
Binary files /dev/null and b/www/static/images/banners/hetzner_hosted_by_1.jpg differ

diff --git a/www/templates/index.html b/www/templates/index.html
index 417b855dfc68b7ce4bb97ee983193b520e72a047..a858e3404b153aeb9c94e47c8cf0aaabacab81e6 100644 (file)
--- a/www/templates/index.html
+++ b/www/templates/index.html
@@ -49,6 +49,8 @@
 {% block sidebar %}
        {{ modules.SidebarRelease() }}
        
+       {{ modules.SidebarBanner(banner) }}
+       
        <h4><span>Internet Relay</span> Chat</h4>
        <p>
                Server: irc.freenode.net<br />
@@ -56,8 +58,6 @@
                <a href="http://webchat.freenode.net/?channels=ipfire" target="_blank">Web-Chat</a>
        </p>
        
-       {{ modules.SidebarBanner(banner) }}
-       
        <h4><span>RSS</span> feed</h4>
        <p>
                {% if lang == "de" %}

diff --git a/www/templates/static/artwork.html b/www/templates/static/artwork.html
index e807bf57f2d238c083ca992d85e2d986ff8c7345..16e5816b6f82d1e47ffb78705876547c549ad1c6 100644 (file)
--- a/www/templates/static/artwork.html
+++ b/www/templates/static/artwork.html
@@ -89,8 +89,6 @@
        </div>
 {% end block %}
 
-{{ modules.SidebarBanner(banner) }}
-
 {% block sidebar %}
                <h4><span>Artwork</span> list</h4>
                <ul class="links">              

diff --git a/www/templates/static/development.html b/www/templates/static/development.html
index 35c3793b1d2a88af95c0f460be2a60fcaef2fc97..17f6dab09a62a90a9a8460451d43158370d48e19 100644 (file)
--- a/www/templates/static/development.html
+++ b/www/templates/static/development.html
@@ -164,8 +164,4 @@
                  </ul>
                  </ul>
 
-               
-       
- {{ modules.SidebarBanner(banner) }}
-
 {% end block %}

diff --git a/www/templates/static/donation.html b/www/templates/static/donation.html
index d41a009333b75e35b413c86158bc7a63265a064f..6c2e91205d8f626bbebe26c1f5fcf987a3618c3c 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 8e7c65f20a4069c125e7d2c7800cad5da37c2d42..d23dcfe80d8e1479395610f2c42fa7bbe34921ec 100644 (file)
--- a/www/templates/static/features.html
+++ b/www/templates/static/features.html
@@ -290,7 +290,4 @@
                          <li><a href="#{{ _("monitoring") }}">{{ _("monitoring") }}</a></li>
         </ul>
 
-               
-       
-
 {% 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/templates/static/screenshots.html b/www/templates/static/screenshots.html
index d8901ad785e92d15a67d23089eff04f166d88bc9..846a5f2bd3d40bdda408155b5e97869e304789f5 100644 (file)
--- a/www/templates/static/screenshots.html
+++ b/www/templates/static/screenshots.html
@@ -109,7 +109,6 @@
                        <li><a href="#{{ _("IPFire") }}">{{ _("IPFire") }}</a></li>
                        <li><a href="#{{ _("Logs") }}">{{ _("Logs") }}</a></li>
                </ul>
- {{ modules.SidebarBanner(banner) }}
 
 {% end block %}