X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Fdjango_passresetview.py;h=d931ccf1f64df5109f0f8848a0515e933a62b092;hb=ff6408f68dcb6231d5ad7941dc7db3d9cd9fa6bb;hp=8e57199831340e000a53e2d6125a7b4205372d5b;hpb=ecf7dd5d099c5b94952b6795b748380e2284bc14;p=unfold.git

diff --git a/portal/django_passresetview.py b/portal/django_passresetview.py
index 8e571998..d931ccf1 100644
--- a/portal/django_passresetview.py
+++ b/portal/django_passresetview.py
@@ -81,14 +81,14 @@ from django.http                        import HttpResponse, HttpResponseRedirec
 from unfold.loginrequired       import FreeAccessView
 from ui.topmenu                 import topmenu_items_live
 
-from manifold.manifoldapi       import execute_admin_query
+from manifoldapi.manifoldapi    import execute_admin_query
 from manifold.core.query        import Query
-from portal.actions                     import manifold_update_user
+from portal.actions             import manifold_update_user
 
 from portal.forms               import PassResetForm
 from portal.actions             import manifold_update_user
 
-
+from theme import ThemeView
 
 # 4 views for password reset:
 # - password_reset sends the mail
@@ -108,6 +108,10 @@ def password_reset(request, is_admin_site=False,
                    from_email=None,
                    current_app=None,
                    extra_context=None):
+    
+    themeview = ThemeView()
+    themeview.template_name = template_name
+    
     if post_reset_redirect is None:
         post_reset_redirect = reverse('portal.django_passresetview.password_reset_done')
     if request.method == "POST":
@@ -126,7 +130,7 @@ def password_reset(request, is_admin_site=False,
                     
             if flag == 0:
                 messages.error(request, 'Sorry, this email is not registered.')
-                return render(request, 'password_reset_form.html', {
+                return render(request, themeview.theme, {
                     'form': form,
                     })
             ### end of email check in manifold  ### 
@@ -147,20 +151,25 @@ def password_reset(request, is_admin_site=False,
         form = password_reset_form()
     context = {
         'form': form,
+        'theme': themeview.theme
     }
     if extra_context is not None:
         context.update(extra_context)
-    return TemplateResponse(request, template_name, context,
+    return TemplateResponse(request, themeview.template, context,
                             current_app=current_app)
 
 
 def password_reset_done(request,
                         template_name='password_reset_done.html',
                         current_app=None, extra_context=None):
-    context = {}
+    themeview = ThemeView()
+    themeview.template_name = template_name
+    context = {
+               'theme' : themeview.theme
+    }
     if extra_context is not None:
         context.update(extra_context)
-    return TemplateResponse(request, template_name, context,
+    return TemplateResponse(request, themeview.template, context,
                             current_app=current_app)
 
 
@@ -177,6 +186,9 @@ def password_reset_confirm(request, uidb36=None, token=None,
     View that checks the hash in a password reset link and presents a
     form for entering a new password.
     """
+    themeview = ThemeView()
+    themeview.template_name = template_name
+    
     UserModel = get_user_model()
     assert uidb36 is not None and token is not None  # checked by URLconf
     if post_reset_redirect is None:
@@ -217,22 +229,26 @@ def password_reset_confirm(request, uidb36=None, token=None,
     context = {
         'form': form,
         'validlink': validlink,
+        'theme' : themeview.theme
     }
     if extra_context is not None:
         context.update(extra_context)
-    return TemplateResponse(request, template_name, context,
+    return TemplateResponse(request, themeview.template, context,
                             current_app=current_app)
 
 
 def password_reset_complete(request,
                             template_name='password_reset_complete.html',
                             current_app=None, extra_context=None):
+    themeview = ThemeView()
+    themeview.template_name = template_name
     context = {
-        'login_url': resolve_url(settings.LOGIN_URL)
+        'login_url': resolve_url(settings.LOGIN_URL),
+        'theme' : themeview.theme
     }
     if extra_context is not None:
         context.update(extra_context)
-    return TemplateResponse(request, template_name, context,
+    return TemplateResponse(request, themeview.template, context,
                             current_app=current_app)