Skip to content
Snippets Groups Projects
Commit 9c116b83 authored by Elke Kreim's avatar Elke Kreim
Browse files

Merge version2 to master!

parents f401383e 03dd389a
No related branches found
No related tags found
No related merge requests found
Showing
with 4358 additions and 3 deletions
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
.project .project
.pydevproject .pydevproject
.settings .settings
.idea
*.egg-info
# python stuff # python stuff
*.pyc *.pyc
......
from .defaults import * from .defaults import *
from .logging import *
from django import conf from django import conf
# merge defaults with customized user settings # merge defaults with customized user settings
for setting_name in [k for k in globals().keys() if k.isupper()]: for setting_name in [k for k in globals().keys() if k.isupper()]:
......
# piwi stuff # piwi stuff
PIWIK_URL = 'piwik.it.hs-hannover.de' PIWIK_URL = 'piwik.it.hs-hannover.de'
PIWIK_SITE_ID = None PIWIK_SITE_ID = None
...@@ -14,6 +13,7 @@ PIWIK_SITE_ID = None ...@@ -14,6 +13,7 @@ PIWIK_SITE_ID = None
# 'f4' - light blue for faculty 4, "Wirtschaft und Informatik" - rgb(220, 50, 5) # 'f4' - light blue for faculty 4, "Wirtschaft und Informatik" - rgb(220, 50, 5)
# 'f5' - light blue for faculty 5, "Diakonie, Gesundheit und Soziales" - rgb(210, 60, 150) # 'f5' - light blue for faculty 5, "Diakonie, Gesundheit und Soziales" - rgb(210, 60, 150)
COLOR_SCHEME = 'service' COLOR_SCHEME = 'service'
HSH_COLOR_SCHEMES = ['service', 'zsw', 'f1', 'f2', 'f3', 'f4', 'f5']
# need some dependecies already available in another app for your own scss stuff? # need some dependecies already available in another app for your own scss stuff?
# no problem - by default we already add the hshassets/assets/sass/lib for you # no problem - by default we already add the hshassets/assets/sass/lib for you
...@@ -23,7 +23,7 @@ COLOR_SCHEME = 'service' ...@@ -23,7 +23,7 @@ COLOR_SCHEME = 'service'
# TODO: if you provide a str instead of tuple this path might be treated absolute or rel to project root! # TODO: if you provide a str instead of tuple this path might be treated absolute or rel to project root!
# read utils.get_scss_include_paths() for further information # read utils.get_scss_include_paths() for further information
SCSS_INCLUDE_PATHS = [ SCSS_INCLUDE_PATHS = [
('hshassets', ['sass/lib/']), ('hshassets', ['sass/']),
] ]
# URI to the live service.it portal # URI to the live service.it portal
......
import logging.config
LOGGING_CONFIG = None
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'filters': {
'require_debug_false': {
'()': 'django.utils.log.RequireDebugFalse',
},
'require_debug_true': {
'()': 'django.utils.log.RequireDebugTrue',
},
},
'formatters': {
'with_timestamp': {
'format': '[%(asctime)s %(levelname)s %(thread)d] %(message)s',
'datefmt': '%Y-%m-%d %H:%M:%S',
},
'without_timestamp': {
'format': '%(name)s %(levelname)s: %(message)s',
}
},
'handlers': {
'console': {
'level': 'INFO',
'class': 'logging.StreamHandler',
'formatter': 'with_timestamp'
},
'null': {
'class': 'logging.NullHandler',
},
'console_without_timestamp': {
'level': 'INFO',
'class': 'logging.StreamHandler',
'formatter': 'without_timestamp'
}
},
'loggers': {
'': {
'handlers': ['console'],
'level': 'INFO'
},
'django': {
'level': 'WARNING',
'handlers': ['console'],
'propagate': False,
},
'django.db': {
'level': 'INFO',
'handlers': ['console'],
'propagate': False,
},
'django.request': {
'handlers': ['console'],
'level': 'WARNING',
'propagate': False,
},
'django.server': {
'handlers': ['console'],
'level': 'WARNING',
'propagate': False,
},
'django.security': {
'handlers': ['console'],
'level': 'WARNING',
'propagate': False,
},
'django.template': {
'handlers': ['console'],
'level': 'INFO',
'propagate': False,
},
'hshassets': {
'handlers': ['console_without_timestamp', ],
'level': 'INFO',
'propagate': False,
},
}
}
logging.config.dictConfig(LOGGING)
File deleted
File added
This diff is collapsed.
File added
File added
File added
File added
This diff is collapsed.
File added
File added
File added
File added
This diff is collapsed.
File added
File added
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment