diff -r 16c475baa0c0 -r 25c28dd19898 src/hdalab/settings.py --- a/src/hdalab/settings.py Tue Aug 26 15:28:46 2014 +0200 +++ b/src/hdalab/settings.py Tue Aug 26 15:50:55 2014 +0200 @@ -123,6 +123,7 @@ ) INSTALLED_APPS = ( + 'hdabo', 'south', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -132,16 +133,39 @@ 'django.contrib.staticfiles', 'django.contrib.admin', 'django_extensions', - 'hdabo', + 'registration', + 'haystack', + 'easy_thumbnails', 'hdalab', + 'renkanmanager', ) -#WIKIPEDIA_API_URL = "http://fr.wikipedia.org/w/api.php" -#WIKIPEDIA_VERSION_PERMALINK_TEMPLATE = "http://fr.wikipedia.org/w/index.php?oldid=%s" -#DBPEDIA_URI_TEMPLATE = "http://dbpedia.org/resource/%s" +SOUTH_MIGRATION_MODULES = { + 'easy_thumbnails': 'easy_thumbnails.south_migrations', +} +DEFAULT_RENKAN_ICON = "thumbnails/renkan/renkan_default_icon.png" + +WIKIPEDIA_API_URL = "http://fr.wikipedia.org/w/api.php" +WIKIPEDIA_VERSION_PERMALINK_TEMPLATE = "http://fr.wikipedia.org/w/index.php?oldid=%s" +DBPEDIA_URI_TEMPLATE = "http://fr.dbpedia.org/%s/%s" +#DBPEDIA_URI_TEMPLATE = "http://fr.dbpedia.org/resource/%s" + +SEARCH_STAR_CHARACTER = "*" +PAGINATION_DEFAULT_NB_BY_PAGE = 50 + +# User class after migration to django > 1.6.5 +AUTH_USER_MODEL = 'hdabo.User' + +ACCOUNT_ACTIVATION_DAYS = 7 LOCALE_PATHS = () + from hdalab.config import * #@UnusedWildImport +if 'LOGIN_REDIRECT_URL' not in locals(): + LOGIN_REDIRECT_URL = BASE_URL + "hdabo" +if 'LOGIN_URL' not in locals(): + LOGIN_URL = BASE_URL + "hdabo/accounts/login" +