Merge branch 'master' of https://github.com/codeforboston/bostongreenmap

 into design

.buildpacks

@@ -1,3 +1,4 @@
 https://github.com/a2ikm/heroku-buildpack-libjpeg62.git
 https://github.com/dulaccc/heroku-buildpack-geodjango/
+https://github.com/cyberdelia/heroku-geo-buildpack#1.2
 https://github.com/heroku/heroku-buildpack-nodejs.git#v55

README.md

@@ -38,7 +38,7 @@ If you're having issues, make sure you're using recent versions of Vagrant (we'v
 Be sure to compile the Javascript and SCSS:
 
     vagrant ssh
-    cd bostongreenmap/client/
+    cd bostongreenmap
     grunt handlebars:compile
     grunt compass:dev
     grunt watch

bostongreenmap/oku_settings.py

@@ -4,12 +4,44 @@
 GEOS_LIBRARY_PATH = environ.get('GEOS_LIBRARY_PATH')
 GDAL_LIBRARY_PATH = environ.get('GDAL_LIBRARY_PATH')
 
+AWS_ACCESS_KEY_ID = environ.get('AWS_ACCESS_KEY_ID')
+AWS_SECRET_ACCESS_KEY = environ.get('AWS_SECRET_ACCESS_KEY')
+AWS_STORAGE_BUCKET_NAME = 'dev.files.bostongreenmap.org'
+
 import dj_database_url
 DATABASES['default'] =  dj_database_url.config()
 DATABASES['default']['OPTIONS'] = {
       'options': '-c search_path=bostongreenmap,public'
     }
 
+
+AWS_QUERYSTRING_AUTH = False
+MEDIA_URL = '/media/'
+MEDIA_ROOT = '//dev.files.bostongreenmap.org/'
+
+AWS_S3_SECURE_URLS = False
+
+AWS_HEADERS = {
+    "Cache-Control": "public, max-age=86400",
+}
+
+AWS_ACCESS_KEY_ID = environ.get('AWS_ACCESS_KEY_ID')
+AWS_SECRET_ACCESS_KEY = environ.get('AWS_SECRET_ACCESS_KEY')
+AWS_STORAGE_BUCKET_NAME = 'dev.files.bostongreenmap.org'
+AWS_PRELOAD_METADATA = False
+
+STATIC_URL = 'http://' + AWS_STORAGE_BUCKET_NAME + '/'
+
+
+STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+
+# STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+# DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+
+# MEDIA_ROOT = '/'
+# MEDIA_URL = 'http://dev.files.bostongreenmap.org/'
+
 # Honor the 'X-Forwarded-Proto' header for request.is_secure()
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 POSTGIS_VERSION = (2,1,2)

bostongreenmap/settings.py

@@ -3,6 +3,10 @@
 from os.path import join, abspath, dirname
 import os
 import sys
+
+from os import environ
+
+
 # Defines the parent directory that contains the settings file as
 # the PROJECT_ROOT. It is used for relative settings elsewhere.
 here = lambda *x: join(abspath(dirname(__file__)), *x)
@@ -11,6 +15,7 @@
 SETTINGS_DIR = os.path.dirname(__file__)
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
+THUMBNAIL_DEBUG = DEBUG
 
 LOGIN_REDIRECT_URL = '/login_redirect'
 
@@ -81,22 +86,27 @@
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
+
+###############################################
+
 # Additional locations of static files
 STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    # MEDIA_ROOT,
     root('static'),
     root('client')
 )
 
 # 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',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
+# STATICFILES_FINDERS = (
+#     'django.contrib.staticfiles.finders.FileSystemFinder',
+#     'django.contrib.staticfiles.finders.AppDirectoriesFinder'
+# #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+# )
+
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '2nq6(xmm9pp^%$k9=$qq28$kj$w!g^7na_0@e%(658#+7qj1ho'
@@ -137,13 +147,14 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
-    # 'django.contrib.staticfiles',
+    # 's3_folder_storage',
+    'storages',
     'grappelli',
     'django.contrib.admin',
     'django.contrib.markup',
     'django.contrib.humanize',
     'django.contrib.gis',
-    # 'registration',
+    'django.contrib.staticfiles',
     'south',
     'parks',
     'sorl.thumbnail',

client/base_backbone.html

@@ -6,6 +6,8 @@
         <link href="/static/lib/bootstrap.css" rel="stylesheet">
         <link href="/static/build/css/main.css" rel="stylesheet">
         <link href="/static/libs/leaflet/leaflet.css" rel="stylesheet">
+        <link href="/static/libs/leaflet/leaflet.css" rel="stylesheet">
+        <link href="/static/css/icons.css" rel="stylesheet">
         <link href="/static/css/chosen.min.css" rel="stylesheet">
             <link href='http://fonts.googleapis.com/css?family=Domine:400,700' rel='stylesheet' type='text/css'>
             <link href='http://fonts.googleapis.com/css?family=Istok+Web:400,700' rel='stylesheet' type='text/css'>
@@ -15,6 +17,7 @@
 	<body>
         <header id="header"></header>
         <div id="loading" style="position:absolute; top:0; bottom:0; z-index:100; width:100%; background-color:black; opacity: 0.3; display:none;"></div>
+        <div id="map-region"></div>
         <div id="content-area"></div>
 
         <footer id="footer"></footer>