CopyleftConf/copyleftconf-website Changeset - 7bbe064c0d2e

Changeset - 7bbe064c0d2e

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Neugebauer - 7 years ago 2017-06-07 21:37:08
chrisjrn@gmail.com

Adds django-libsass as dependency; de-eldarionises the static folder

2 files changed with 14 insertions and 5 deletions:

pinaxcon/settings.py

requirements.txt

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... @@
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = "/site_media/media/"
 # Absolute path to the directory static files should be collected to.
 # 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(PACKAGE_ROOT, "site_media", "static")
+STATIC_ROOT = os.path.join(PROJECT_ROOT, 'staticfiles')
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = "/site_media/static/"
+STATIC_URL = '/static/'
 # Additional locations of static files
 STATICFILES_DIRS = [
     os.path.join(PROJECT_ROOT, "static", "dist"),
+]
 STATICFILES_DIRS = (
     os.path.join(PROJECT_ROOT, 'static'),
+)
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
     "compressor.finders.CompressorFinder",
+]
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = "6r&z0i#!k-thu4nv^zzx!f$fbp(&#2i5mq_^%%@ihu_qxxotl_"
 TEMPLATES = [
+    {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
@@ ... / @@ -167,16 +168,19 @@ INSTALLED_APPS = [ @@
     # project
     "pinaxcon",
     "pinaxcon.proposals",
     "pinaxcon.registrasion",
     #testing
     "django_nose",
     # stylesheets and js
     'compressor',
+]
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
@@ ... / @@ -198,16 +202,20 @@ LOGGING = { @@
         "django.request": {
             "handlers": ["mail_admins"],
             "level": "ERROR",
             "propagate": True,
         },
+    }
+}
 COMPRESS_PRECOMPILERS = (
     ('text/x-scss', 'django_libsass.SassCompiler'),
+)
 FIXTURE_DIRS = [
     os.path.join(PROJECT_ROOT, "fixtures"),
+]
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 ACCOUNT_OPEN_SIGNUP = True
 ACCOUNT_EMAIL_UNIQUE = True

requirements.txt

➞

Show inline comments

@@ ... / @@ -2,16 +2,17 @@ Django==1.9.2 @@
 pinax-theme-bootstrap==7.3.0
 django-user-accounts==1.3.1
 metron==1.3.7
 pinax-eventlog==1.1.1
 dj-static==0.0.6
 dj-database-url==0.4.0
 pinax-pages==0.4.2
 pinax-boxes==2.1.2
 django-libsass==0.7
 # For testing
 django-nose==1.4.3
 coverage==4.0.3
 # Registrasion
 https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion
 https://github.com/pinax/symposion/tarball/ad81810#egg=symposion

0 comments (0 inline, 0 general)