diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-21 02:22:44 -0400 |
| commit | 03fa7e4f27bdb39a8f8f5ed91a87d18bf8357b47 (patch) | |
| tree | c67eafcbda55706f18400b3115a2b8a5be318394 /retro | |
| parent | 91c451821ce7000cbc268cec8427d208a6cedd7e (diff) | |
| parent | b8ee7b1ee281b45b245fb454228b8ad847c56200 (diff) | |
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
Diffstat (limited to 'retro')
| -rw-r--r-- | retro/static/2002/main.css | 1 | ||||
| -rw-r--r-- | retro/static/2003/main.css | 5 | ||||
| -rw-r--r-- | retro/static/2007/logo.png | bin | 15730 -> 14892 bytes | |||
| -rw-r--r-- | retro/static/2008/logo.png | bin | 15730 -> 14892 bytes | |||
| -rw-r--r-- | retro/static/2009/sevenl_button.png | bin | 9028 -> 6840 bytes | |||
| -rw-r--r-- | retro/views.py | 4 |
6 files changed, 4 insertions, 6 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 131b4dc8..93adcdf0 100644 --- a/retro/static/2009/sevenl_button.png +++ b/retro/static/2009/sevenl_button.png 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: |
