Skip to content

Commit 3923233

Browse files
committed
Add the admin media and the I-D Tracker images to static/. These
belong in the apache document root, and will be served by the django server if it's being run in test or development mode according to SERVER_MODE. - Legacy-Id: 566
1 parent ab68651 commit 3923233

79 files changed

Lines changed: 2119 additions & 1 deletion

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ietf/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
# Absolute path to the directory that holds media.
5555
# Example: "/home/media/media.lawrence.com/"
56-
MEDIA_ROOT = ''
56+
MEDIA_ROOT = BASE_DIR + "../static/"
5757

5858
# URL that handles the media served from MEDIA_ROOT.
5959
# Example: "http://media.lawrence.com"

ietf/urls.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import ietf.utils.views
77
import ietf.views
88

9+
from django.conf import settings
10+
911
feeds = {
1012
'iesg_minutes': IESGMinutes,
1113
'comments': DocumentComments,
@@ -39,3 +41,8 @@
3941
(r'^review/top/(?P<page>[0-9]+)/$', 'ietf.utils.views.top'),
4042

4143
)
44+
45+
if settings.SERVER_MODE in ('development', 'test'):
46+
urlpatterns += patterns('',
47+
(r'^(?P<path>(?:images|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
48+
)

static/images/back_dot.gif

45 Bytes
Loading

static/images/black_dot.gif

1 KB
Loading

static/images/blue_title.gif

15.2 KB
Loading

static/images/icon_help.gif

154 Bytes
Loading

static/images/ietf_topleft.gif

5.01 KB
Loading

static/images/liaison_title.gif

34.8 KB
Loading

static/images/mail_title.gif

2.69 KB
Loading
1.6 KB
Loading

0 commit comments

Comments
 (0)