Skip to content

Commit

Permalink
More
Browse files Browse the repository at this point in the history
  • Loading branch information
@barseghyanartur
barseghyanartur committed Jan 11, 2020
1 parent 5561a1c commit 950026a
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 75 deletions.
110 changes: 39 additions & 71 deletions docs/conf.distrib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ sys.path.insert(0, os.path.abspath('../src'))
sys.path.insert(0, os.path.abspath('../examples'))
sys.path.insert(0, os.path.abspath('../examples/simple'))

from nine.versions import DJANGO_GTE_1_8
from django_nine.versions import DJANGO_GTE_3_0

if DJANGO_GTE_1_8:
import django
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'simple.settings.docs')
django.setup()
import django
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'simple.settings.docs')
django.setup()

try:
import fobi
Expand All @@ -40,7 +39,7 @@ except ImportError as err:
copyright = u'2014-2018, Artur Barseghyan <artur.barseghyan@gmail.com>'

try:
from simple import settings_docs as docs_settings
from simple.settings import docs as docs_settings
except Exception as e:
PROJECT_DIR = lambda base : os.path.abspath(os.path.join(os.path.dirname(__file__), base).replace('\\','/'))
gettext = lambda s: s
Expand Down Expand Up @@ -68,11 +67,9 @@ except Exception as e:
'django.contrib.sitemaps',

# Third party apps used in the project
# 'south', # Database migration app
# 'tinymce', # TinyMCE
'easy_thumbnails', # Thumbnailer
'registration', # Auth views and registration app
# 'localeurl', # Locale URL
# Auth views and registration app
'django_registration' if DJANGO_GTE_3_0 else 'registration',

# *****************************************************************
# *****************************************************************
Expand Down Expand Up @@ -203,57 +200,35 @@ except Exception as e:
STATIC_URL = '/static/'
STATIC_ROOT = PROJECT_DIR(os.path.join('..', 'static'))

if DJANGO_GTE_1_8:
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
#'APP_DIRS': True,
'DIRS': [PROJECT_DIR('templates'),],
'OPTIONS': {
'context_processors': [
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.static",
"django.core.context_processors.tz",
"django.contrib.messages.context_processors.messages",
"django.core.context_processors.request",
"fobi.context_processors.theme", # Important!
"fobi.context_processors.dynamic_values", # Optional
],
'loaders': [
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
'django.template.loaders.eggs.Loader',
'admin_tools.template_loaders.Loader',
],
'debug': False,
}
},
]
else:
TEMPLATE_CONTEXT_PROCESSORS = (
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.static",
"django.core.context_processors.tz",
"django.contrib.messages.context_processors.messages",
"django.core.context_processors.request",
"fobi.context_processors.theme", # Important!
"fobi.context_processors.dynamic_values", # Optional
)
TEMPLATE_DIRS = (
PROJECT_DIR('templates'),
)
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
'django.template.loaders.eggs.Loader',
)
TEMPLATE_DEBUG = False
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
#'APP_DIRS': True,
'DIRS': [PROJECT_DIR('templates'),],
'OPTIONS': {
'context_processors': [
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
"django.core.context_processors.static",
"django.core.context_processors.tz",
"django.contrib.messages.context_processors.messages",
"django.core.context_processors.request",
"fobi.context_processors.theme", # Important!
"fobi.context_processors.dynamic_values", # Optional
],
'loaders': [
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
'django.template.loaders.eggs.Loader',
'admin_tools.template_loaders.Loader',
],
'debug': False,
}
},
]

# END class ExampleSettings()

docs_settings = DocsSettings()
Expand Down Expand Up @@ -290,16 +265,9 @@ if not settings.configured:
'STATIC_ROOT': docs_settings.STATIC_ROOT,
}

if DJANGO_GTE_1_8:
django_configuration.update({
'TEMPLATES': docs_settings.TEMPLATES
})
else:
django_configuration.update({
'TEMPLATE_CONTEXT_PROCESSORS': docs_settings.TEMPLATE_CONTEXT_PROCESSORS,
'TEMPLATE_DIRS': docs_settings.TEMPLATE_DIRS,
'TEMPLATE_LOADERS': docs_settings.TEMPLATE_LOADERS,
})
django_configuration.update({
'TEMPLATES': docs_settings.TEMPLATES
})

settings.configure(**django_configuration)

Expand Down
7 changes: 3 additions & 4 deletions docs/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
sys.path.insert(0, os.path.abspath('../examples'))
sys.path.insert(0, os.path.abspath('../examples/simple'))

from django_nine.versions import DJANGO_GTE_3_0

import django
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'simple.settings.docs')
django.setup()
Expand All @@ -37,7 +39,7 @@
copyright = u'2014-2018, Artur Barseghyan <artur.barseghyan@gmail.com>'

try:
from simple import settings_docs as docs_settings
from simple.settings import docs as docs_settings
except Exception as e:
PROJECT_DIR = lambda base : os.path.abspath(os.path.join(os.path.dirname(__file__), base).replace('\\','/'))
gettext = lambda s: s
Expand Down Expand Up @@ -65,12 +67,9 @@ class DocsSettings(object):
'django.contrib.sitemaps',

# Third party apps used in the project
# 'south', # Database migration app
# 'tinymce', # TinyMCE
'easy_thumbnails', # Thumbnailer
# Auth views and registration app
'django_registration' if DJANGO_GTE_3_0 else 'registration',
# 'localeurl', # Locale URL

# *****************************************************************
# *****************************************************************
Expand Down

0 comments on commit 950026a

Please sign in to comment.