Skip to content

Commit

Permalink
Merge pull request #95 from TACC/hotfix/add-already-tested-fixes-on-t…
Browse files Browse the repository at this point in the history
…exascale-post-FP-1194
  • Loading branch information
wesleyboar authored Sep 30, 2021
2 parents 7356817 + fef8779 commit 3584719
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 4 deletions.
79 changes: 75 additions & 4 deletions texascale-org/settings_custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
('texascale-org/templates/article.image-map.html', 'Article (Image Map)'),
)

########################
# BRANDING
########################

########################
# LOGOS
########################
Expand All @@ -40,3 +36,78 @@
########################

INCLUDES_CORE_PORTAL = False




########################
# FEATURES
########################

from taccsite_cms.settings import INSTALLED_APPS

FEATURES = {
# Blog/News & Social Media Metadata
# SEE: https://confluence.tacc.utexas.edu/x/EwDeCg
# SEE: https://confluence.tacc.utexas.edu/x/FAA9Cw
"blog": True,
}





########################
# BLOG
########################

# Install required apps
INSTALLED_APPS += [
# Blog/News
# 'filer', # already added
# 'easy_thumbnails', # already added
'parler',
'taggit',
'taggit_autosuggest',
'meta', # also supports `djangocms_page_meta`
'sortedm2m',
'djangocms_blog',

# Metadata
'djangocms_page_meta',
]
# CAVEAT: 'taggit_autosuggest' requires the following is added to `urls.py`
"""
urlpatterns += [
# Support `taggit_autosuggest` (from `djangocms-blog`)
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
]
"""

# Metadata: Configure
META_SITE_PROTOCOL = 'http'
META_USE_SITES = True
META_USE_OG_PROPERTIES = True
META_USE_TWITTER_PROPERTIES = True
META_USE_GOOGLEPLUS_PROPERTIES = True # django-meta 1.x+
# META_USE_SCHEMAORG_PROPERTIES=True # django-meta 2.x+

# Blog/News: Set custom paths for templates
BLOG_PLUGIN_TEMPLATE_FOLDERS = (
('plugins/default', 'Default template'), # i.e. `templates/djangocms_blog/plugins/default/`
('plugins/default-clone', 'Clone of default template'), # i.e. `templates/djangocms_blog/plugins/default-clone/`
)

# Blog/News: Change default values for the auto-setup of one `BlogConfig`
# SEE: https://github.com/nephila/djangocms-blog/issues/629
BLOG_AUTO_SETUP = True
BLOG_AUTO_HOME_TITLE ='Home'
BLOG_AUTO_BLOG_TITLE = 'News'
BLOG_AUTO_APP_TITLE = 'News'

########################
# CLIENT BUILD SETTINGS
########################

# TACC/Core-CMS-Resources#75: Load custom urls.py so we can add urlpatterns for taggit_autosuggest
ROOT_URLCONF = 'taccsite_custom.texascale-org.urls'
9 changes: 9 additions & 0 deletions texascale-org/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# -*- coding: utf-8 -*-
from taccsite_cms.urls import *

from django.conf.urls import include, url

urlpatterns += [
# Support `taggit_autosuggest` (from `djangocms-blog`)
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
]

0 comments on commit 3584719

Please sign in to comment.