# HG changeset patch
# User cavaliet
# Date 1409061055 -7200
# Node ID 25c28dd19898b6647e7eb6ac342849eeb5e4d3aa
# Parent  16c475baa0c09872414892465d9b6f18699f36e9
clean difference between alone hdabo and hdalab depending on hdabo.

diff -r 16c475baa0c0 -r 25c28dd19898 .hgignore
--- a/.hgignore	Tue Aug 26 15:28:46 2014 +0200
+++ b/.hgignore	Tue Aug 26 15:50:55 2014 +0200
@@ -31,4 +31,6 @@
 syntax: regexp
 ^src/hdabo/config\.py$
 syntax: regexp
-^web/static/media/thumbnails/renkan/renkan_default_icon\.png\.100x100_q85\.png$
\ No newline at end of file
+^web/static/media/thumbnails/renkan/renkan_default_icon\.png\.100x100_q85\.png$
+syntax: regexp
+^src/hdalab/config\.py$
\ No newline at end of file
diff -r 16c475baa0c0 -r 25c28dd19898 .pydevproject
--- a/.pydevproject	Tue Aug 26 15:28:46 2014 +0200
+++ b/.pydevproject	Tue Aug 26 15:50:55 2014 +0200
@@ -2,7 +2,7 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">hdabo_python</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/${PROJECT_DIR_NAME}/src</path>
diff -r 16c475baa0c0 -r 25c28dd19898 src/hdabo/settings.py
--- a/src/hdabo/settings.py	Tue Aug 26 15:28:46 2014 +0200
+++ b/src/hdabo/settings.py	Tue Aug 26 15:50:55 2014 +0200
@@ -132,11 +132,6 @@
     'haystack',
 )
 
-SOUTH_MIGRATION_MODULES = {
-    'easy_thumbnails': 'easy_thumbnails.south_migrations',
-}
-DEFAULT_RENKAN_ICON = "thumbnails/renkan/renkan_default_icon.png"
-
 ugettext = lambda s:s
 LANGUAGES = (
   ('fr', ugettext('French')),
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"
+
diff -r 16c475baa0c0 -r 25c28dd19898 src/hdalab/urls.py
--- a/src/hdalab/urls.py	Tue Aug 26 15:28:46 2014 +0200
+++ b/src/hdalab/urls.py	Tue Aug 26 15:50:55 2014 +0200
@@ -20,6 +20,7 @@
     # Uncomment the next line to enable the admin:
     #url(r'^admin/', include(admin.site.urls)),
     
+    url(r'^hdabo/', include('hdabo.urls')),
     url(r'^i18n/', include('django.conf.urls.i18n')),
     url('^jsi18n/?$', 'django.views.i18n.javascript_catalog', name='jsi18n.all'),
     url('^jsi18n/(?P<packages>\S+?)/$', 'django.views.i18n.javascript_catalog', {'domain':'djangojs'}, name='jsi18n'),