Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev

Conflicts:
	auf_savoirs_en_partage/urls.py

diff --cc auf_savoirs_en_partage/urls.py
index b0b4007,37b784a..b1e15c3
--- 1/auf_savoirs_en_partage/urls.py
--- 2/auf_savoirs_en_partage/urls.py
+++ b/auf_savoirs_en_partage/urls.py
@@@ -1,16 -1,9 +1,15 @@@
  # -*- encoding: utf-8 -*-
  
 -from django.conf.urls.defaults import patterns, include, handler500, handler404, url
  from django.conf import settings
 +from django.conf.urls import patterns, include, url
 +from django.conf.urls.static import static
  from django.contrib import admin
 -from savoirs.rss import FilChercheurs, FilRessources, FilActualites, FilAppels, FilEvenements, FilSites, FilMessages
 +from django.views.generic import TemplateView
 +
 +from savoirs.rss import \
 +        FilChercheurs, FilRessources, FilActualites, \
 +        FilAppels, FilEvenements, FilSites, FilMessages
- from chercheurs.api import APIFilChercheurs
 +
  admin.autodiscover()
  
  handler500 = "views.page_500"
@@@ -31,119 -24,89 +30,119 @@@ sep_patterns = patterns
  urlpatterns = sep_patterns + patterns(
      '',
  
 -    (r'^informations/$', 'savoirs.views.informations'),
 +    url(r'^informations/$', 'savoirs.views.informations'),
  
      # agenda
 -    (r'^agenda/$', 'savoirs.views.evenement_index', {}, 'agenda'),
 -    (r'^agenda/evenements/(?P<id>\d+)/$', 'savoirs.views.evenement', {}, 'evenement'),
 -    (r'^agenda/evenements/moderer/$', 'savoirs.views.evenement_moderation'),
 -    (r'^agenda/evenements/moderer/(.+)/accepter/$', 'savoirs.views.evenement_accepter'),
 -    (r'^agenda/evenements/moderer/(.+)/refuser/$', 'savoirs.views.evenement_refuser'),
 -    (r'^agenda/evenements/utilisation/$', 'savoirs.views.page_statique', dict(id='conditions-agenda'), 'conditions-agenda'),
 -    (r'^agenda/evenements/creer/$', 'savoirs.views.evenement_ajout', {}, 'evenement-ajout'),
 -    (r'^agenda/evenements/creer/options_fuseau_horaire/$', 'savoirs.views.options_fuseau_horaire'),
 +    url(r'^agenda/$', 'savoirs.views.evenement_index', name='agenda'),
 +    url(r'^agenda/evenements/(?P<id>\d+)/$', 'savoirs.views.evenement',
 +        name='evenement'),
 +    url(r'^agenda/evenements/moderer/$', 'savoirs.views.evenement_moderation'),
 +    url(r'^agenda/evenements/moderer/(.+)/accepter/$',
 +        'savoirs.views.evenement_accepter'),
 +    url(r'^agenda/evenements/moderer/(.+)/refuser/$',
 +        'savoirs.views.evenement_refuser'),
 +    url(r'^agenda/evenements/utilisation/$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'conditions-agenda'}, name='conditions-agenda'),
 +    url(r'^agenda/evenements/creer/$', 'savoirs.views.evenement_ajout',
 +        name='evenement-ajout'),
 +    url(r'^agenda/evenements/creer/options_fuseau_horaire/$',
 +        'savoirs.views.options_fuseau_horaire'),
  
      # sous-menu droite
 -    (r'^a-propos/$', 'savoirs.views.page_statique', dict(id='a-propos'), 'a-propos'),
 -    (r'^aide/$', 'savoirs.views.page_statique', dict(id='aide'), 'aide'),
 -    (r'^domaines-de-recherche/$', 'savoirs.views.page_statique', dict(id='domaines-de-recherche'), 'domaines-de-recherche'),
 -    (r'^legal/$', 'savoirs.views.page_statique', dict(id='legal'), 'legal'),
 -    (r'^nous-contacter/$', 'savoirs.views.page_statique', dict(id='contact'), 'contact'),
 +    url(r'^a-propos/$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'a-propos'}, name='a-propos'),
 +    url(r'^aide/$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'aide'}, name='aide'),
 +    url(r'^domaines-de-recherche/$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'domaines-de-recherche'}, name='domaines-de-recherche'),
 +    url(r'^legal/$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'legal'}, name='legal'),
 +    url(r'^nous-contacter/$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'contact'}, name='contact'),
  
      # ressources
 -    (r'^ressources/$', 'savoirs.views.ressource_index', {}, 'ressources'),
 -    (r'^ressources/(?P<id>\d+)/$', 'savoirs.views.ressource_retrieve', {}, 'ressource'),
 +    url(r'^ressources/$', 'savoirs.views.ressource_index', name='ressources'),
 +    url(r'^ressources/(?P<id>\d+)/$', 'savoirs.views.ressource_retrieve',
 +        name='ressource'),
  
      # actualités
 -    (r'^actualites/$', 'savoirs.views.actualite_index', {}, 'actualites'),
 -    (r'^actualites/(?P<id>\d+)/$', 'savoirs.views.actualite', {}, 'actualite'),
 -    (r'^appels/$', 'savoirs.views.actualite_index', dict(type='appels'), 'appels'),
 +    url(r'^actualites/$', 'savoirs.views.actualite_index', name='actualites'),
 +    url(r'^actualites/(?P<id>\d+)/$', 'savoirs.views.actualite',
 +        name='actualite'),
 +    url(r'^appels/$', 'savoirs.views.actualite_index',
 +        kwargs={'type': 'appels'}, name='appels'),
  
      # sites
 -    (r'^sites/$', 'sitotheque.views.index', {}, 'sites'),
 -    (r'^sites/(?P<id>\d+)/$', 'sitotheque.views.retrieve', {}, 'site'),
 -    (r'^sites/google.xml$', 'sitotheque.views.config_google'),
 +    url(r'^sites/$', 'sitotheque.views.index', name='sites'),
 +    url(r'^sites/(?P<id>\d+)/$', 'sitotheque.views.retrieve', name='site'),
 +    url(r'^sites/google.xml$', 'sitotheque.views.config_google'),
  
      # sites AUF
 -    (r'^sites-auf/$', 'savoirs.views.sites_auf', {}, 'sites-auf'),
 +    url(r'^sites-auf/$', 'savoirs.views.sites_auf', name='sites-auf'),
  
      # chercheurs
 -    (r'^chercheurs/$', 'chercheurs.views.index', {}, 'chercheurs'),
 -    (r'^chercheurs/(?P<id>\d+)/$', 'chercheurs.views.retrieve', {}, 'chercheur'),
 -    (r'^chercheurs/inscription/$', 'chercheurs.views.inscription', {}, 'inscription'),
 -    (r'^chercheurs/inscription_faite/$', 'django.views.generic.simple.direct_to_template', dict(
 -        template='chercheurs/inscription_faite.html'
 -    ), 'chercheurs-inscription-faite'),
 -    (r'^chercheurs/activation/(?P<id_base36>.*)/(?P<token>.*)/$', 'chercheurs.views.activation', {}, 'chercheurs-activation'),
 -    (r'^chercheurs/desinscription/$', 'chercheurs.views.desinscription'),
 -    (r'^chercheurs/perso/$', 'chercheurs.views.perso'),
 -    (r'^chercheurs/edit/$', 'chercheurs.views.edit'),
 -    (r'^chercheurs/conversion$', 'savoirs.views.page_statique', dict(id='table-de-passage'), 'conversion'),
 -    (r'^chercheurs/connexion/$', 'chercheurs.views.login', dict(
 -        template_name='chercheurs/login.html'
 -    ), 'chercheurs-login'),
 -    (r'^chercheurs/deconnexion/$', 'django.contrib.auth.views.logout', dict(
 -        template_name='chercheurs/logged_out.html'
 -    ), 'chercheurs-logout'),
 -    (r'^chercheurs/changement-mdp/$', 'chercheurs.views.password_change', dict(
 -        template_name='chercheurs/password_change_form.html',
 -        post_change_redirect='/chercheurs/changement-mdp-fini/'
 -    ), 'chercheurs-password-change'),
 -    (r'^chercheurs/changement-mdp-fini/$', 'django.contrib.auth.views.password_change_done', dict(
 -        template_name='chercheurs/password_change_done.html'
 -    ), 'chercheurs-password-change-done'),
 -    (r'^chercheurs/oubli-mdp/$', 'django.contrib.auth.views.password_reset', dict(
 -        template_name='chercheurs/password_reset_form.html',
 -        email_template_name='chercheurs/password_reset_email.txt',
 -        post_reset_redirect='/chercheurs/oubli-mdp-envoye/'
 -    ), 'chercheurs-password-reset'),
 -    (r'^chercheurs/oubli-mdp-envoye/$', 'django.contrib.auth.views.password_reset_done', dict(
 -        template_name='chercheurs/password_reset_done.html'
 -    ), 'chercheurs-password-reset-done'),
 -    (r'^chercheurs/oubli-mdp-retour/(?P<uidb36>.*)/(?P<token>.*)/$', 'django.contrib.auth.views.password_reset_confirm', dict(
 -        template_name='chercheurs/password_reset_confirm.html'
 -    ), 'chercheurs-password-reset-confirm'),
 -    (r'^chercheurs/oubli-mdp-fini/$', 'django.contrib.auth.views.password_reset_complete', dict(
 -        template_name='chercheurs/password_reset_complete.html'
 -    )),
 -    (r'^etablissements/autocomplete/$', 'chercheurs.views.etablissements_autocomplete'),
 -    (r'^etablissements/autocomplete/(?P<pays>.*)/$', 'chercheurs.views.etablissements_autocomplete'),
 +    url(r'^chercheurs/$', 'chercheurs.views.index', name='chercheurs'),
 +    url(r'^chercheurs/(?P<id>\d+)/$', 'chercheurs.views.retrieve',
 +        name='chercheur'),
 +    url(r'^chercheurs/inscription/$', 'chercheurs.views.inscription',
 +        name='inscription'),
 +    url(r'^chercheurs/inscription_faite/$',
 +        TemplateView.as_view(
 +            template_name='chercheurs/inscription_faite.html'
 +        ),
 +        name='chercheurs-inscription-faite'),
 +    url(r'^chercheurs/activation/(?P<id_base36>.*)/(?P<token>.*)/$',
 +        'chercheurs.views.activation',
 +        name='chercheurs-activation'),
 +    url(r'^chercheurs/desinscription/$', 'chercheurs.views.desinscription'),
 +    url(r'^chercheurs/perso/$', 'chercheurs.views.perso'),
 +    url(r'^chercheurs/edit/$', 'chercheurs.views.edit'),
 +    url(r'^chercheurs/conversion$', 'savoirs.views.page_statique',
 +        kwargs={'id': 'table-de-passage'}, name='conversion'),
 +    url(r'^chercheurs/connexion/$', 'chercheurs.views.login',
 +        kwargs={'template_name': 'chercheurs/login.html'},
 +        name='chercheurs-login'),
 +    url(r'^chercheurs/deconnexion/$', 'django.contrib.auth.views.logout',
 +        kwargs={'template_name': 'chercheurs/logged_out.html'},
 +        name='chercheurs-logout'),
 +    url(r'^chercheurs/changement-mdp/$', 'chercheurs.views.password_change',
 +        kwargs={
 +            'template_name': 'chercheurs/password_change_form.html',
 +            'post_change_redirect': '/chercheurs/changement-mdp-fini/'
 +        },
 +        name='chercheurs-password-change'),
 +    url(r'^chercheurs/changement-mdp-fini/$',
 +        'django.contrib.auth.views.password_change_done',
 +        kwargs={'template_name': 'chercheurs/password_change_done.html'},
 +        name='chercheurs-password-change-done'),
 +    url(r'^chercheurs/oubli-mdp/$', 'django.contrib.auth.views.password_reset',
 +        kwargs={
 +            'template_name': 'chercheurs/password_reset_form.html',
 +            'email_template_name': 'chercheurs/password_reset_email.txt',
 +            'post_reset_redirect': '/chercheurs/oubli-mdp-envoye/'
 +        },
 +        name='chercheurs-password-reset'),
 +    url(r'^chercheurs/oubli-mdp-envoye/$',
 +        'django.contrib.auth.views.password_reset_done',
 +        kwargs={'template_name': 'chercheurs/password_reset_done.html'},
 +        name='chercheurs-password-reset-done'),
 +    url(r'^chercheurs/oubli-mdp-retour/(?P<uidb36>.*)/(?P<token>.*)/$',
 +        'django.contrib.auth.views.password_reset_confirm',
 +        kwargs={'template_name': 'chercheurs/password_reset_confirm.html'},
 +        name='chercheurs-password-reset-confirm'),
 +    url(r'^chercheurs/oubli-mdp-fini/$',
 +        'django.contrib.auth.views.password_reset_complete',
 +        kwargs={'template_name': 'chercheurs/password_reset_complete.html'}),
 +    url(r'^etablissements/autocomplete/$',
 +        'chercheurs.views.etablissements_autocomplete'),
 +    url(r'^etablissements/autocomplete/(?P<pays>.*)/$',
 +        'chercheurs.views.etablissements_autocomplete'),
  
      # API chercheurs
 -    (r'^api/chercheurs/(?P<chercheur_id>\d+)/$', 'chercheurs.api.api'),
 -    (r'^api/chercheurs/pays/(?P<pays>.*)/$', 'chercheurs.api.api'),
 -    (r'^api/chercheurs/region/(?P<region>.*)/$', 'chercheurs.api.api'),
 -    (r'^api/chercheurs/recherche', 'chercheurs.api.recherche' ),
 +    url(r'^api/chercheurs/(?P<chercheur_id>\d+)/$', 'chercheurs.api.api'),
 +    url(r'^api/chercheurs/pays/(?P<pays>.*)/$', 'chercheurs.api.api'),
 +    url(r'^api/chercheurs/region/(?P<region>.*)/$', 'chercheurs.api.api'),
-     url(r'^api/chercheurs/rss$', APIFilChercheurs()),
++    url(r'^api/chercheurs/recherche', 'chercheurs.api.recherche'),
  
  
      # groupes