From 49ca9df209fa771fec8eb2ca57617643948d0f31 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 27 Oct 2010 11:22:39 -0500
Subject: Allow index and donate page to use resources from CDN

The index page is obviously hit more than just about every other page, so
this will benefit the most from moving the sponsor images to a different
domain. The donate page uses the same images.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/public/index.html | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'templates/public/index.html')

diff --git a/templates/public/index.html b/templates/public/index.html
index aa3f5c08..ace7bd31 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load markup %}
 {% load cache %}
+{% load cdn %}
 
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/news/" />
@@ -8,7 +9,7 @@
 {% endblock %}
 
 {% block content_left %}
-{% cache 300 main-page-left %}
+{% cache 300 main-page-left secure %}
 <div id="intro" class="box">
 
     <h2>A simple, lightweight distribution</h2>
@@ -41,7 +42,7 @@ <h3>Latest News <span class="more">(<a href="{% url news-list %}"
                 title="Browse the news archives">more</a>)</span></h3>
 
     <a href="/feeds/news/" title="Arch News RSS Feed"
-        class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+        class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
 
     {% for news in news_updates %}
     <h4><a href="{{ news.get_absolute_url }}"
@@ -55,7 +56,7 @@ <h4><a href="{{ news.get_absolute_url }}"
 {% endblock %}
 
 {% block content_right %}
-{% cache 300 main-page-right %}
+{% cache 300 main-page-right secure %}
 <div id="pkgsearch" class="widget">
 
     <form id="pkgsearch-form" method="get" action="/packages/">
@@ -73,7 +74,7 @@ <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
             title="Browse all of the latest packages">more</a>)</span></h3>
 
     <a href="/feeds/packages/" title="Arch Package Updates RSS Feed"
-        class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+        class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
 
     <table>
         {% for update in pkg_updates %}
@@ -207,9 +208,15 @@ <h4>About</h4>
 
 <div id="arch-sponsors" class="widget">
 
-    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network"><img src="/media/vnet_button.png" alt="Velocity Network - It's about time" /></a>
-    <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 src="/media/sevenl_button.png" 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>
-    <a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.png" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network">
+        <img src="{% cdnprefix %}/media/vnet_button.png" alt="Velocity Network - It's about time" />
+    </a>
+    <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 src="{% cdnprefix %}/media/sevenl_button.png" 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>
+    <a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner">
+        <img src="{% cdnprefix %}/media/airvm_button.png" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" />
+    </a>
 
 </div>
 {% endcache %}
-- 
cgit v1.2.3-54-g00ecf