From 131023868a582158a4ac461dc2516e19a7fb27c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Wed, 17 Nov 2010 17:36:44 -0600 Subject: urls.py now serve static content, modified download.html and delete arch logos --- media/logos/legacy/arch-legacy-aqua-blue.png | Bin 11150 -> 0 bytes media/logos/legacy/arch-legacy-aqua-blue.svg | 200 ------ media/logos/legacy/arch-legacy-aqua-white.png | Bin 9171 -> 0 bytes media/logos/legacy/arch-legacy-aqua-white.svg | 200 ------ media/logos/legacy/arch-legacy-aqua.png | Bin 7709 -> 0 bytes media/logos/legacy/arch-legacy-aqua.svg | 103 ---- media/logos/legacy/arch-legacy-blue1.png | Bin 6563 -> 0 bytes media/logos/legacy/arch-legacy-blue1.svg | 57 -- media/logos/legacy/arch-legacy-blue2.png | Bin 4588 -> 0 bytes media/logos/legacy/arch-legacy-blue2.svg | 57 -- media/logos/legacy/arch-legacy-noodle-blue.png | Bin 13223 -> 0 bytes media/logos/legacy/arch-legacy-noodle-blue.svg | 217 ------- media/logos/legacy/arch-legacy-noodle-box.png | Bin 12060 -> 0 bytes media/logos/legacy/arch-legacy-noodle-box.svg | 775 ------------------------ media/logos/legacy/arch-legacy-noodle-cup.png | Bin 9971 -> 0 bytes media/logos/legacy/arch-legacy-noodle-cup.svg | 474 --------------- media/logos/legacy/arch-legacy-noodle-white.png | Bin 11340 -> 0 bytes media/logos/legacy/arch-legacy-noodle-white.svg | 217 ------- media/logos/legacy/arch-legacy-ribbon1.png | Bin 11628 -> 0 bytes media/logos/legacy/arch-legacy-ribbon2.png | Bin 12390 -> 0 bytes media/logos/legacy/arch-legacy-ribbon3.png | Bin 15590 -> 0 bytes media/logos/legacy/arch-legacy-ribbon4.png | Bin 16747 -> 0 bytes media/logos/legacy/arch-legacy-ribbon5.png | Bin 4986 -> 0 bytes media/logos/legacy/arch-legacy-ribbon6.png | Bin 15700 -> 0 bytes media/logos/legacy/arch-legacy-wombat-lg.png | Bin 114926 -> 0 bytes media/logos/legacy/arch-legacy-wombat.png | Bin 7761 -> 0 bytes templates/public/download.html | 5 +- urls.py | 9 +- 28 files changed, 7 insertions(+), 2307 deletions(-) delete mode 100644 media/logos/legacy/arch-legacy-aqua-blue.png delete mode 100644 media/logos/legacy/arch-legacy-aqua-blue.svg delete mode 100644 media/logos/legacy/arch-legacy-aqua-white.png delete mode 100644 media/logos/legacy/arch-legacy-aqua-white.svg delete mode 100644 media/logos/legacy/arch-legacy-aqua.png delete mode 100644 media/logos/legacy/arch-legacy-aqua.svg delete mode 100644 media/logos/legacy/arch-legacy-blue1.png delete mode 100644 media/logos/legacy/arch-legacy-blue1.svg delete mode 100644 media/logos/legacy/arch-legacy-blue2.png delete mode 100644 media/logos/legacy/arch-legacy-blue2.svg delete mode 100644 media/logos/legacy/arch-legacy-noodle-blue.png delete mode 100644 media/logos/legacy/arch-legacy-noodle-blue.svg delete mode 100644 media/logos/legacy/arch-legacy-noodle-box.png delete mode 100644 media/logos/legacy/arch-legacy-noodle-box.svg delete mode 100644 media/logos/legacy/arch-legacy-noodle-cup.png delete mode 100644 media/logos/legacy/arch-legacy-noodle-cup.svg delete mode 100644 media/logos/legacy/arch-legacy-noodle-white.png delete mode 100644 media/logos/legacy/arch-legacy-noodle-white.svg delete mode 100644 media/logos/legacy/arch-legacy-ribbon1.png delete mode 100644 media/logos/legacy/arch-legacy-ribbon2.png delete mode 100644 media/logos/legacy/arch-legacy-ribbon3.png delete mode 100644 media/logos/legacy/arch-legacy-ribbon4.png delete mode 100644 media/logos/legacy/arch-legacy-ribbon5.png delete mode 100644 media/logos/legacy/arch-legacy-ribbon6.png delete mode 100644 media/logos/legacy/arch-legacy-wombat-lg.png delete mode 100644 media/logos/legacy/arch-legacy-wombat.png diff --git a/media/logos/legacy/arch-legacy-aqua-blue.png b/media/logos/legacy/arch-legacy-aqua-blue.png deleted file mode 100644 index 9637ce72..00000000 Binary files a/media/logos/legacy/arch-legacy-aqua-blue.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-aqua-blue.svg b/media/logos/legacy/arch-legacy-aqua-blue.svg deleted file mode 100644 index f4c80109..00000000 --- a/media/logos/legacy/arch-legacy-aqua-blue.svg +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-aqua-white.png b/media/logos/legacy/arch-legacy-aqua-white.png deleted file mode 100644 index 25fe9001..00000000 Binary files a/media/logos/legacy/arch-legacy-aqua-white.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-aqua-white.svg b/media/logos/legacy/arch-legacy-aqua-white.svg deleted file mode 100644 index 60b554fa..00000000 --- a/media/logos/legacy/arch-legacy-aqua-white.svg +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-aqua.png b/media/logos/legacy/arch-legacy-aqua.png deleted file mode 100644 index 881e1709..00000000 Binary files a/media/logos/legacy/arch-legacy-aqua.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-aqua.svg b/media/logos/legacy/arch-legacy-aqua.svg deleted file mode 100644 index 30860912..00000000 --- a/media/logos/legacy/arch-legacy-aqua.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - \ No newline at end of file diff --git a/media/logos/legacy/arch-legacy-blue1.png b/media/logos/legacy/arch-legacy-blue1.png deleted file mode 100644 index 3ed6c248..00000000 Binary files a/media/logos/legacy/arch-legacy-blue1.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-blue1.svg b/media/logos/legacy/arch-legacy-blue1.svg deleted file mode 100644 index 5a6f2c71..00000000 --- a/media/logos/legacy/arch-legacy-blue1.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-blue2.png b/media/logos/legacy/arch-legacy-blue2.png deleted file mode 100644 index 8b5b791e..00000000 Binary files a/media/logos/legacy/arch-legacy-blue2.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-blue2.svg b/media/logos/legacy/arch-legacy-blue2.svg deleted file mode 100644 index 48b28338..00000000 --- a/media/logos/legacy/arch-legacy-blue2.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-noodle-blue.png b/media/logos/legacy/arch-legacy-noodle-blue.png deleted file mode 100644 index b24d34cf..00000000 Binary files a/media/logos/legacy/arch-legacy-noodle-blue.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-noodle-blue.svg b/media/logos/legacy/arch-legacy-noodle-blue.svg deleted file mode 100644 index 7b6485b8..00000000 --- a/media/logos/legacy/arch-legacy-noodle-blue.svg +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-noodle-box.png b/media/logos/legacy/arch-legacy-noodle-box.png deleted file mode 100644 index 1162ed64..00000000 Binary files a/media/logos/legacy/arch-legacy-noodle-box.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-noodle-box.svg b/media/logos/legacy/arch-legacy-noodle-box.svg deleted file mode 100644 index 8f17f00a..00000000 --- a/media/logos/legacy/arch-legacy-noodle-box.svg +++ /dev/null @@ -1,775 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-noodle-cup.png b/media/logos/legacy/arch-legacy-noodle-cup.png deleted file mode 100644 index b4f93078..00000000 Binary files a/media/logos/legacy/arch-legacy-noodle-cup.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-noodle-cup.svg b/media/logos/legacy/arch-legacy-noodle-cup.svg deleted file mode 100644 index 8d6a0442..00000000 --- a/media/logos/legacy/arch-legacy-noodle-cup.svg +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-noodle-white.png b/media/logos/legacy/arch-legacy-noodle-white.png deleted file mode 100644 index a12ee21c..00000000 Binary files a/media/logos/legacy/arch-legacy-noodle-white.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-noodle-white.svg b/media/logos/legacy/arch-legacy-noodle-white.svg deleted file mode 100644 index 03e1b15a..00000000 --- a/media/logos/legacy/arch-legacy-noodle-white.svg +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media/logos/legacy/arch-legacy-ribbon1.png b/media/logos/legacy/arch-legacy-ribbon1.png deleted file mode 100644 index fb8e7720..00000000 Binary files a/media/logos/legacy/arch-legacy-ribbon1.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-ribbon2.png b/media/logos/legacy/arch-legacy-ribbon2.png deleted file mode 100644 index 66635999..00000000 Binary files a/media/logos/legacy/arch-legacy-ribbon2.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-ribbon3.png b/media/logos/legacy/arch-legacy-ribbon3.png deleted file mode 100644 index c3c00b85..00000000 Binary files a/media/logos/legacy/arch-legacy-ribbon3.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-ribbon4.png b/media/logos/legacy/arch-legacy-ribbon4.png deleted file mode 100644 index 33a78edf..00000000 Binary files a/media/logos/legacy/arch-legacy-ribbon4.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-ribbon5.png b/media/logos/legacy/arch-legacy-ribbon5.png deleted file mode 100644 index abf7cce4..00000000 Binary files a/media/logos/legacy/arch-legacy-ribbon5.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-ribbon6.png b/media/logos/legacy/arch-legacy-ribbon6.png deleted file mode 100644 index 9f275f22..00000000 Binary files a/media/logos/legacy/arch-legacy-ribbon6.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-wombat-lg.png b/media/logos/legacy/arch-legacy-wombat-lg.png deleted file mode 100644 index 0661b6f5..00000000 Binary files a/media/logos/legacy/arch-legacy-wombat-lg.png and /dev/null differ diff --git a/media/logos/legacy/arch-legacy-wombat.png b/media/logos/legacy/arch-legacy-wombat.png deleted file mode 100644 index 67e1afac..00000000 Binary files a/media/logos/legacy/arch-legacy-wombat.png and /dev/null differ diff --git a/templates/public/download.html b/templates/public/download.html index 64ee6b5a..30b2abad 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -96,8 +96,11 @@ +{% comment %}

Get Parabola on CD

+ +

The following suppliers donate a portion of their proceeds to the Parabola project:

@@ -114,7 +117,7 @@
  • Purchase a CD from LinuxCD
  • - +{% endcomment %}

    HTTP/FTP Direct Downloads

    diff --git a/urls.py b/urls.py index 1f8bc7a6..886cd375 100644 --- a/urls.py +++ b/urls.py @@ -125,11 +125,8 @@ urlpatterns = patterns('', # Some django internals we use (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'), +# Static content + (r'^media/(.*)$', 'django.views.static.serve', {'document_root': settings.DEPLOY_PATH+'/media'}) ) - -if settings.DEBUG == True: - urlpatterns += patterns('', - (r'^media/(.*)$', 'django.views.static.serve', - {'document_root': settings.DEPLOY_PATH+'/media'})) - + # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b