Changeset f5bebab for remit

Timestamp:

May 18, 2014, 5:42:14 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

9369254, 2516e60

Parents:

f301a50

git-author:

Alex Dehnert <adehnert@…> (05/18/14 17:42:14)

git-committer:

Alex Dehnert <adehnert@…> (05/18/14 17:42:14)

Message:

Tweaks from doing a new install

Location:

remit

Files:

• settings.py (modified) (4 diffs)
• treebeard (modified) (1 diff)
• urls.py (modified) (1 diff)

remit/settings.py

@@ -36 +36 @@
 SHORT_DATETIME_FORMAT_F = '%Y-%M-%d %H:%M'
 
-from local_settings import *
-
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -43 +41 @@
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'America/Chicago'
+TIME_ZONE = 'America/New_York'
 
 # Language code for this installation. All choices can be found here:
@@ -55 +53 @@
 USE_I18N = True
 
+from local_settings import *
+
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
@@ -63 +63 @@
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = SITE_WEB_PATH + '/media/'
+
+STATIC_URL = SITE_WEB_PATH + '/static/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a

remit/treebeard

@@ -1 @@
-../django-treebeard-1.1/dist-packages/treebeard/
+../django-treebeard/treebeard/

remit/urls.py

@@ -28 +28 @@
 
 if settings.DEBUG:
+    print "In debug mode; enabling static media serving"
     from django.views.static import serve
     _media_url = settings.MEDIA_URL