Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: silverstripesoftware/make_my_badge
base: 280f8e7b30
...
head fork: silverstripesoftware/make_my_badge
compare: a7d0db60a2
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
4 epio.ini
@@ -33,8 +33,8 @@ base = make_my_badge
[static]
-/static = static
-/uploads = %(data_directory)s
+/static = %(data_directory)s/static
+/uploads = %(data_directory)s/media
/static/admin = ../shortcuts/django-admin-media/
[env]
View
4 make_my_badge/common_settings.py
@@ -37,7 +37,7 @@
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'upload')
+MEDIA_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'upload')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
@@ -48,7 +48,7 @@
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'static')
+STATIC_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'static')
# URL prefix for static files.
# Example: "http://media.lawrence.com/static/"
View
5 make_my_badge/production_settings.py
@@ -6,4 +6,7 @@
DEBUG = False
TEMPLATE_DEBUG = DEBUG
-MEDIA_ROOT = config["core"]["data_directory"]
+import os
+
+MEDIA_ROOT = os.path.join(config["core"]["data_directory"], "media")
+STATIC_ROOT = os.path.join(config["core"]["data_directory"], "static")

No commit comments for this range

Something went wrong with that request. Please try again.