Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 8 insertions, 14 deletions

diff --git a/templates/public/donate.html b/templates/public/donate.html
index 0c20e289..963a02ca 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -23,7 +23,7 @@
 
     <h3>Monetary donations</h3>
 
-    <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&amp;Pledge to Arch Linux"/>Click&amp;Pledge</a>.
+    <p>Financial contributions are accepted via <a href="https://co.clickandpledge.com/Default.aspx?WID=47294" title="Donate via Click&amp;Pledge to Arch Linux">Click&amp;Pledge</a>.
     Arch Linux is a member project of the
     <a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a>
     non-profit corporation. Funds are used for hosting costs, server hardware
@@ -31,7 +31,7 @@
     as <a href="http://www.spi-inc.org/donations/">how donations work</a>.</p>
 
     <a href="https://co.clickandpledge.com/Default.aspx?WID=47294">
-        <img width="210" height="34" src="{% static "CP_EN_BK_S_001.gif" %}" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
+        <img width="210" height="34" src="{% static "click_and_pledge.png" %}" alt="Donate via Click&amp;Pledge to Arch Linux" title="Donate via Click&amp;Pledge to Arch Linux"/>
     </a>
 
     <h3>Commercial sponsors and contributions</h3>
@@ -44,18 +44,6 @@
         title="velocity network"><img width="252" height="58" src="{% static "vnet_button.png" %}" class="sponsor-btn-vnet"
         title="" alt="velocity network - it's about time" /></a>
 
-    <p>We also wish to extend a special Thank You to <a
-        href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
-        title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a>
-    for their generous and ongoing contribution of a dedicated Arch Linux
-    server. You too can have a dedicated Arch Linux server hosted by SevenL...
-    head over to their website for more details.</p>
-
-    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
-        title="SevenL Networks - Dedicated Arch Linux servers"><img width="252" height="58" src="{% static "sevenl_button.png" %}"
-        class="sponsor-btn-sevenl" title="A big Thank You to SevenL Networks for their generous contribution"
-        alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
-
     <p>More thanks go to <a href="http://www.airvm.com/ArchLinux"
         title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
 
@@ -63,6 +51,12 @@
         title="AirVM.com - Your Green Technology Partner"><img width="252" height="58" src="{% static "airvm_button.png" %}"
         class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
 
+    <p>We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server.
+    Kartenzia.de is a new Start-Up based in Germany and specializes in
+    eco-friendly invitations like <a href="http://www.kartenzia.de/weihnachtskarten/">Weihnachten</a>.</p>
+
+    <a href="http://www.kartenzia.de/"><img width="292" height="74" src="{% static "kartenzia_button.png" %}" class="sponsor-btn-kartenzia" /></a>
+
     <h3>Past donors</h3>
 
     <div id="donor-list">