Django

Code

Changeset 3087

Show
Ignore:
Timestamp:
06/06/06 00:16:05 (2 years ago)
Author:
adrian
Message:

Made template names in django.contrib.auth.views passable as template_name argument to the view

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/contrib/auth/views.py

    r2809 r3087  
    1010from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME 
    1111 
    12 def login(request): 
     12def login(request, template_name='registration/login.html'): 
    1313    "Displays the login form and handles the login action." 
    1414    manipulator = AuthenticationForm(request) 
     
    2626        errors = {} 
    2727    request.session.set_test_cookie() 
    28     return render_to_response('registration/login.html', { 
     28    return render_to_response(template_name, { 
    2929        'form': forms.FormWrapper(manipulator, request.POST, errors), 
    3030        REDIRECT_FIELD_NAME: redirect_to, 
     
    3232    }, context_instance=RequestContext(request)) 
    3333 
    34 def logout(request, next_page=None): 
     34def logout(request, next_page=None, template_name='registration/logged_out.html'): 
    3535    "Logs out the user and displays 'You are logged out' message." 
    3636    try: 
    3737        del request.session[SESSION_KEY] 
    3838    except KeyError: 
    39         return render_to_response('registration/logged_out.html', {'title': 'Logged out'}, context_instance=RequestContext(request)) 
     39        return render_to_response(template_name, {'title': 'Logged out'}, context_instance=RequestContext(request)) 
    4040    else: 
    4141        # Redirect to this page until the session has been cleared. 
     
    5050    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, next)) 
    5151 
    52 def password_reset(request, is_admin_site=False): 
     52def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html'): 
    5353    new_data, errors = {}, {} 
    5454    form = PasswordResetForm() 
     
    6262                form.save() 
    6363            return HttpResponseRedirect('%sdone/' % request.path) 
    64     return render_to_response('registration/password_reset_form.html', {'form': forms.FormWrapper(form, new_data, errors)}, 
     64    return render_to_response(template_name, {'form': forms.FormWrapper(form, new_data, errors)}, 
    6565        context_instance=RequestContext(request)) 
    6666 
    67 def password_reset_done(request): 
    68     return render_to_response('registration/password_reset_done.html', context_instance=RequestContext(request)) 
     67def password_reset_done(request, template_name='registration/password_reset_done.html'): 
     68    return render_to_response(template_name, context_instance=RequestContext(request)) 
    6969 
    70 def password_change(request): 
     70def password_change(request, template_name='registration/password_change_form.html'): 
    7171    new_data, errors = {}, {} 
    7272    form = PasswordChangeForm(request.user) 
     
    7777            form.save(new_data) 
    7878            return HttpResponseRedirect('%sdone/' % request.path) 
    79     return render_to_response('registration/password_change_form.html', {'form': forms.FormWrapper(form, new_data, errors)}, 
     79    return render_to_response(template_name, {'form': forms.FormWrapper(form, new_data, errors)}, 
    8080        context_instance=RequestContext(request)) 
    8181password_change = login_required(password_change) 
    8282 
    83 def password_change_done(request): 
    84     return render_to_response('registration/password_change_done.html', context_instance=RequestContext(request)) 
     83def password_change_done(request, template_name='registration/password_change_done.html'): 
     84    return render_to_response(template_name, context_instance=RequestContext(request)) 
  • django/trunk/docs/authentication.txt

    r3068 r3087  
    348348 
    349349It's your responsibility to provide the login form in a template called 
    350 ``registration/login.html``. This template gets passed three template context 
    351 variables: 
     350``registration/login.html`` by default. This template gets passed three 
     351template context variables: 
    352352 
    353353    * ``form``: A ``FormWrapper`` object representing the login form. See the 
     
    357357    * ``site_name``: The name of the current ``Site``, according to the 
    358358      ``SITE_ID`` setting. See the `site framework docs`_. 
     359 
     360If you'd prefer not to call the template ``registration/login.html``, you can 
     361pass the ``template_name`` parameter via the extra arguments to the view in 
     362your URLconf. For example, this URLconf line would use ``myapp/login.html`` 
     363instead:: 
     364 
     365    (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'myapp/login.html'}), 
    359366 
    360367Here's a sample ``registration/login.html`` template you can use as a starting