Skip to content

Commit

Permalink
Merge pull request #10 from ghoshbishakh/development2
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Garyfallidis committed Jul 12, 2016
2 parents a09a05b + ccbaf59 commit a8590cd
Show file tree
Hide file tree
Showing 22 changed files with 349 additions and 367 deletions.
31 changes: 31 additions & 0 deletions dipy_web/settings.py.example
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'social.apps.django_app.default',
'meta',
'website'
]

Expand All @@ -54,6 +55,7 @@ MIDDLEWARE_CLASSES = [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.gzip.GZipMiddleware',
]

ROOT_URLCONF = 'dipy_web.urls'
Expand Down Expand Up @@ -114,6 +116,15 @@ AUTH_PASSWORD_VALIDATORS = [
},
]

# cache preferences (currently using in memory cache. Replace
# with Memcached for better performance)
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
'LOCATION': 'dipy-cache',
}
}


# Internationalization
# https://docs.djangoproject.com/en/1.9/topics/i18n/
Expand All @@ -139,6 +150,9 @@ STATICFILES_DIRS = (
os.path.join(PROJECT_ROOT, 'static'),
)

# heroku settings for static files gzip
# STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'

LOGIN_URL = '/dashboard/login'

# documentation repository settings
Expand All @@ -153,6 +167,23 @@ FACEBOOK_APP_SECRET = ''
TWITTER_CONSUMER_KEY = ''
TWITTER_CONSUMER_SECRET = ''

# default meta information
DEFAULT_TITLE = "DIPY - Diffusion Imaging In Python"
DEFAULT_DESCRIPTION = """Dipy is a free and open source software
project for computational neuroanatomy,
focusing mainly on diffusion magnetic resonance
imaging (dMRI) analysis. It implements a broad
range of algorithms for denoising,
registration, reconstruction, tracking,
clustering, visualization, and statistical
analysis of MRI data."""
DEFAULT_LOGO_URL = "http://dipy.herokuapp.com/static/images/dipy-thumb.jpg"
DEFAULT_KEYWORDS = ['DIPY', 'MRI', 'Diffusion Imaging In Python']

# django-meta settings
META_SITE_PROTOCOL = 'https'
META_SITE_DOMAIN = 'dipy.herokuapp.com'

# python-social-auth settings
SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/'
SOCIAL_AUTH_LOGIN_URL = '/login'
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ whitenoise==3.1
dj-database-url==0.4.1
gunicorn==19.5.0
psycopg2==2.6.1
django-meta==1.3
301 changes: 1 addition & 300 deletions website/static/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a8590cd

Please sign in to comment.