From cd4d5d300961a8f05061366f6629b38b0d3512d5 Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Mon, 29 Aug 2011 17:41:35 -0700
Subject: [PATCH 1/2] Refactored openstack-dashboard to use Django 1.3's
 contrib.staticfiles app as per current best-practices. This bumps the minimum
 required version of Django to 1.3 and introduces a backwards-incompatible
 change for any third-party code that relied on hard-coded paths to the media
 directory.

---
 openstack-dashboard/dashboard/settings.py     |  12 ++++-
 .../dashboard/css/Anivers_Regular-webfont.eot | Bin
 .../dashboard/css/Anivers_Regular-webfont.svg |   0
 .../dashboard/css/Anivers_Regular-webfont.ttf | Bin
 .../css/Anivers_Regular-webfont.woff          | Bin
 .../static}/dashboard/css/Treemap.css         |   0
 .../static}/dashboard/css/base.css            |   0
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin
 .../images/ui-bg_flat_15_cd0a0a_40x100.png    | Bin
 .../images/ui-bg_glass_100_e4f1fb_1x400.png   | Bin
 .../images/ui-bg_glass_50_3baae3_1x400.png    | Bin
 .../images/ui-bg_glass_80_d7ebf9_1x400.png    | Bin
 .../ui-bg_highlight-hard_100_f2f5f7_1x100.png | Bin
 .../ui-bg_highlight-hard_70_000000_1x100.png  | Bin
 .../ui-bg_highlight-soft_100_deedf7_1x100.png | Bin
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png  | Bin
 .../images/ui-icons_2694e8_256x240.png        | Bin
 .../images/ui-icons_2e83ff_256x240.png        | Bin
 .../images/ui-icons_3d80b3_256x240.png        | Bin
 .../images/ui-icons_72a7cf_256x240.png        | Bin
 .../images/ui-icons_ffffff_256x240.png        | Bin
 .../css/cupertino/jquery-ui-1.7.2.custom.css  |   0
 .../dashboard/css/django-admin-widgets.css    |  48 +++++++++---------
 .../static}/dashboard/css/ie7.css             |   0
 .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png    | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png    | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    | Bin
 .../images/ui-bg_glass_75_ffffff_1x400.png    | Bin
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  | Bin
 .../ui-bg_inset-soft_95_fef1ec_1x100.png      | Bin
 .../css/images/ui-icons_222222_256x240.png    | Bin
 .../css/images/ui-icons_2e83ff_256x240.png    | Bin
 .../css/images/ui-icons_454545_256x240.png    | Bin
 .../css/images/ui-icons_888888_256x240.png    | Bin
 .../css/images/ui-icons_cd0a0a_256x240.png    | Bin
 .../dashboard/css/jquery-ui-1.8.13.custom.css |   0
 .../static}/dashboard/css/openstack.css       |   6 +--
 .../static}/dashboard/css/reset.css           |   0
 .../static}/dashboard/css/style.css           |   0
 .../static}/dashboard/images/body_bg.gif      | Bin
 .../static}/dashboard/images/body_bg.png      | Bin
 .../static}/dashboard/images/book_icon.png    | Bin
 .../static}/dashboard/images/bread_crumb.gif  | Bin
 .../static}/dashboard/images/btn_bg.png       | Bin
 .../dashboard/images/button/btn_left.png      | Bin
 .../dashboard/images/button/btn_right.png     | Bin
 .../dashboard/images/button/launch.png        | Bin
 .../static}/dashboard/images/chat_icon.png    | Bin
 .../static}/dashboard/images/content_bg.gif   | Bin
 .../static}/dashboard/images/content_bg.png   | Bin
 .../dashboard/images/content_shadow.png       | Bin
 .../static}/dashboard/images/dashblock_bg.png | Bin
 .../dashboard/images/dashboard_nav_bg.png     | Bin
 .../static}/dashboard/images/drop_arrow.png   | Bin
 .../static}/dashboard/images/foot_back.png    | Bin
 .../static}/dashboard/images/gears.png        | Bin
 .../static}/dashboard/images/header_bg.png    | Bin
 .../dashboard/images/home_head_back.png       | Bin
 .../static}/dashboard/images/image_detail.png | Bin
 .../static}/dashboard/images/large_logo.png   | Bin
 .../dashboard/images/logged_in_box_bg.gif     | Bin
 .../static}/dashboard/images/login_bg.png     | Bin
 .../static}/dashboard/images/login_btn.png    | Bin
 .../static}/dashboard/images/logo.gif         | Bin
 .../static}/dashboard/images/logo.png         | Bin
 .../static}/dashboard/images/logo_new.png     | Bin
 .../static}/dashboard/images/misc_bg.png      | Bin
 .../static}/dashboard/images/modal_btn.png    | Bin
 .../static}/dashboard/images/nav_arrow.png    | Bin
 .../static}/dashboard/images/nav_bg.png       | Bin
 .../dashboard/images/nav_highlight.png        | Bin
 .../static}/dashboard/images/page_header.png  | Bin
 .../static}/dashboard/images/projects_bg.png  | Bin
 .../static}/dashboard/images/refresh.png      | Bin
 .../static}/dashboard/images/search.png       | Bin
 .../static}/dashboard/images/server_icon.png  | Bin
 .../static}/dashboard/images/spinner.gif      | Bin
 .../dashboard/images/status_sprite.png        | Bin
 .../dashboard/images/steps_left_bg.png        | Bin
 .../dashboard/images/steps_right_bg.png       | Bin
 .../dashboard/images/sub-head-back.png        | Bin
 .../dashboard/images/sub_head_back.png        | Bin
 .../dashboard/images/table_header_bg.png      | Bin
 .../dashboard/images/table_heading_bg.png     | Bin
 .../images/title-blank-short-foot.png         | Bin
 .../static}/dashboard/js/application.js       |   0
 .../static}/dashboard/js/dashboard.js         |   0
 .../static}/dashboard/js/data.json            |   0
 .../dashboard/js/django-admin.multiselect.js  |   0
 .../static}/dashboard/js/form_examples.js     |   0
 .../static}/dashboard/js/jit-yc.js            |   0
 .../static}/dashboard/js/jquery-ui.min.js     |   0
 .../dashboard/js/jquery.example.min.js        |   0
 .../static}/dashboard/js/jquery.form.js       |   0
 .../static}/dashboard/js/jquery.masonry.js    |   0
 .../static}/dashboard/js/jquery.min.js        |   0
 .../dashboard/js/jquery.quicksearch.js        |   0
 .../static}/dashboard/js/old-application.js   |   0
 .../static}/dashboard/js/treemap-stuff.js     |   0
 .../templates/_syspanel_image_list.html       |   4 +-
 .../dashboard/templates/base.html             |  14 ++---
 .../dashboard/templates/splash.html           |   8 +--
 .../dashboard/templates/switch_tenants.html   |   2 +-
 openstack-dashboard/dashboard/urls.py         |  16 +++---
 openstack-dashboard/setup.py                  |   2 +-
 107 files changed, 61 insertions(+), 51 deletions(-)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.eot (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.svg (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.ttf (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.woff (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Treemap.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/base.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/django-admin-widgets.css (84%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/ie7.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_222222_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_2e83ff_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_454545_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_888888_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_cd0a0a_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/jquery-ui-1.8.13.custom.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/openstack.css (98%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/reset.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/style.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/body_bg.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/body_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/book_icon.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/bread_crumb.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/btn_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/button/btn_left.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/button/btn_right.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/button/launch.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/chat_icon.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/content_bg.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/content_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/content_shadow.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/dashblock_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/dashboard_nav_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/drop_arrow.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/foot_back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/gears.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/header_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/home_head_back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/image_detail.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/large_logo.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logged_in_box_bg.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/login_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/login_btn.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logo.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logo.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logo_new.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/misc_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/modal_btn.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/nav_arrow.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/nav_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/nav_highlight.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/page_header.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/projects_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/refresh.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/search.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/server_icon.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/spinner.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/status_sprite.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/steps_left_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/steps_right_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/sub-head-back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/sub_head_back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/table_header_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/table_heading_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/title-blank-short-foot.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/application.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/dashboard.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/data.json (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/django-admin.multiselect.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/form_examples.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jit-yc.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery-ui.min.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.example.min.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.form.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.masonry.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.min.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.quicksearch.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/old-application.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/treemap-stuff.js (100%)

diff --git a/openstack-dashboard/dashboard/settings.py b/openstack-dashboard/dashboard/settings.py
index 5b8bd78fa..3aae00908 100644
--- a/openstack-dashboard/dashboard/settings.py
+++ b/openstack-dashboard/dashboard/settings.py
@@ -37,9 +37,11 @@ ENABLE_VNC = True
 LOGIN_URL = '/auth/login'
 LOGIN_REDIRECT_URL = '/'
 
-MEDIA_ROOT = os.path.join(ROOT_PATH, '..', 'media')
+MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
 MEDIA_URL = '/media/'
-ADMIN_MEDIA_PREFIX = '/media/admin/'
+STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
+STATIC_URL = '/static/'
+ADMIN_MEDIA_PREFIX = '/static/admin/'
 
 CREDENTIAL_AUTHORIZATION_DAYS = '5'
 
@@ -61,6 +63,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.i18n',
     'django.core.context_processors.request',
     'django.core.context_processors.media',
+    'django.core.context_processors.static',
     'django.contrib.messages.context_processors.messages',
     'django_openstack.context_processors.swift',
     'django_openstack.context_processors.tenants',
@@ -75,11 +78,16 @@ TEMPLATE_DIRS = (
     os.path.join(ROOT_PATH, 'templates'),
 )
 
+STATICFILES_DIRS = (
+    os.path.join(ROOT_PATH, 'static'),
+)
+
 INSTALLED_APPS = (
     'dashboard',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
+    'django.contrib.staticfiles',
     'django_openstack',
     'django_openstack.templatetags',
     'mailer',
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.eot b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.eot
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.eot
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.eot
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.svg b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.svg
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.svg
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.svg
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.ttf b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.ttf
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.ttf
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.ttf
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.woff b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.woff
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.woff
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.woff
diff --git a/openstack-dashboard/media/dashboard/css/Treemap.css b/openstack-dashboard/dashboard/static/dashboard/css/Treemap.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Treemap.css
rename to openstack-dashboard/dashboard/static/dashboard/css/Treemap.css
diff --git a/openstack-dashboard/media/dashboard/css/base.css b/openstack-dashboard/dashboard/static/dashboard/css/base.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/base.css
rename to openstack-dashboard/dashboard/static/dashboard/css/base.css
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css
diff --git a/openstack-dashboard/media/dashboard/css/django-admin-widgets.css b/openstack-dashboard/dashboard/static/dashboard/css/django-admin-widgets.css
similarity index 84%
rename from openstack-dashboard/media/dashboard/css/django-admin-widgets.css
rename to openstack-dashboard/dashboard/static/dashboard/css/django-admin-widgets.css
index 43521be0f..2d4a6de3f 100644
--- a/openstack-dashboard/media/dashboard/css/django-admin-widgets.css
+++ b/openstack-dashboard/dashboard/static/dashboard/css/django-admin-widgets.css
@@ -5,10 +5,10 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    1. Redistributions of source code must retain the above copyright notice, 
+    1. Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    
-    2. Redistributions in binary form must reproduce the above copyright 
+
+    2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
@@ -48,12 +48,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 .selector-available h2, .selector-chosen h2 {
     border: 1px solid #ccc;
-    background: #C9DBED url(/media/admin/img/admin/default-bg.gif) bottom left repeat-x;
+    background: #C9DBED url(../admin/img/admin/default-bg.gif) bottom left repeat-x;
     color: #fff;
 }
 
 .selector .selector-available h2 {
-    background: white url(/media/admin/img/admin/nav-bg.gif) bottom left repeat-x;
+    background: white url(../admin/img/admin/nav-bg.gif) bottom left repeat-x;
     color: #666;
 }
 
@@ -80,7 +80,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     float: left;
     width: 22px;
     height: 50px;
-    background: url(/media/admin/img/admin/chooser-bg.gif) top center no-repeat;
+    background: url(../admin/img/admin/chooser-bg.gif) top center no-repeat;
     margin: 8em 3px 0 3px;
     padding: 0;
 }
@@ -104,12 +104,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 }
 
 .selector-add {
-    background: url(/media/admin/img/admin/selector-add.gif) top center no-repeat;
+    background: url(../admin/img/admin/selector-add.gif) top center no-repeat;
     margin-bottom: 2px;
 }
 
 .selector-remove {
-    background: url(/media/admin/img/admin/selector-remove.gif) top center no-repeat;
+    background: url(../admin/img/admin/selector-remove.gif) top center no-repeat;
 }
 
 a.selector-chooseall, a.selector-clearall {
@@ -129,11 +129,11 @@ a.selector-chooseall:hover, a.selector-clearall:hover {
 
 a.selector-chooseall {
     width: 7em;
-    background: url(/media/admin/img/admin/selector-addall.gif) left center no-repeat;
+    background: url(../admin/img/admin/selector-addall.gif) left center no-repeat;
 }
 
 a.selector-clearall {
-    background: url(/media/admin/img/admin/selector-removeall.gif) left center no-repeat;
+    background: url(../admin/img/admin/selector-removeall.gif) left center no-repeat;
 }
 
 
@@ -165,7 +165,7 @@ a.selector-clearall {
     height: 22px;
     width: 50px;
     margin: 0 0 3px 40%;
-    background: url(/media/admin/img/admin/chooser_stacked-bg.gif) top center no-repeat;
+    background: url(../admin/img/admin/chooser_stacked-bg.gif) top center no-repeat;
 }
 
 .stacked .selector-chooser li {
@@ -178,11 +178,11 @@ a.selector-clearall {
 }
 
 .stacked .selector-add {
-    background-image: url(/media/admin/img/admin/selector_stacked-add.gif);
+    background-image: url(../admin/img/admin/selector_stacked-add.gif);
 }
 
 .stacked .selector-remove {
-    background-image: url(/media/admin/img/admin/selector_stacked-remove.gif);
+    background-image: url(../admin/img/admin/selector_stacked-remove.gif);
 }
 
 
@@ -269,7 +269,7 @@ p.file-upload {
     color: #666;
     padding: 2px 3px;
     text-align: center;
-    background: #e1e1e1 url(/media/admin/img/admin/nav-bg.gif) 0 50% repeat-x;
+    background: #e1e1e1 url(../admin/img/admin/nav-bg.gif) 0 50% repeat-x;
     border-bottom: 1px solid #ddd;
 }
 
@@ -337,7 +337,7 @@ p.file-upload {
     position: absolute;
     font-weight: bold;
     font-size: 12px;
-    background: #C9DBED url(/media/admin/img/admin/default-bg.gif) bottom left repeat-x;
+    background: #C9DBED url(../admin/img/admin/default-bg.gif) bottom left repeat-x;
     padding: 1px 4px 2px 4px;
     color: white;
 }
@@ -360,7 +360,7 @@ p.file-upload {
     margin: 0 !important;
     padding: 0;
     font-size: 10px;
-    background: #e1e1e1 url(/media/admin/img/admin/nav-bg.gif) 0 50% repeat-x;
+    background: #e1e1e1 url(../admin/img/admin/nav-bg.gif) 0 50% repeat-x;
     border-top: 1px solid #ddd;
 }
 
@@ -397,7 +397,7 @@ ul.orderer li {
     border-width: 0 1px 1px 0;
     white-space: nowrap;
     overflow: hidden;
-    background: #e2e2e2 url(/media/admin/img/admin/nav-bg-grabber.gif) repeat-y;
+    background: #e2e2e2 url(../admin/img/admin/nav-bg-grabber.gif) repeat-y;
 }
 
 ul.orderer li:hover {
@@ -429,7 +429,7 @@ ul.orderer li.selected {
 }
 
 ul.orderer li.deleted {
-    background: #bbb url(/media/admin/img/admin/deleted-overlay.gif);
+    background: #bbb url(../admin/img/admin/deleted-overlay.gif);
 }
 
 ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited {
@@ -437,7 +437,7 @@ ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited {
 }
 
 ul.orderer li.deleted .inline-deletelink {
-    background-image: url(/media/admin/img/admin/inline-restore.png);
+    background-image: url(../admin/img/admin/inline-restore.png);
 }
 
 ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
@@ -449,7 +449,7 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
 .inline-deletelink {
     display: block;
     text-indent: -9999px;
-    background: transparent url(/media/admin/img/admin/inline-delete.png) no-repeat;
+    background: transparent url(../admin/img/admin/inline-delete.png) no-repeat;
     width: 15px;
     height: 15px;
     margin: 0.4em 0;
@@ -488,11 +488,11 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
 }
 
 .editinline tr.deleted {
-    background: #ddd url(/media/admin/img/admin/deleted-overlay.gif);
+    background: #ddd url(../admin/img/admin/deleted-overlay.gif);
 }
 
 .editinline tr.deleted .inline-deletelink {
-    background-image: url(/media/admin/img/admin/inline-restore.png);
+    background-image: url(../admin/img/admin/inline-restore.png);
 }
 
 .editinline tr.deleted td:hover {
@@ -523,13 +523,13 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
 .editinline-stacked .inline-splitter {
     float: left;
     width: 9px;
-    background: #f8f8f8 url(/media/admin/img/admin/inline-splitter-bg.gif) 50% 50% no-repeat;
+    background: #f8f8f8 url(../admin/img/admin/inline-splitter-bg.gif) 50% 50% no-repeat;
     border-right: 1px solid #ccc;
 }
 
 .editinline-stacked .controls {
     clear: both;
-    background: #e1e1e1 url(/media/admin/img/admin/nav-bg.gif) top left repeat-x;
+    background: #e1e1e1 url(../admin/img/admin/nav-bg.gif) top left repeat-x;
     padding: 3px 4px;
     font-size: 11px;
     border-top: 1px solid #ddd;
diff --git a/openstack-dashboard/media/dashboard/css/ie7.css b/openstack-dashboard/dashboard/static/dashboard/css/ie7.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/ie7.css
rename to openstack-dashboard/dashboard/static/dashboard/css/ie7.css
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_222222_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_222222_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_222222_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_222222_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_2e83ff_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_2e83ff_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_2e83ff_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_454545_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_454545_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_454545_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_454545_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_888888_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_888888_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_888888_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_888888_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_cd0a0a_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_cd0a0a_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/jquery-ui-1.8.13.custom.css b/openstack-dashboard/dashboard/static/dashboard/css/jquery-ui-1.8.13.custom.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/jquery-ui-1.8.13.custom.css
rename to openstack-dashboard/dashboard/static/dashboard/css/jquery-ui-1.8.13.custom.css
diff --git a/openstack-dashboard/media/dashboard/css/openstack.css b/openstack-dashboard/dashboard/static/dashboard/css/openstack.css
similarity index 98%
rename from openstack-dashboard/media/dashboard/css/openstack.css
rename to openstack-dashboard/dashboard/static/dashboard/css/openstack.css
index 3abdddaa2..b4c47133c 100644
--- a/openstack-dashboard/media/dashboard/css/openstack.css
+++ b/openstack-dashboard/dashboard/static/dashboard/css/openstack.css
@@ -165,7 +165,7 @@ p .ui-icon {
 
 #content.home #projects a	{
 	display: block;
-	background: url(/media/dashboard/img/server_icon.png) no-repeat 13px 9px;
+	background: url(../img/server_icon.png) no-repeat 13px 9px;
 	padding: 5px 0 5px 58px;
 	font-weight: bold;
 }
@@ -213,7 +213,7 @@ span.data {
 #home_login input[type="submit"], #lnk_register {
 	float: right;
 	height: 31px;
-	background: url(/media/dashboard/img/login_btn.png) top left repeat-x;
+	background: url(../img/login_btn.png) top left repeat-x;
 	border: 1px solid #206cb5;
 	color: #fff;
 	font-weight: bold;
@@ -508,7 +508,7 @@ td.detail_wrapper {
 
 }
 div.image_detail, div.instance_detail {
-	background: url(/media/dashboard/img/image_detail.png) top left no-repeat;
+	background: url(../img/image_detail.png) top left no-repeat;
 	height: 90px;
 	width: 674px;
 	padding: 8px 8px 16px 8px;
diff --git a/openstack-dashboard/media/dashboard/css/reset.css b/openstack-dashboard/dashboard/static/dashboard/css/reset.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/reset.css
rename to openstack-dashboard/dashboard/static/dashboard/css/reset.css
diff --git a/openstack-dashboard/media/dashboard/css/style.css b/openstack-dashboard/dashboard/static/dashboard/css/style.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/style.css
rename to openstack-dashboard/dashboard/static/dashboard/css/style.css
diff --git a/openstack-dashboard/media/dashboard/images/body_bg.gif b/openstack-dashboard/dashboard/static/dashboard/images/body_bg.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/body_bg.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/body_bg.gif
diff --git a/openstack-dashboard/media/dashboard/images/body_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/body_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/body_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/body_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/book_icon.png b/openstack-dashboard/dashboard/static/dashboard/images/book_icon.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/book_icon.png
rename to openstack-dashboard/dashboard/static/dashboard/images/book_icon.png
diff --git a/openstack-dashboard/media/dashboard/images/bread_crumb.gif b/openstack-dashboard/dashboard/static/dashboard/images/bread_crumb.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/bread_crumb.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/bread_crumb.gif
diff --git a/openstack-dashboard/media/dashboard/images/btn_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/btn_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/btn_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/btn_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/button/btn_left.png b/openstack-dashboard/dashboard/static/dashboard/images/button/btn_left.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/button/btn_left.png
rename to openstack-dashboard/dashboard/static/dashboard/images/button/btn_left.png
diff --git a/openstack-dashboard/media/dashboard/images/button/btn_right.png b/openstack-dashboard/dashboard/static/dashboard/images/button/btn_right.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/button/btn_right.png
rename to openstack-dashboard/dashboard/static/dashboard/images/button/btn_right.png
diff --git a/openstack-dashboard/media/dashboard/images/button/launch.png b/openstack-dashboard/dashboard/static/dashboard/images/button/launch.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/button/launch.png
rename to openstack-dashboard/dashboard/static/dashboard/images/button/launch.png
diff --git a/openstack-dashboard/media/dashboard/images/chat_icon.png b/openstack-dashboard/dashboard/static/dashboard/images/chat_icon.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/chat_icon.png
rename to openstack-dashboard/dashboard/static/dashboard/images/chat_icon.png
diff --git a/openstack-dashboard/media/dashboard/images/content_bg.gif b/openstack-dashboard/dashboard/static/dashboard/images/content_bg.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/content_bg.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/content_bg.gif
diff --git a/openstack-dashboard/media/dashboard/images/content_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/content_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/content_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/content_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/content_shadow.png b/openstack-dashboard/dashboard/static/dashboard/images/content_shadow.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/content_shadow.png
rename to openstack-dashboard/dashboard/static/dashboard/images/content_shadow.png
diff --git a/openstack-dashboard/media/dashboard/images/dashblock_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/dashblock_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/dashblock_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/dashblock_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/dashboard_nav_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/dashboard_nav_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/dashboard_nav_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/dashboard_nav_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/drop_arrow.png b/openstack-dashboard/dashboard/static/dashboard/images/drop_arrow.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/drop_arrow.png
rename to openstack-dashboard/dashboard/static/dashboard/images/drop_arrow.png
diff --git a/openstack-dashboard/media/dashboard/images/foot_back.png b/openstack-dashboard/dashboard/static/dashboard/images/foot_back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/foot_back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/foot_back.png
diff --git a/openstack-dashboard/media/dashboard/images/gears.png b/openstack-dashboard/dashboard/static/dashboard/images/gears.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/gears.png
rename to openstack-dashboard/dashboard/static/dashboard/images/gears.png
diff --git a/openstack-dashboard/media/dashboard/images/header_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/header_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/header_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/header_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/home_head_back.png b/openstack-dashboard/dashboard/static/dashboard/images/home_head_back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/home_head_back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/home_head_back.png
diff --git a/openstack-dashboard/media/dashboard/images/image_detail.png b/openstack-dashboard/dashboard/static/dashboard/images/image_detail.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/image_detail.png
rename to openstack-dashboard/dashboard/static/dashboard/images/image_detail.png
diff --git a/openstack-dashboard/media/dashboard/images/large_logo.png b/openstack-dashboard/dashboard/static/dashboard/images/large_logo.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/large_logo.png
rename to openstack-dashboard/dashboard/static/dashboard/images/large_logo.png
diff --git a/openstack-dashboard/media/dashboard/images/logged_in_box_bg.gif b/openstack-dashboard/dashboard/static/dashboard/images/logged_in_box_bg.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logged_in_box_bg.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/logged_in_box_bg.gif
diff --git a/openstack-dashboard/media/dashboard/images/login_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/login_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/login_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/login_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/login_btn.png b/openstack-dashboard/dashboard/static/dashboard/images/login_btn.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/login_btn.png
rename to openstack-dashboard/dashboard/static/dashboard/images/login_btn.png
diff --git a/openstack-dashboard/media/dashboard/images/logo.gif b/openstack-dashboard/dashboard/static/dashboard/images/logo.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logo.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/logo.gif
diff --git a/openstack-dashboard/media/dashboard/images/logo.png b/openstack-dashboard/dashboard/static/dashboard/images/logo.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logo.png
rename to openstack-dashboard/dashboard/static/dashboard/images/logo.png
diff --git a/openstack-dashboard/media/dashboard/images/logo_new.png b/openstack-dashboard/dashboard/static/dashboard/images/logo_new.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logo_new.png
rename to openstack-dashboard/dashboard/static/dashboard/images/logo_new.png
diff --git a/openstack-dashboard/media/dashboard/images/misc_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/misc_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/misc_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/misc_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/modal_btn.png b/openstack-dashboard/dashboard/static/dashboard/images/modal_btn.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/modal_btn.png
rename to openstack-dashboard/dashboard/static/dashboard/images/modal_btn.png
diff --git a/openstack-dashboard/media/dashboard/images/nav_arrow.png b/openstack-dashboard/dashboard/static/dashboard/images/nav_arrow.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/nav_arrow.png
rename to openstack-dashboard/dashboard/static/dashboard/images/nav_arrow.png
diff --git a/openstack-dashboard/media/dashboard/images/nav_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/nav_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/nav_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/nav_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/nav_highlight.png b/openstack-dashboard/dashboard/static/dashboard/images/nav_highlight.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/nav_highlight.png
rename to openstack-dashboard/dashboard/static/dashboard/images/nav_highlight.png
diff --git a/openstack-dashboard/media/dashboard/images/page_header.png b/openstack-dashboard/dashboard/static/dashboard/images/page_header.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/page_header.png
rename to openstack-dashboard/dashboard/static/dashboard/images/page_header.png
diff --git a/openstack-dashboard/media/dashboard/images/projects_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/projects_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/projects_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/projects_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/refresh.png b/openstack-dashboard/dashboard/static/dashboard/images/refresh.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/refresh.png
rename to openstack-dashboard/dashboard/static/dashboard/images/refresh.png
diff --git a/openstack-dashboard/media/dashboard/images/search.png b/openstack-dashboard/dashboard/static/dashboard/images/search.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/search.png
rename to openstack-dashboard/dashboard/static/dashboard/images/search.png
diff --git a/openstack-dashboard/media/dashboard/images/server_icon.png b/openstack-dashboard/dashboard/static/dashboard/images/server_icon.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/server_icon.png
rename to openstack-dashboard/dashboard/static/dashboard/images/server_icon.png
diff --git a/openstack-dashboard/media/dashboard/images/spinner.gif b/openstack-dashboard/dashboard/static/dashboard/images/spinner.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/spinner.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/spinner.gif
diff --git a/openstack-dashboard/media/dashboard/images/status_sprite.png b/openstack-dashboard/dashboard/static/dashboard/images/status_sprite.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/status_sprite.png
rename to openstack-dashboard/dashboard/static/dashboard/images/status_sprite.png
diff --git a/openstack-dashboard/media/dashboard/images/steps_left_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/steps_left_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/steps_left_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/steps_left_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/steps_right_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/steps_right_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/steps_right_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/steps_right_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/sub-head-back.png b/openstack-dashboard/dashboard/static/dashboard/images/sub-head-back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/sub-head-back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/sub-head-back.png
diff --git a/openstack-dashboard/media/dashboard/images/sub_head_back.png b/openstack-dashboard/dashboard/static/dashboard/images/sub_head_back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/sub_head_back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/sub_head_back.png
diff --git a/openstack-dashboard/media/dashboard/images/table_header_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/table_header_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/table_header_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/table_header_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/table_heading_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/table_heading_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/table_heading_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/table_heading_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/title-blank-short-foot.png b/openstack-dashboard/dashboard/static/dashboard/images/title-blank-short-foot.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/title-blank-short-foot.png
rename to openstack-dashboard/dashboard/static/dashboard/images/title-blank-short-foot.png
diff --git a/openstack-dashboard/media/dashboard/js/application.js b/openstack-dashboard/dashboard/static/dashboard/js/application.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/application.js
rename to openstack-dashboard/dashboard/static/dashboard/js/application.js
diff --git a/openstack-dashboard/media/dashboard/js/dashboard.js b/openstack-dashboard/dashboard/static/dashboard/js/dashboard.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/dashboard.js
rename to openstack-dashboard/dashboard/static/dashboard/js/dashboard.js
diff --git a/openstack-dashboard/media/dashboard/js/data.json b/openstack-dashboard/dashboard/static/dashboard/js/data.json
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/data.json
rename to openstack-dashboard/dashboard/static/dashboard/js/data.json
diff --git a/openstack-dashboard/media/dashboard/js/django-admin.multiselect.js b/openstack-dashboard/dashboard/static/dashboard/js/django-admin.multiselect.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/django-admin.multiselect.js
rename to openstack-dashboard/dashboard/static/dashboard/js/django-admin.multiselect.js
diff --git a/openstack-dashboard/media/dashboard/js/form_examples.js b/openstack-dashboard/dashboard/static/dashboard/js/form_examples.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/form_examples.js
rename to openstack-dashboard/dashboard/static/dashboard/js/form_examples.js
diff --git a/openstack-dashboard/media/dashboard/js/jit-yc.js b/openstack-dashboard/dashboard/static/dashboard/js/jit-yc.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jit-yc.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jit-yc.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery-ui.min.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery-ui.min.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery-ui.min.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery-ui.min.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.example.min.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.example.min.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.example.min.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.example.min.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.form.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.form.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.form.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.form.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.masonry.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.masonry.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.masonry.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.masonry.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.min.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.min.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.min.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.min.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.quicksearch.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.quicksearch.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.quicksearch.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.quicksearch.js
diff --git a/openstack-dashboard/media/dashboard/js/old-application.js b/openstack-dashboard/dashboard/static/dashboard/js/old-application.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/old-application.js
rename to openstack-dashboard/dashboard/static/dashboard/js/old-application.js
diff --git a/openstack-dashboard/media/dashboard/js/treemap-stuff.js b/openstack-dashboard/dashboard/static/dashboard/js/treemap-stuff.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/treemap-stuff.js
rename to openstack-dashboard/dashboard/static/dashboard/js/treemap-stuff.js
diff --git a/openstack-dashboard/dashboard/templates/_syspanel_image_list.html b/openstack-dashboard/dashboard/templates/_syspanel_image_list.html
index aa7f17656..d308c2717 100644
--- a/openstack-dashboard/dashboard/templates/_syspanel_image_list.html
+++ b/openstack-dashboard/dashboard/templates/_syspanel_image_list.html
@@ -36,8 +36,8 @@
         <li><span>Kernel ID: </span>{{image.properties.kernel_id}}</li>
         <li><span>Ramdisk ID: </span>{{image.properties.ramdisk_id}}</li>
         <li><span>Architecture: </span>{{image.properties.architecture}}</li>
-        <li><span>Project ID: </span>{{image.properties.project_id}}</li>
-        <li><span>Container Format: </span>{{image.container_format}}</li>
+        <li><span>Project ID: </span>{{image.container_format}}</li>
+        <li><span>Container Format: </span>{{image.properties.project_id}}</li>
         <li><span>Disk Format: </span>{{image.disk_format}}</li>
       </ul>
     </td>
diff --git a/openstack-dashboard/dashboard/templates/base.html b/openstack-dashboard/dashboard/templates/base.html
index 162895182..fca71d2cb 100644
--- a/openstack-dashboard/dashboard/templates/base.html
+++ b/openstack-dashboard/dashboard/templates/base.html
@@ -4,13 +4,13 @@
   <head>
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <title>{% site_branding %} Dashboard{% block title %}{% endblock %}</title>
-    <script charset='utf-8' src='/media/dashboard/js/jquery.min.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/jquery-ui.min.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/jquery.quicksearch.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/jquery.example.min.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/form_examples.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/application.js' type='text/javascript'></script>
-    <link href='/media/dashboard/css/style.css' media='screen' rel='stylesheet' />
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery.min.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery-ui.min.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery.quicksearch.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery.example.min.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/form_examples.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/application.js' type='text/javascript'></script>
+    <link href='{{ STATIC_URL }}dashboard/css/style.css' media='screen' rel='stylesheet' />
     {% block headerjs %}{% endblock %}
     {% block headercss %}{% endblock %}
   </head>
diff --git a/openstack-dashboard/dashboard/templates/splash.html b/openstack-dashboard/dashboard/templates/splash.html
index 6e124e686..6c369bfae 100644
--- a/openstack-dashboard/dashboard/templates/splash.html
+++ b/openstack-dashboard/dashboard/templates/splash.html
@@ -3,19 +3,19 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>Login</title>
-    <link href='/media/dashboard/css/style.css' media='screen' rel='stylesheet' /> 
+    <link href='{{ STATIC_URL }}dashboard/css/style.css' media='screen' rel='stylesheet' />
   </head>
   <body id="standalone">
     <div id="login_wrapper">
       <div class='large-rounded' id='login'>
         {% include "_messages.html" %}
         {% include '_login.html' %}
-        <ul id='alternate_links'> 
+        <ul id='alternate_links'>
           <li>&nbsp;</li>
           <li>&nbsp;</li>
-        </ul> 
+        </ul>
         <div class="clear"></div>
-      </div> 
+      </div>
     </div>
   </body>
 </html>
diff --git a/openstack-dashboard/dashboard/templates/switch_tenants.html b/openstack-dashboard/dashboard/templates/switch_tenants.html
index 64ebeb767..c1b0e7c4b 100644
--- a/openstack-dashboard/dashboard/templates/switch_tenants.html
+++ b/openstack-dashboard/dashboard/templates/switch_tenants.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>Login</title>
-    <link href='/media/dashboard/css/style.css' media='screen' rel='stylesheet' />
+    <link href='{{ STATIC_URL }}dashboard/css/style.css' media='screen' rel='stylesheet' />
   </head>
   <body id="standalone">
     <div id="login_wrapper">
diff --git a/openstack-dashboard/dashboard/urls.py b/openstack-dashboard/dashboard/urls.py
index b3f552f80..57c401a37 100644
--- a/openstack-dashboard/dashboard/urls.py
+++ b/openstack-dashboard/dashboard/urls.py
@@ -23,7 +23,9 @@ URL patterns for the OpenStack Dashboard.
 """
 
 from django.conf.urls.defaults import *
+from django.conf.urls.static import static
 from django.conf import settings
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views import generic as generic_views
 import django.views.i18n
 
@@ -35,13 +37,13 @@ urlpatterns = patterns('',
     url(r'^syspanel/$', 'django_openstack.syspanel.views.instances.usage', name='syspanel_overview'),
 )
 
+# Development static app and project media serving using the staticfiles app.
+urlpatterns += staticfiles_urlpatterns()
+
+# Convenience function for serving user-uploaded media during
+# development. Only active if DEBUG==True and the URL prefix is a local
+# path. Production media should NOT be served by Django.
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # NOTE(termie): just append them since we want the routes at the root
 urlpatterns += django_openstack_urls.urlpatterns
-
-urlpatterns += patterns('',
-     (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
-      'django.views.static.serve',
-      {'document_root': settings.MEDIA_ROOT,
-       'show_indexes': True}),
- )
diff --git a/openstack-dashboard/setup.py b/openstack-dashboard/setup.py
index b6258f82c..6452308c9 100755
--- a/openstack-dashboard/setup.py
+++ b/openstack-dashboard/setup.py
@@ -7,7 +7,6 @@ def read(fname):
 
 dst = 'debian/openstack-dashboard/var/lib/dash'
 os.system('rm -rf %s' % dst)
-shutil.copytree('media', '%s/media' % dst)
 shutil.copytree('tools', '%s/tools' % dst)
 shutil.copytree('dashboard', '%s/dashboard' % dst)
 shutil.copytree('local', '%s/local' % dst)
@@ -29,6 +28,7 @@ setup(
 
     data_files = [],
     install_requires = ['setuptools', 'mox>=0.5.0'],
+    zip_safe = False,
     classifiers = [
         'Development Status :: 4 - Beta',
         'Framework :: Django',

From 841b064d880343e3f8a82836d4822ca0073e254b Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Mon, 29 Aug 2011 17:41:35 -0700
Subject: [PATCH 2/2] Refactored openstack-dashboard to use Django 1.3's
 contrib.staticfiles app as per current best-practices. This bumps the minimum
 required version of Django to 1.3 and introduces a backwards-incompatible
 change for any third-party code that relied on hard-coded paths to the media
 directory.

---
 openstack-dashboard/dashboard/settings.py     |  12 ++++-
 .../dashboard/css/Anivers_Regular-webfont.eot | Bin
 .../dashboard/css/Anivers_Regular-webfont.svg |   0
 .../dashboard/css/Anivers_Regular-webfont.ttf | Bin
 .../css/Anivers_Regular-webfont.woff          | Bin
 .../static}/dashboard/css/Treemap.css         |   0
 .../static}/dashboard/css/base.css            |   0
 .../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin
 .../images/ui-bg_flat_15_cd0a0a_40x100.png    | Bin
 .../images/ui-bg_glass_100_e4f1fb_1x400.png   | Bin
 .../images/ui-bg_glass_50_3baae3_1x400.png    | Bin
 .../images/ui-bg_glass_80_d7ebf9_1x400.png    | Bin
 .../ui-bg_highlight-hard_100_f2f5f7_1x100.png | Bin
 .../ui-bg_highlight-hard_70_000000_1x100.png  | Bin
 .../ui-bg_highlight-soft_100_deedf7_1x100.png | Bin
 .../ui-bg_highlight-soft_25_ffef8f_1x100.png  | Bin
 .../images/ui-icons_2694e8_256x240.png        | Bin
 .../images/ui-icons_2e83ff_256x240.png        | Bin
 .../images/ui-icons_3d80b3_256x240.png        | Bin
 .../images/ui-icons_72a7cf_256x240.png        | Bin
 .../images/ui-icons_ffffff_256x240.png        | Bin
 .../css/cupertino/jquery-ui-1.7.2.custom.css  |   0
 .../dashboard/css/django-admin-widgets.css    |  48 +++++++++---------
 .../static}/dashboard/css/ie7.css             |   0
 .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png    | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png    | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    | Bin
 .../images/ui-bg_glass_75_ffffff_1x400.png    | Bin
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  | Bin
 .../ui-bg_inset-soft_95_fef1ec_1x100.png      | Bin
 .../css/images/ui-icons_222222_256x240.png    | Bin
 .../css/images/ui-icons_2e83ff_256x240.png    | Bin
 .../css/images/ui-icons_454545_256x240.png    | Bin
 .../css/images/ui-icons_888888_256x240.png    | Bin
 .../css/images/ui-icons_cd0a0a_256x240.png    | Bin
 .../dashboard/css/jquery-ui-1.8.13.custom.css |   0
 .../static}/dashboard/css/openstack.css       |   6 +--
 .../static}/dashboard/css/reset.css           |   0
 .../static}/dashboard/css/style.css           |   0
 .../static}/dashboard/images/body_bg.gif      | Bin
 .../static}/dashboard/images/body_bg.png      | Bin
 .../static}/dashboard/images/book_icon.png    | Bin
 .../static}/dashboard/images/bread_crumb.gif  | Bin
 .../static}/dashboard/images/btn_bg.png       | Bin
 .../dashboard/images/button/btn_left.png      | Bin
 .../dashboard/images/button/btn_right.png     | Bin
 .../dashboard/images/button/launch.png        | Bin
 .../static}/dashboard/images/chat_icon.png    | Bin
 .../static}/dashboard/images/content_bg.gif   | Bin
 .../static}/dashboard/images/content_bg.png   | Bin
 .../dashboard/images/content_shadow.png       | Bin
 .../static}/dashboard/images/dashblock_bg.png | Bin
 .../dashboard/images/dashboard_nav_bg.png     | Bin
 .../static}/dashboard/images/drop_arrow.png   | Bin
 .../static}/dashboard/images/foot_back.png    | Bin
 .../static}/dashboard/images/gears.png        | Bin
 .../static}/dashboard/images/header_bg.png    | Bin
 .../dashboard/images/home_head_back.png       | Bin
 .../static}/dashboard/images/image_detail.png | Bin
 .../static}/dashboard/images/large_logo.png   | Bin
 .../dashboard/images/logged_in_box_bg.gif     | Bin
 .../static}/dashboard/images/login_bg.png     | Bin
 .../static}/dashboard/images/login_btn.png    | Bin
 .../static}/dashboard/images/logo.gif         | Bin
 .../static}/dashboard/images/logo.png         | Bin
 .../static}/dashboard/images/logo_new.png     | Bin
 .../static}/dashboard/images/misc_bg.png      | Bin
 .../static}/dashboard/images/modal_btn.png    | Bin
 .../static}/dashboard/images/nav_arrow.png    | Bin
 .../static}/dashboard/images/nav_bg.png       | Bin
 .../dashboard/images/nav_highlight.png        | Bin
 .../static}/dashboard/images/page_header.png  | Bin
 .../static}/dashboard/images/projects_bg.png  | Bin
 .../static}/dashboard/images/refresh.png      | Bin
 .../static}/dashboard/images/search.png       | Bin
 .../static}/dashboard/images/server_icon.png  | Bin
 .../static}/dashboard/images/spinner.gif      | Bin
 .../dashboard/images/status_sprite.png        | Bin
 .../dashboard/images/steps_left_bg.png        | Bin
 .../dashboard/images/steps_right_bg.png       | Bin
 .../dashboard/images/sub-head-back.png        | Bin
 .../dashboard/images/sub_head_back.png        | Bin
 .../dashboard/images/table_header_bg.png      | Bin
 .../dashboard/images/table_heading_bg.png     | Bin
 .../images/title-blank-short-foot.png         | Bin
 .../static}/dashboard/js/application.js       |   0
 .../static}/dashboard/js/dashboard.js         |   0
 .../static}/dashboard/js/data.json            |   0
 .../dashboard/js/django-admin.multiselect.js  |   0
 .../static}/dashboard/js/form_examples.js     |   0
 .../static}/dashboard/js/jit-yc.js            |   0
 .../static}/dashboard/js/jquery-ui.min.js     |   0
 .../dashboard/js/jquery.example.min.js        |   0
 .../static}/dashboard/js/jquery.form.js       |   0
 .../static}/dashboard/js/jquery.masonry.js    |   0
 .../static}/dashboard/js/jquery.min.js        |   0
 .../dashboard/js/jquery.quicksearch.js        |   0
 .../static}/dashboard/js/old-application.js   |   0
 .../static}/dashboard/js/treemap-stuff.js     |   0
 .../templates/_syspanel_image_list.html       |   4 +-
 .../dashboard/templates/base.html             |  14 ++---
 .../dashboard/templates/splash.html           |   8 +--
 .../dashboard/templates/switch_tenants.html   |   2 +-
 openstack-dashboard/dashboard/urls.py         |  16 +++---
 openstack-dashboard/setup.py                  |   2 +-
 107 files changed, 61 insertions(+), 51 deletions(-)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.eot (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.svg (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.ttf (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Anivers_Regular-webfont.woff (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/Treemap.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/base.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/django-admin-widgets.css (84%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/ie7.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_222222_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_2e83ff_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_454545_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_888888_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/images/ui-icons_cd0a0a_256x240.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/jquery-ui-1.8.13.custom.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/openstack.css (98%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/reset.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/css/style.css (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/body_bg.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/body_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/book_icon.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/bread_crumb.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/btn_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/button/btn_left.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/button/btn_right.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/button/launch.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/chat_icon.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/content_bg.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/content_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/content_shadow.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/dashblock_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/dashboard_nav_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/drop_arrow.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/foot_back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/gears.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/header_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/home_head_back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/image_detail.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/large_logo.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logged_in_box_bg.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/login_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/login_btn.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logo.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logo.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/logo_new.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/misc_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/modal_btn.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/nav_arrow.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/nav_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/nav_highlight.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/page_header.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/projects_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/refresh.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/search.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/server_icon.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/spinner.gif (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/status_sprite.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/steps_left_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/steps_right_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/sub-head-back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/sub_head_back.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/table_header_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/table_heading_bg.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/images/title-blank-short-foot.png (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/application.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/dashboard.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/data.json (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/django-admin.multiselect.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/form_examples.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jit-yc.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery-ui.min.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.example.min.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.form.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.masonry.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.min.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/jquery.quicksearch.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/old-application.js (100%)
 rename openstack-dashboard/{media => dashboard/static}/dashboard/js/treemap-stuff.js (100%)

diff --git a/openstack-dashboard/dashboard/settings.py b/openstack-dashboard/dashboard/settings.py
index 3f6b03414..37d56dcd7 100644
--- a/openstack-dashboard/dashboard/settings.py
+++ b/openstack-dashboard/dashboard/settings.py
@@ -37,9 +37,11 @@ ENABLE_VNC = True
 LOGIN_URL = '/auth/login'
 LOGIN_REDIRECT_URL = '/'
 
-MEDIA_ROOT = os.path.join(ROOT_PATH, '..', 'media')
+MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
 MEDIA_URL = '/media/'
-ADMIN_MEDIA_PREFIX = '/media/admin/'
+STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
+STATIC_URL = '/static/'
+ADMIN_MEDIA_PREFIX = '/static/admin/'
 
 CREDENTIAL_AUTHORIZATION_DAYS = '5'
 
@@ -61,6 +63,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.i18n',
     'django.core.context_processors.request',
     'django.core.context_processors.media',
+    'django.core.context_processors.static',
     'django.contrib.messages.context_processors.messages',
     'django_openstack.context_processors.swift',
     'django_openstack.context_processors.tenants',
@@ -76,11 +79,16 @@ TEMPLATE_DIRS = (
     os.path.join(ROOT_PATH, 'templates'),
 )
 
+STATICFILES_DIRS = (
+    os.path.join(ROOT_PATH, 'static'),
+)
+
 INSTALLED_APPS = (
     'dashboard',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
+    'django.contrib.staticfiles',
     'django_openstack',
     'django_openstack.templatetags',
     'mailer',
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.eot b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.eot
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.eot
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.eot
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.svg b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.svg
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.svg
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.svg
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.ttf b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.ttf
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.ttf
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.ttf
diff --git a/openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.woff b/openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.woff
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Anivers_Regular-webfont.woff
rename to openstack-dashboard/dashboard/static/dashboard/css/Anivers_Regular-webfont.woff
diff --git a/openstack-dashboard/media/dashboard/css/Treemap.css b/openstack-dashboard/dashboard/static/dashboard/css/Treemap.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/Treemap.css
rename to openstack-dashboard/dashboard/static/dashboard/css/Treemap.css
diff --git a/openstack-dashboard/media/dashboard/css/base.css b/openstack-dashboard/dashboard/static/dashboard/css/base.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/base.css
rename to openstack-dashboard/dashboard/static/dashboard/css/base.css
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2694e8_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_2e83ff_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_3d80b3_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_72a7cf_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/images/ui-icons_ffffff_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css b/openstack-dashboard/dashboard/static/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css
rename to openstack-dashboard/dashboard/static/dashboard/css/cupertino/jquery-ui-1.7.2.custom.css
diff --git a/openstack-dashboard/media/dashboard/css/django-admin-widgets.css b/openstack-dashboard/dashboard/static/dashboard/css/django-admin-widgets.css
similarity index 84%
rename from openstack-dashboard/media/dashboard/css/django-admin-widgets.css
rename to openstack-dashboard/dashboard/static/dashboard/css/django-admin-widgets.css
index 43521be0f..2d4a6de3f 100644
--- a/openstack-dashboard/media/dashboard/css/django-admin-widgets.css
+++ b/openstack-dashboard/dashboard/static/dashboard/css/django-admin-widgets.css
@@ -5,10 +5,10 @@ All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    1. Redistributions of source code must retain the above copyright notice, 
+    1. Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
-    
-    2. Redistributions in binary form must reproduce the above copyright 
+
+    2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
 
@@ -48,12 +48,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 .selector-available h2, .selector-chosen h2 {
     border: 1px solid #ccc;
-    background: #C9DBED url(/media/admin/img/admin/default-bg.gif) bottom left repeat-x;
+    background: #C9DBED url(../admin/img/admin/default-bg.gif) bottom left repeat-x;
     color: #fff;
 }
 
 .selector .selector-available h2 {
-    background: white url(/media/admin/img/admin/nav-bg.gif) bottom left repeat-x;
+    background: white url(../admin/img/admin/nav-bg.gif) bottom left repeat-x;
     color: #666;
 }
 
@@ -80,7 +80,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     float: left;
     width: 22px;
     height: 50px;
-    background: url(/media/admin/img/admin/chooser-bg.gif) top center no-repeat;
+    background: url(../admin/img/admin/chooser-bg.gif) top center no-repeat;
     margin: 8em 3px 0 3px;
     padding: 0;
 }
@@ -104,12 +104,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 }
 
 .selector-add {
-    background: url(/media/admin/img/admin/selector-add.gif) top center no-repeat;
+    background: url(../admin/img/admin/selector-add.gif) top center no-repeat;
     margin-bottom: 2px;
 }
 
 .selector-remove {
-    background: url(/media/admin/img/admin/selector-remove.gif) top center no-repeat;
+    background: url(../admin/img/admin/selector-remove.gif) top center no-repeat;
 }
 
 a.selector-chooseall, a.selector-clearall {
@@ -129,11 +129,11 @@ a.selector-chooseall:hover, a.selector-clearall:hover {
 
 a.selector-chooseall {
     width: 7em;
-    background: url(/media/admin/img/admin/selector-addall.gif) left center no-repeat;
+    background: url(../admin/img/admin/selector-addall.gif) left center no-repeat;
 }
 
 a.selector-clearall {
-    background: url(/media/admin/img/admin/selector-removeall.gif) left center no-repeat;
+    background: url(../admin/img/admin/selector-removeall.gif) left center no-repeat;
 }
 
 
@@ -165,7 +165,7 @@ a.selector-clearall {
     height: 22px;
     width: 50px;
     margin: 0 0 3px 40%;
-    background: url(/media/admin/img/admin/chooser_stacked-bg.gif) top center no-repeat;
+    background: url(../admin/img/admin/chooser_stacked-bg.gif) top center no-repeat;
 }
 
 .stacked .selector-chooser li {
@@ -178,11 +178,11 @@ a.selector-clearall {
 }
 
 .stacked .selector-add {
-    background-image: url(/media/admin/img/admin/selector_stacked-add.gif);
+    background-image: url(../admin/img/admin/selector_stacked-add.gif);
 }
 
 .stacked .selector-remove {
-    background-image: url(/media/admin/img/admin/selector_stacked-remove.gif);
+    background-image: url(../admin/img/admin/selector_stacked-remove.gif);
 }
 
 
@@ -269,7 +269,7 @@ p.file-upload {
     color: #666;
     padding: 2px 3px;
     text-align: center;
-    background: #e1e1e1 url(/media/admin/img/admin/nav-bg.gif) 0 50% repeat-x;
+    background: #e1e1e1 url(../admin/img/admin/nav-bg.gif) 0 50% repeat-x;
     border-bottom: 1px solid #ddd;
 }
 
@@ -337,7 +337,7 @@ p.file-upload {
     position: absolute;
     font-weight: bold;
     font-size: 12px;
-    background: #C9DBED url(/media/admin/img/admin/default-bg.gif) bottom left repeat-x;
+    background: #C9DBED url(../admin/img/admin/default-bg.gif) bottom left repeat-x;
     padding: 1px 4px 2px 4px;
     color: white;
 }
@@ -360,7 +360,7 @@ p.file-upload {
     margin: 0 !important;
     padding: 0;
     font-size: 10px;
-    background: #e1e1e1 url(/media/admin/img/admin/nav-bg.gif) 0 50% repeat-x;
+    background: #e1e1e1 url(../admin/img/admin/nav-bg.gif) 0 50% repeat-x;
     border-top: 1px solid #ddd;
 }
 
@@ -397,7 +397,7 @@ ul.orderer li {
     border-width: 0 1px 1px 0;
     white-space: nowrap;
     overflow: hidden;
-    background: #e2e2e2 url(/media/admin/img/admin/nav-bg-grabber.gif) repeat-y;
+    background: #e2e2e2 url(../admin/img/admin/nav-bg-grabber.gif) repeat-y;
 }
 
 ul.orderer li:hover {
@@ -429,7 +429,7 @@ ul.orderer li.selected {
 }
 
 ul.orderer li.deleted {
-    background: #bbb url(/media/admin/img/admin/deleted-overlay.gif);
+    background: #bbb url(../admin/img/admin/deleted-overlay.gif);
 }
 
 ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited {
@@ -437,7 +437,7 @@ ul.orderer li.deleted a:link, ul.orderer li.deleted a:visited {
 }
 
 ul.orderer li.deleted .inline-deletelink {
-    background-image: url(/media/admin/img/admin/inline-restore.png);
+    background-image: url(../admin/img/admin/inline-restore.png);
 }
 
 ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
@@ -449,7 +449,7 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
 .inline-deletelink {
     display: block;
     text-indent: -9999px;
-    background: transparent url(/media/admin/img/admin/inline-delete.png) no-repeat;
+    background: transparent url(../admin/img/admin/inline-delete.png) no-repeat;
     width: 15px;
     height: 15px;
     margin: 0.4em 0;
@@ -488,11 +488,11 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
 }
 
 .editinline tr.deleted {
-    background: #ddd url(/media/admin/img/admin/deleted-overlay.gif);
+    background: #ddd url(../admin/img/admin/deleted-overlay.gif);
 }
 
 .editinline tr.deleted .inline-deletelink {
-    background-image: url(/media/admin/img/admin/inline-restore.png);
+    background-image: url(../admin/img/admin/inline-restore.png);
 }
 
 .editinline tr.deleted td:hover {
@@ -523,13 +523,13 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover {
 .editinline-stacked .inline-splitter {
     float: left;
     width: 9px;
-    background: #f8f8f8 url(/media/admin/img/admin/inline-splitter-bg.gif) 50% 50% no-repeat;
+    background: #f8f8f8 url(../admin/img/admin/inline-splitter-bg.gif) 50% 50% no-repeat;
     border-right: 1px solid #ccc;
 }
 
 .editinline-stacked .controls {
     clear: both;
-    background: #e1e1e1 url(/media/admin/img/admin/nav-bg.gif) top left repeat-x;
+    background: #e1e1e1 url(../admin/img/admin/nav-bg.gif) top left repeat-x;
     padding: 3px 4px;
     font-size: 11px;
     border-top: 1px solid #ddd;
diff --git a/openstack-dashboard/media/dashboard/css/ie7.css b/openstack-dashboard/dashboard/static/dashboard/css/ie7.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/ie7.css
rename to openstack-dashboard/dashboard/static/dashboard/css/ie7.css
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_glass_75_ffffff_1x400.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_222222_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_222222_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_222222_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_222222_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_2e83ff_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_2e83ff_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_2e83ff_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_454545_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_454545_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_454545_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_454545_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_888888_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_888888_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_888888_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_888888_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/images/ui-icons_cd0a0a_256x240.png b/openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/images/ui-icons_cd0a0a_256x240.png
rename to openstack-dashboard/dashboard/static/dashboard/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/openstack-dashboard/media/dashboard/css/jquery-ui-1.8.13.custom.css b/openstack-dashboard/dashboard/static/dashboard/css/jquery-ui-1.8.13.custom.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/jquery-ui-1.8.13.custom.css
rename to openstack-dashboard/dashboard/static/dashboard/css/jquery-ui-1.8.13.custom.css
diff --git a/openstack-dashboard/media/dashboard/css/openstack.css b/openstack-dashboard/dashboard/static/dashboard/css/openstack.css
similarity index 98%
rename from openstack-dashboard/media/dashboard/css/openstack.css
rename to openstack-dashboard/dashboard/static/dashboard/css/openstack.css
index 3abdddaa2..b4c47133c 100644
--- a/openstack-dashboard/media/dashboard/css/openstack.css
+++ b/openstack-dashboard/dashboard/static/dashboard/css/openstack.css
@@ -165,7 +165,7 @@ p .ui-icon {
 
 #content.home #projects a	{
 	display: block;
-	background: url(/media/dashboard/img/server_icon.png) no-repeat 13px 9px;
+	background: url(../img/server_icon.png) no-repeat 13px 9px;
 	padding: 5px 0 5px 58px;
 	font-weight: bold;
 }
@@ -213,7 +213,7 @@ span.data {
 #home_login input[type="submit"], #lnk_register {
 	float: right;
 	height: 31px;
-	background: url(/media/dashboard/img/login_btn.png) top left repeat-x;
+	background: url(../img/login_btn.png) top left repeat-x;
 	border: 1px solid #206cb5;
 	color: #fff;
 	font-weight: bold;
@@ -508,7 +508,7 @@ td.detail_wrapper {
 
 }
 div.image_detail, div.instance_detail {
-	background: url(/media/dashboard/img/image_detail.png) top left no-repeat;
+	background: url(../img/image_detail.png) top left no-repeat;
 	height: 90px;
 	width: 674px;
 	padding: 8px 8px 16px 8px;
diff --git a/openstack-dashboard/media/dashboard/css/reset.css b/openstack-dashboard/dashboard/static/dashboard/css/reset.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/reset.css
rename to openstack-dashboard/dashboard/static/dashboard/css/reset.css
diff --git a/openstack-dashboard/media/dashboard/css/style.css b/openstack-dashboard/dashboard/static/dashboard/css/style.css
similarity index 100%
rename from openstack-dashboard/media/dashboard/css/style.css
rename to openstack-dashboard/dashboard/static/dashboard/css/style.css
diff --git a/openstack-dashboard/media/dashboard/images/body_bg.gif b/openstack-dashboard/dashboard/static/dashboard/images/body_bg.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/body_bg.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/body_bg.gif
diff --git a/openstack-dashboard/media/dashboard/images/body_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/body_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/body_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/body_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/book_icon.png b/openstack-dashboard/dashboard/static/dashboard/images/book_icon.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/book_icon.png
rename to openstack-dashboard/dashboard/static/dashboard/images/book_icon.png
diff --git a/openstack-dashboard/media/dashboard/images/bread_crumb.gif b/openstack-dashboard/dashboard/static/dashboard/images/bread_crumb.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/bread_crumb.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/bread_crumb.gif
diff --git a/openstack-dashboard/media/dashboard/images/btn_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/btn_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/btn_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/btn_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/button/btn_left.png b/openstack-dashboard/dashboard/static/dashboard/images/button/btn_left.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/button/btn_left.png
rename to openstack-dashboard/dashboard/static/dashboard/images/button/btn_left.png
diff --git a/openstack-dashboard/media/dashboard/images/button/btn_right.png b/openstack-dashboard/dashboard/static/dashboard/images/button/btn_right.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/button/btn_right.png
rename to openstack-dashboard/dashboard/static/dashboard/images/button/btn_right.png
diff --git a/openstack-dashboard/media/dashboard/images/button/launch.png b/openstack-dashboard/dashboard/static/dashboard/images/button/launch.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/button/launch.png
rename to openstack-dashboard/dashboard/static/dashboard/images/button/launch.png
diff --git a/openstack-dashboard/media/dashboard/images/chat_icon.png b/openstack-dashboard/dashboard/static/dashboard/images/chat_icon.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/chat_icon.png
rename to openstack-dashboard/dashboard/static/dashboard/images/chat_icon.png
diff --git a/openstack-dashboard/media/dashboard/images/content_bg.gif b/openstack-dashboard/dashboard/static/dashboard/images/content_bg.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/content_bg.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/content_bg.gif
diff --git a/openstack-dashboard/media/dashboard/images/content_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/content_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/content_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/content_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/content_shadow.png b/openstack-dashboard/dashboard/static/dashboard/images/content_shadow.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/content_shadow.png
rename to openstack-dashboard/dashboard/static/dashboard/images/content_shadow.png
diff --git a/openstack-dashboard/media/dashboard/images/dashblock_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/dashblock_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/dashblock_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/dashblock_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/dashboard_nav_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/dashboard_nav_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/dashboard_nav_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/dashboard_nav_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/drop_arrow.png b/openstack-dashboard/dashboard/static/dashboard/images/drop_arrow.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/drop_arrow.png
rename to openstack-dashboard/dashboard/static/dashboard/images/drop_arrow.png
diff --git a/openstack-dashboard/media/dashboard/images/foot_back.png b/openstack-dashboard/dashboard/static/dashboard/images/foot_back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/foot_back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/foot_back.png
diff --git a/openstack-dashboard/media/dashboard/images/gears.png b/openstack-dashboard/dashboard/static/dashboard/images/gears.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/gears.png
rename to openstack-dashboard/dashboard/static/dashboard/images/gears.png
diff --git a/openstack-dashboard/media/dashboard/images/header_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/header_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/header_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/header_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/home_head_back.png b/openstack-dashboard/dashboard/static/dashboard/images/home_head_back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/home_head_back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/home_head_back.png
diff --git a/openstack-dashboard/media/dashboard/images/image_detail.png b/openstack-dashboard/dashboard/static/dashboard/images/image_detail.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/image_detail.png
rename to openstack-dashboard/dashboard/static/dashboard/images/image_detail.png
diff --git a/openstack-dashboard/media/dashboard/images/large_logo.png b/openstack-dashboard/dashboard/static/dashboard/images/large_logo.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/large_logo.png
rename to openstack-dashboard/dashboard/static/dashboard/images/large_logo.png
diff --git a/openstack-dashboard/media/dashboard/images/logged_in_box_bg.gif b/openstack-dashboard/dashboard/static/dashboard/images/logged_in_box_bg.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logged_in_box_bg.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/logged_in_box_bg.gif
diff --git a/openstack-dashboard/media/dashboard/images/login_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/login_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/login_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/login_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/login_btn.png b/openstack-dashboard/dashboard/static/dashboard/images/login_btn.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/login_btn.png
rename to openstack-dashboard/dashboard/static/dashboard/images/login_btn.png
diff --git a/openstack-dashboard/media/dashboard/images/logo.gif b/openstack-dashboard/dashboard/static/dashboard/images/logo.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logo.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/logo.gif
diff --git a/openstack-dashboard/media/dashboard/images/logo.png b/openstack-dashboard/dashboard/static/dashboard/images/logo.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logo.png
rename to openstack-dashboard/dashboard/static/dashboard/images/logo.png
diff --git a/openstack-dashboard/media/dashboard/images/logo_new.png b/openstack-dashboard/dashboard/static/dashboard/images/logo_new.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/logo_new.png
rename to openstack-dashboard/dashboard/static/dashboard/images/logo_new.png
diff --git a/openstack-dashboard/media/dashboard/images/misc_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/misc_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/misc_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/misc_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/modal_btn.png b/openstack-dashboard/dashboard/static/dashboard/images/modal_btn.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/modal_btn.png
rename to openstack-dashboard/dashboard/static/dashboard/images/modal_btn.png
diff --git a/openstack-dashboard/media/dashboard/images/nav_arrow.png b/openstack-dashboard/dashboard/static/dashboard/images/nav_arrow.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/nav_arrow.png
rename to openstack-dashboard/dashboard/static/dashboard/images/nav_arrow.png
diff --git a/openstack-dashboard/media/dashboard/images/nav_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/nav_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/nav_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/nav_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/nav_highlight.png b/openstack-dashboard/dashboard/static/dashboard/images/nav_highlight.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/nav_highlight.png
rename to openstack-dashboard/dashboard/static/dashboard/images/nav_highlight.png
diff --git a/openstack-dashboard/media/dashboard/images/page_header.png b/openstack-dashboard/dashboard/static/dashboard/images/page_header.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/page_header.png
rename to openstack-dashboard/dashboard/static/dashboard/images/page_header.png
diff --git a/openstack-dashboard/media/dashboard/images/projects_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/projects_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/projects_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/projects_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/refresh.png b/openstack-dashboard/dashboard/static/dashboard/images/refresh.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/refresh.png
rename to openstack-dashboard/dashboard/static/dashboard/images/refresh.png
diff --git a/openstack-dashboard/media/dashboard/images/search.png b/openstack-dashboard/dashboard/static/dashboard/images/search.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/search.png
rename to openstack-dashboard/dashboard/static/dashboard/images/search.png
diff --git a/openstack-dashboard/media/dashboard/images/server_icon.png b/openstack-dashboard/dashboard/static/dashboard/images/server_icon.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/server_icon.png
rename to openstack-dashboard/dashboard/static/dashboard/images/server_icon.png
diff --git a/openstack-dashboard/media/dashboard/images/spinner.gif b/openstack-dashboard/dashboard/static/dashboard/images/spinner.gif
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/spinner.gif
rename to openstack-dashboard/dashboard/static/dashboard/images/spinner.gif
diff --git a/openstack-dashboard/media/dashboard/images/status_sprite.png b/openstack-dashboard/dashboard/static/dashboard/images/status_sprite.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/status_sprite.png
rename to openstack-dashboard/dashboard/static/dashboard/images/status_sprite.png
diff --git a/openstack-dashboard/media/dashboard/images/steps_left_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/steps_left_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/steps_left_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/steps_left_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/steps_right_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/steps_right_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/steps_right_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/steps_right_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/sub-head-back.png b/openstack-dashboard/dashboard/static/dashboard/images/sub-head-back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/sub-head-back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/sub-head-back.png
diff --git a/openstack-dashboard/media/dashboard/images/sub_head_back.png b/openstack-dashboard/dashboard/static/dashboard/images/sub_head_back.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/sub_head_back.png
rename to openstack-dashboard/dashboard/static/dashboard/images/sub_head_back.png
diff --git a/openstack-dashboard/media/dashboard/images/table_header_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/table_header_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/table_header_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/table_header_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/table_heading_bg.png b/openstack-dashboard/dashboard/static/dashboard/images/table_heading_bg.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/table_heading_bg.png
rename to openstack-dashboard/dashboard/static/dashboard/images/table_heading_bg.png
diff --git a/openstack-dashboard/media/dashboard/images/title-blank-short-foot.png b/openstack-dashboard/dashboard/static/dashboard/images/title-blank-short-foot.png
similarity index 100%
rename from openstack-dashboard/media/dashboard/images/title-blank-short-foot.png
rename to openstack-dashboard/dashboard/static/dashboard/images/title-blank-short-foot.png
diff --git a/openstack-dashboard/media/dashboard/js/application.js b/openstack-dashboard/dashboard/static/dashboard/js/application.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/application.js
rename to openstack-dashboard/dashboard/static/dashboard/js/application.js
diff --git a/openstack-dashboard/media/dashboard/js/dashboard.js b/openstack-dashboard/dashboard/static/dashboard/js/dashboard.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/dashboard.js
rename to openstack-dashboard/dashboard/static/dashboard/js/dashboard.js
diff --git a/openstack-dashboard/media/dashboard/js/data.json b/openstack-dashboard/dashboard/static/dashboard/js/data.json
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/data.json
rename to openstack-dashboard/dashboard/static/dashboard/js/data.json
diff --git a/openstack-dashboard/media/dashboard/js/django-admin.multiselect.js b/openstack-dashboard/dashboard/static/dashboard/js/django-admin.multiselect.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/django-admin.multiselect.js
rename to openstack-dashboard/dashboard/static/dashboard/js/django-admin.multiselect.js
diff --git a/openstack-dashboard/media/dashboard/js/form_examples.js b/openstack-dashboard/dashboard/static/dashboard/js/form_examples.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/form_examples.js
rename to openstack-dashboard/dashboard/static/dashboard/js/form_examples.js
diff --git a/openstack-dashboard/media/dashboard/js/jit-yc.js b/openstack-dashboard/dashboard/static/dashboard/js/jit-yc.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jit-yc.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jit-yc.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery-ui.min.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery-ui.min.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery-ui.min.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery-ui.min.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.example.min.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.example.min.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.example.min.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.example.min.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.form.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.form.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.form.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.form.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.masonry.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.masonry.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.masonry.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.masonry.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.min.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.min.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.min.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.min.js
diff --git a/openstack-dashboard/media/dashboard/js/jquery.quicksearch.js b/openstack-dashboard/dashboard/static/dashboard/js/jquery.quicksearch.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/jquery.quicksearch.js
rename to openstack-dashboard/dashboard/static/dashboard/js/jquery.quicksearch.js
diff --git a/openstack-dashboard/media/dashboard/js/old-application.js b/openstack-dashboard/dashboard/static/dashboard/js/old-application.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/old-application.js
rename to openstack-dashboard/dashboard/static/dashboard/js/old-application.js
diff --git a/openstack-dashboard/media/dashboard/js/treemap-stuff.js b/openstack-dashboard/dashboard/static/dashboard/js/treemap-stuff.js
similarity index 100%
rename from openstack-dashboard/media/dashboard/js/treemap-stuff.js
rename to openstack-dashboard/dashboard/static/dashboard/js/treemap-stuff.js
diff --git a/openstack-dashboard/dashboard/templates/_syspanel_image_list.html b/openstack-dashboard/dashboard/templates/_syspanel_image_list.html
index aa7f17656..d308c2717 100644
--- a/openstack-dashboard/dashboard/templates/_syspanel_image_list.html
+++ b/openstack-dashboard/dashboard/templates/_syspanel_image_list.html
@@ -36,8 +36,8 @@
         <li><span>Kernel ID: </span>{{image.properties.kernel_id}}</li>
         <li><span>Ramdisk ID: </span>{{image.properties.ramdisk_id}}</li>
         <li><span>Architecture: </span>{{image.properties.architecture}}</li>
-        <li><span>Project ID: </span>{{image.properties.project_id}}</li>
-        <li><span>Container Format: </span>{{image.container_format}}</li>
+        <li><span>Project ID: </span>{{image.container_format}}</li>
+        <li><span>Container Format: </span>{{image.properties.project_id}}</li>
         <li><span>Disk Format: </span>{{image.disk_format}}</li>
       </ul>
     </td>
diff --git a/openstack-dashboard/dashboard/templates/base.html b/openstack-dashboard/dashboard/templates/base.html
index 162895182..fca71d2cb 100644
--- a/openstack-dashboard/dashboard/templates/base.html
+++ b/openstack-dashboard/dashboard/templates/base.html
@@ -4,13 +4,13 @@
   <head>
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
     <title>{% site_branding %} Dashboard{% block title %}{% endblock %}</title>
-    <script charset='utf-8' src='/media/dashboard/js/jquery.min.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/jquery-ui.min.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/jquery.quicksearch.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/jquery.example.min.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/form_examples.js' type='text/javascript'></script>
-    <script charset='utf-8' src='/media/dashboard/js/application.js' type='text/javascript'></script>
-    <link href='/media/dashboard/css/style.css' media='screen' rel='stylesheet' />
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery.min.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery-ui.min.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery.quicksearch.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/jquery.example.min.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/form_examples.js' type='text/javascript'></script>
+    <script charset='utf-8' src='{{ STATIC_URL }}dashboard/js/application.js' type='text/javascript'></script>
+    <link href='{{ STATIC_URL }}dashboard/css/style.css' media='screen' rel='stylesheet' />
     {% block headerjs %}{% endblock %}
     {% block headercss %}{% endblock %}
   </head>
diff --git a/openstack-dashboard/dashboard/templates/splash.html b/openstack-dashboard/dashboard/templates/splash.html
index 6e124e686..6c369bfae 100644
--- a/openstack-dashboard/dashboard/templates/splash.html
+++ b/openstack-dashboard/dashboard/templates/splash.html
@@ -3,19 +3,19 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>Login</title>
-    <link href='/media/dashboard/css/style.css' media='screen' rel='stylesheet' /> 
+    <link href='{{ STATIC_URL }}dashboard/css/style.css' media='screen' rel='stylesheet' />
   </head>
   <body id="standalone">
     <div id="login_wrapper">
       <div class='large-rounded' id='login'>
         {% include "_messages.html" %}
         {% include '_login.html' %}
-        <ul id='alternate_links'> 
+        <ul id='alternate_links'>
           <li>&nbsp;</li>
           <li>&nbsp;</li>
-        </ul> 
+        </ul>
         <div class="clear"></div>
-      </div> 
+      </div>
     </div>
   </body>
 </html>
diff --git a/openstack-dashboard/dashboard/templates/switch_tenants.html b/openstack-dashboard/dashboard/templates/switch_tenants.html
index 64ebeb767..c1b0e7c4b 100644
--- a/openstack-dashboard/dashboard/templates/switch_tenants.html
+++ b/openstack-dashboard/dashboard/templates/switch_tenants.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <title>Login</title>
-    <link href='/media/dashboard/css/style.css' media='screen' rel='stylesheet' />
+    <link href='{{ STATIC_URL }}dashboard/css/style.css' media='screen' rel='stylesheet' />
   </head>
   <body id="standalone">
     <div id="login_wrapper">
diff --git a/openstack-dashboard/dashboard/urls.py b/openstack-dashboard/dashboard/urls.py
index b3f552f80..57c401a37 100644
--- a/openstack-dashboard/dashboard/urls.py
+++ b/openstack-dashboard/dashboard/urls.py
@@ -23,7 +23,9 @@ URL patterns for the OpenStack Dashboard.
 """
 
 from django.conf.urls.defaults import *
+from django.conf.urls.static import static
 from django.conf import settings
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views import generic as generic_views
 import django.views.i18n
 
@@ -35,13 +37,13 @@ urlpatterns = patterns('',
     url(r'^syspanel/$', 'django_openstack.syspanel.views.instances.usage', name='syspanel_overview'),
 )
 
+# Development static app and project media serving using the staticfiles app.
+urlpatterns += staticfiles_urlpatterns()
+
+# Convenience function for serving user-uploaded media during
+# development. Only active if DEBUG==True and the URL prefix is a local
+# path. Production media should NOT be served by Django.
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 # NOTE(termie): just append them since we want the routes at the root
 urlpatterns += django_openstack_urls.urlpatterns
-
-urlpatterns += patterns('',
-     (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
-      'django.views.static.serve',
-      {'document_root': settings.MEDIA_ROOT,
-       'show_indexes': True}),
- )
diff --git a/openstack-dashboard/setup.py b/openstack-dashboard/setup.py
index b6258f82c..6452308c9 100755
--- a/openstack-dashboard/setup.py
+++ b/openstack-dashboard/setup.py
@@ -7,7 +7,6 @@ def read(fname):
 
 dst = 'debian/openstack-dashboard/var/lib/dash'
 os.system('rm -rf %s' % dst)
-shutil.copytree('media', '%s/media' % dst)
 shutil.copytree('tools', '%s/tools' % dst)
 shutil.copytree('dashboard', '%s/dashboard' % dst)
 shutil.copytree('local', '%s/local' % dst)
@@ -29,6 +28,7 @@ setup(
 
     data_files = [],
     install_requires = ['setuptools', 'mox>=0.5.0'],
+    zip_safe = False,
     classifiers = [
         'Development Status :: 4 - Beta',
         'Framework :: Django',