Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

7 files changed, 4 insertions, 7 deletions

diff --git a/retro/static/2002/main.css b/retro/static/2002/main.css
index fb8d4a68..ea33cfae 100644
--- a/retro/static/2002/main.css
+++ b/retro/static/2002/main.css
@@ -89,7 +89,6 @@ ul.list {
 }
 
 table.border {
-	background-image: url('bg.gif');
 	background-repeat: no-repeat;
 	background-color: #000000;
 	border-bottom: #cccccc 1px solid;
diff --git a/retro/static/2003/main.css b/retro/static/2003/main.css
index a9aa1dd8..b9b2330d 100644
--- a/retro/static/2003/main.css
+++ b/retro/static/2003/main.css
@@ -140,7 +140,7 @@ table.box {
 }
 
 table.header {
-	background: #000000 url('bg.gif') no-repeat;
+	background: #000000;
 	border-bottom: #cccccc 1px solid;
 	border-left: #cccccc 1px solid;
 	border-right: #cccccc 1px solid;
@@ -231,7 +231,6 @@ th {
 }
 
 th.row {
-	background: url('grid.png');
 }
 
 th.rowhdr {
@@ -243,7 +242,7 @@ th.rowhdr {
 
 td.box_headline {
 	color: #dddddd;
-	background: #000000 url('bg.gif') no-repeat;
+	background: #000000;
 	border-bottom: #cccccc 1px solid;
 	padding: 0px;
 }
diff --git a/retro/static/2007/logo.png b/retro/static/2007/logo.png
index b2b6d863..44968cd1 100644
--- a/retro/static/2007/logo.png
+++ b/retro/static/2007/logo.png
diff --git a/retro/static/2008/logo.png b/retro/static/2008/logo.png
index b2b6d863..44968cd1 100644
--- a/retro/static/2008/logo.png
+++ b/retro/static/2008/logo.png
diff --git a/retro/static/2009/sevenl_button.png b/retro/static/2009/sevenl_button.png
index 131b4dc8..93adcdf0 100644
--- a/retro/static/2009/sevenl_button.png
+++ b/retro/static/2009/sevenl_button.png
diff --git a/retro/templates/retro/index-20030330.html b/retro/templates/retro/index-20030330.html
index 449731af..51cc8ba3 100644
--- a/retro/templates/retro/index-20030330.html
+++ b/retro/templates/retro/index-20030330.html
@@ -232,7 +232,6 @@ Happy holidays!
 <table width="100%"><tbody><tr><td align="right">
   [ <a href="http://web.archive.org/web/20030330090147/http://www.archlinux.org/oldnews.php">Older News</a> ]
 </td></tr></tbody></table><br>
-</p>
 <br>
 
 
diff --git a/retro/views.py b/retro/views.py
index 3bc59e9f..31226deb 100644
--- a/retro/views.py
+++ b/retro/views.py
@@ -1,6 +1,6 @@
 from django.http import Http404
+from django.shortcuts import render
 from django.views.decorators.cache import cache_page
-from django.views.generic.simple import direct_to_template
 
 
 RETRO_YEAR_MAP = {
@@ -26,6 +26,6 @@ def retro_homepage(request, year):
     context = {
         'year': year,
     }
-    return direct_to_template(request, 'retro/%s' % template, context)
+    return render(request, 'retro/%s' % template, context)
 
 # vim: set ts=4 sw=4 et: