Django

Code

Changeset 2700

Show
Ignore:
Timestamp:
04/15/06 11:46:54 (3 years ago)
Author:
adrian
Message:

magic-removal: Fixed #500 -- Removed TEMPLATE_FILE_EXTENSION setting so that template loading requires you to give the full filename, including extension. This applies everywhere, even in the 'extends' and 'include' template tags.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/conf/global_settings.py

    r2666 r2700  
    103103TEMPLATE_DIRS = () 
    104104 
    105 # Extension on all templates. 
    106 TEMPLATE_FILE_EXTENSION = '.html' 
    107  
    108105# List of callables that know how to import templates from various sources. 
    109106# See the comments in django/core/template/loader.py for interface 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/404.html

    r1068 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/500.html

    r1068 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/base_site.html

    r2121 r2700  
    1 {% extends "admin/base" %} 
     1{% extends "admin/base.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/change_form.html

    r2625 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n admin_modify adminmedia %} 
    33{% block extrahead %}{{ block.super }} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/change_list.html

    r2625 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load adminmedia admin_list i18n %} 
    33{% block stylesheet %}{% admin_media_prefix %}css/changelists.css{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/delete_confirmation.html

    r2662 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/bookmarklets.html

    r2388 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22 
    33{% block breadcrumbs %}{% load i18n %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{% trans "Documentation" %}</a> &rsaquo; {% trans "Bookmarklets" %}</div>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/index.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/missing_docutils.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">Home</a> &rsaquo; Documentation</div>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/model_detail.html

    r2421 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block userlinks %}<a href="../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/model_index.html

    r2099 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block coltype %}colSM{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/template_detail.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name }}</div>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/template_filter_index.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block coltype %}colSM{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/template_tag_index.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block coltype %}colSM{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/view_detail.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; <a href="../">Views</a> &rsaquo; {{ name }}</div>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin_doc/view_index.html

    r1521 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block coltype %}colSM{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/index.html

    r2630 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 
    …… 
    1515    {% for app in app_list %} 
    1616        <div class="module"> 
    17         <table summary="{% blocktrans with app.name as name %}Models available in the {{ name }} application.{% endblocktrans %}">  
     17        <table summary="{% blocktrans with app.name as name %}Models available in the {{ name }} application.{% endblocktrans %}"> 
    1818        <caption>{{ app.name }}</caption> 
    1919        {% for model in app.models %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/login.html

    r2627 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/object_history.html

    r2657 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block userlinks %}<a href="../../../../doc/">{% trans 'Documentation' %}</a> / <a href="../../../../password_change/">{% trans 'Change password' %}</a> / <a href="../../../../logout/">{% trans 'Log out' %}</a>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/admin/template_validator.html

    r948 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22 
    33{% block content %} 

  • django/branches/magic-removal/django/contrib/admin/templates/registration/logged_out.html

    r1068 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/registration/password_change_done.html

    r1068 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/registration/password_change_form.html

    r2137 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33{% block userlinks %}<a href="../doc/">{% trans 'Documentation' %}</a> / {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %} 

  • django/branches/magic-removal/django/contrib/admin/templates/registration/password_reset_done.html

    r1068 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/registration/password_reset_form.html

    r1432 r2700  
    1 {% extends "admin/base_site" %} 
     1{% extends "admin/base_site.html" %} 
    22{% load i18n %} 
    33 

  • django/branches/magic-removal/django/contrib/admin/templates/widget/many_to_many.html

    r1434 r2700  
    1 {% include "widget/foreign" %} 
     1{% include "widget/foreign.html" %} 

  • django/branches/magic-removal/django/contrib/admin/templates/widget/one_to_one.html

    r1904 r2700  
    1 {% include "widget/foreign" %} 
     1{% include "widget/foreign.html" %} 

  • django/branches/magic-removal/django/contrib/admin/templatetags/admin_list.py

    r2688 r2700  
    6666        '1': 1, 
    6767    } 
    68 pagination = register.inclusion_tag('admin/pagination')(pagination) 
     68pagination = register.inclusion_tag('admin/pagination.html')(pagination) 
    6969 
    7070def result_headers(cl): 
    …… 
    186186            'result_headers': list(result_headers(cl)), 
    187187            'results': list(results(cl))} 
    188 result_list = register.inclusion_tag("admin/change_list_results")(result_list) 
     188result_list = register.inclusion_tag("admin/change_list_results.html")(result_list) 
    189189 
    190190def date_hierarchy(cl): 
    …… 
    246246                } for year in years] 
    247247            } 
    248 date_hierarchy = register.inclusion_tag('admin/date_hierarchy')(date_hierarchy) 
     248date_hierarchy = register.inclusion_tag('admin/date_hierarchy.html')(date_hierarchy) 
    249249 
    250250def search_form(cl): 
    …… 
    254254        'search_var': SEARCH_VAR 
    255255    } 
    256 search_form = register.inclusion_tag('admin/search_form')(search_form) 
     256search_form = register.inclusion_tag('admin/search_form.html')(search_form) 
    257257 
    258258def filter(cl, spec): 
    259259    return {'title': spec.title(), 'choices' : list(spec.choices(cl))} 
    260 filter = register.inclusion_tag('admin/filter')(filter) 
     260filter = register.inclusion_tag('admin/filter.html')(filter) 
    261261 
    262262def filters(cl): 
    263263    return {'cl': cl} 
    264 filters = register.inclusion_tag('admin/filters')(filters) 
     264filters = register.inclusion_tag('admin/filters.html')(filters) 

  • django/branches/magic-removal/django/contrib/admin/templatetags/admin_modify.py

    r2651 r2700  
    3636        'show_save': True 
    3737    } 
    38 submit_row = register.inclusion_tag('admin/submit_line', takes_context=True)(submit_row) 
     38submit_row = register.inclusion_tag('admin/submit_line.html', takes_context=True)(submit_row) 
    3939 
    4040def field_label(bound_field): 
    …… 
    6565            try: 
    6666                field_class_name = klass.__name__ 
    67                 template_name = "widget/%s" % class_name_to_underscored(field_class_name) 
     67                template_name = "widget/%s.html" % class_name_to_underscored(field_class_name) 
    6868                nodelist = loader.get_template(template_name).nodelist 
    6969            except template.TemplateDoesNotExist: 
    …… 
    7373                else: 
    7474                    if not cls.default: 
    75                         cls.default = loader.get_template("widget/default").nodelist 
     75                        cls.default = loader.get_template("widget/default.html").nodelist 
    7676                    nodelist = cls.default 
    7777 
    …… 
    127127 
    128128    def template_name(self): 
    129         return "admin/edit_inline_tabular" 
     129        return "admin/edit_inline_tabular.html" 
    130130 
    131131class StackedBoundRelatedObject(BoundRelatedObject): 
    …… 
    139139 
    140140    def template_name(self): 
    141         return "admin/edit_inline_stacked" 
     141        return "admin/edit_inline_stacked.html" 
    142142 
    143143class EditInlineNode(template.Node): 
    …… 
    230230        'class_names': " ".join(class_names), 
    231231    } 
    232 admin_field_line = register.inclusion_tag('admin/field_line', takes_context=True)(admin_field_line) 
     232admin_field_line = register.inclusion_tag('admin/field_line.html', takes_context=True)(admin_field_line) 

  • django/branches/magic-removal/django/contrib/admin/views/decorators.py

    r2211 r2700  
    2020    else: 
    2121        post_data = _encode_post_data({}) 
    22     return render_to_response('admin/login', { 
     22    return render_to_response('admin/login.html', { 
    2323        'title': _('Log in'), 
    2424        'app_path': request.path, 

  • django/branches/magic-removal/django/contrib/admin/views/doc.py

    r2601 r2700  
    1818    if not utils.docutils_is_available: 
    1919        return missing_docutils_page(request) 
    20     return render_to_response('admin_doc/index', context_instance=RequestContext(request)) 
     20    return render_to_response('admin_doc/index.html', context_instance=RequestContext(request)) 
    2121doc_index = staff_member_required(doc_index) 
    2222 
    …… 
    2424    # Hack! This couples this view to the URL it lives at. 
    2525    admin_root = request.path[:-len('doc/bookmarklets/')] 
    26     return render_to_response('admin_doc/bookmarklets', { 
     26    return render_to_response('admin_doc/bookmarklets.html', { 
    2727        'admin_url': "%s://%s%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', get_host(request), admin_root), 
    2828    }, context_instance=RequestContext(request)) 
    …… 
    5757            }) 
    5858 
    59     return render_to_response('admin_doc/template_tag_index', {'tags': tags}, context_instance=RequestContext(request)) 
     59    return render_to_response('admin_doc/template_tag_index.html', {'tags': tags}, context_instance=RequestContext(request)) 
    6060template_tag_index = staff_member_required(template_tag_index) 
    6161 
    …… 
    8787                'library': tag_library, 
    8888            }) 
    89     return render_to_response('admin_doc/template_filter_index', {'filters': filters}, context_instance=RequestContext(request)) 
     89    return render_to_response('admin_doc/template_filter_index.html', {'filters': filters}, context_instance=RequestContext(request)) 
    9090template_filter_index = staff_member_required(template_filter_index) 
    9191 
    …… 
    9898    else: 
    9999        settings_modules = [settings] 
    100      
    101     views = []         
     100 
     101    views = [] 
    102102    for settings_mod in settings_modules: 
    103103        urlconf = __import__(settings_mod.ROOT_URLCONF, '', '', ['']) 
    …… 
    111111                'url': simplify_regex(regex), 
    112112            }) 
    113     return render_to_response('admin_doc/view_index', {'views': views}, context_instance=RequestContext(request)) 
     113    return render_to_response('admin_doc/view_index.html', {'views': views}, context_instance=RequestContext(request)) 
    114114view_index = staff_member_required(view_index) 
    115115 
    …… 
    130130    for key in metadata: 
    131131        metadata[key] = utils.parse_rst(metadata[key], 'model', 'view:' + view) 
    132     return render_to_response('admin_doc/view_detail', { 
     132    return render_to_response('admin_doc/view_detail.html', { 
    133133        'name': view, 
    134134        'summary': title, 
    …… 
    143143 
    144144    m_list = [m._meta for m in models.get_models()] 
    145     return render_to_response('admin_doc/model_index', {'models': m_list}, context_instance=RequestContext(request)) 
     145    return render_to_response('admin_doc/model_index.html', {'models': m_list}, context_instance=RequestContext(request)) 
    146146model_index = staff_member_required(model_index) 
    147147 
    …… 
    168168    fields = [] 
    169169    for field in opts.fields: 
    170         # ForeignKey is a special case since the field will actually be a  
    171         # descriptor that returns the other object  
     170        # ForeignKey is a special case since the field will actually be a 
     171        # descriptor that returns the other object 
    172172        if isinstance(field, models.ForeignKey): 
    173173            data_type = related_object_name = field.rel.to.__name__ 
    174174            app_label = field.rel.to._meta.app_label 
    175             verbose = utils.parse_rst(("the related `%s.%s` object"  % (app_label, data_type)), 'model', 'model:' + data_type)  
     175            verbose = utils.parse_rst(("the related `%s.%s` object"  % (app_label, data_type)), 'model', 'model:' + data_type) 
    176176        else: 
    177177            data_type = get_readable_field_data_type(field) 
    …… 
    201201                'verbose': verbose, 
    202202            }) 
    203              
     203 
    204204    # Gather related objects 
    205205    for rel in opts.get_all_related_objects(): 
    …… 
    215215        }) 
    216216 
    217     return render_to_response('admin_doc/model_detail', { 
     217    return render_to_response('admin_doc/model_detail.html', { 
    218218        'name': '%s.%s' % (opts.app_label, opts.object_name), 
    219219        'summary': "Fields on %s objects" % opts.object_name, 
    …… 
    237237                'order': list(settings_mod.TEMPLATE_DIRS).index(dir), 
    238238            }) 
    239     return render_to_response('admin_doc/template_detail', { 
     239    return render_to_response('admin_doc/template_detail.html', { 
    240240        'name': template, 
    241241        'templates': templates, 
    …… 
    249249def missing_docutils_page(request): 
    250250    """Display an error message for people without docutils""" 
    251     return render_to_response('admin_doc/missing_docutils') 
     251    return render_to_response('admin_doc/missing_docutils.html') 
    252252 
    253253def load_all_installed_template_libraries(): 
    …… 
    336336    # handle named groups first 
    337337    pattern = named_group_matcher.sub(lambda m: m.group(1), pattern) 
    338      
     338 
    339339    # handle non-named groups 
    340340    pattern = non_named_group_matcher.sub("<var>", pattern) 
    341          
    342     # clean up any outstanding regex-y characters.     
     341 
     342    # clean up any outstanding regex-y characters. 
    343343    pattern = pattern.replace('^', '').replace('$', '').replace('?', '').replace('//', '/').replace('\\', '') 
    344344    if not pattern.startswith('/'): 

  • django/branches/magic-removal/django/contrib/admin/views/main.py

    r2662 r2700  
    219219    context.update(extra_context) 
    220220    return render_to_response([ 
    221         "admin/%s/%s/change_form" % (app_label, opts.object_name.lower()), 
    222         "admin/%s/change_form" % app_label, 
    223         "admin/change_form"], context_instance=context) 
     221        "admin/%s/%s/change_form.html" % (app_label, opts.object_name.lower()), 
     222        "admin/%s/change_form.html" % app_label, 
     223        "admin/change_form.html"], context_instance=context) 
    224224 
    225225def index(request): 
    226     return render_to_response('admin/index', {'title': _('Site administration')}, context_instance=template.RequestContext(request)) 
     226    return render_to_response('admin/index.html', {'title': _('Site administration')}, context_instance=template.RequestContext(request)) 
    227227index = staff_member_required(never_cache(index)) 
    228228 
    …… 
    516516        "opts": model._meta, 
    517517    } 
    518     return render_to_response(["admin/%s/%s/delete_confirmation" % (app_label, opts.object_name.lower() ), 
    519                                "admin/%s/delete_confirmation" % app_label , 
    520                                "admin/delete_confirmation"], extra_context, context_instance=template.RequestContext(request)) 
     518    return render_to_response(["admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower() ), 
     519                               "admin/%s/delete_confirmation.html" % app_label , 
     520                               "admin/delete_confirmation.html"], extra_context, context_instance=template.RequestContext(request)) 
    521521delete_stage = staff_member_required(never_cache(delete_stage)) 
    522522 
    …… 
    536536        'object': obj, 
    537537    } 
    538     return render_to_response(["admin/%s/%s/object_history" % (app_label, model._meta.object_name.lower()), 
    539                                "admin/%s/object_history" % app_label , 
    540                                "admin/object_history"], extra_context, context_instance=template.RequestContext(request)) 
     538    return render_to_response(["admin/%s/%s/object_history.html" % (app_label, model._meta.object_name.lower()), 
     539                               "admin/%s/object_history.html" % app_label , 
     540                               "admin/object_history.html"], extra_context, context_instance=template.RequestContext(request)) 
    541541history = staff_member_required(never_cache(history)) 
    542542 
    …… 
    735735    }) 
    736736    c.update({'has_add_permission': c['perms'][app_label][cl.opts.get_add_permission()]}), 
    737     return render_to_response(['admin/%s/%s/change_list' % (app_label, cl.opts.object_name.lower()), 
    738                                'admin/%s/change_list' % app_label, 
    739                                'admin/change_list'], context_instance=c) 
     737    return render_to_response(['admin/%s/%s/change_list.html' % (app_label, cl.opts.object_name.lower()), 
     738                               'admin/%s/change_list.html' % app_label, 
     739                               'admin/change_list.html'], context_instance=c) 
    740740change_list = staff_member_required(never_cache(change_list)) 

  • django/branches/magic-removal/django/contrib/admin/views/template.py

    r2050 r2700  
    2424        if not errors: 
    2525            request.user.add_message('The template is valid.') 
    26     return render_to_response('admin/template_validator', { 
     26    return render_to_response('admin/template_validator.html', { 
    2727        'title': 'Template validator', 
    2828        'form': forms.FormWrapper(manipulator, new_data, errors), 

  • django/branches/magic-removal/django/contrib/auth/forms.py

    r2498 r2700  
    7676        else: 
    7777            site_name = domain = domain_override 
    78         t = loader.get_template('registration/password_reset_email') 
     78        t = loader.get_template('registration/password_reset_email.html') 
    7979        c = { 
    8080            'new_password': new_pass, 

  • django/branches/magic-removal/django/contrib/auth/views.py

    r2659 r2700  
    2626        errors = {} 
    2727    request.session.set_test_cookie() 
    28     return render_to_response('registration/login', { 
     28    return render_to_response('registration/login.html', { 
    2929        'form': forms.FormWrapper(manipulator, request.POST, errors), 
    3030        REDIRECT_FIELD_NAME: redirect_to, 
    …… 
    3737        del request.session[SESSION_KEY] 
    3838    except KeyError: 
    39         return render_to_response('registration/logged_out', {'title': 'Logged out'}, context_instance=RequestContext(request)) 
     39        return render_to_response('registration/logged_out.html', {'title': 'Logged out'}, context_instance=RequestContext(request)) 
    4040    else: 
    4141        # Redirect to this page until the session has been cleared. 
    …… 
    6262                form.save() 
    6363            return HttpResponseRedirect('%sdone/' % request.path) 
    64     return render_to_response('registration/password_reset_form', {'form': forms.FormWrapper(form, new_data, errors)}, 
     64    return render_to_response('registration/password_reset_form.html', {'form': forms.FormWrapper(form, new_data, errors)}, 
    6565        context_instance=RequestContext(request)) 
    6666 
    6767def password_reset_done(request): 
    68     return render_to_response('registration/password_reset_done', context_instance=RequestContext(request)) 
     68    return render_to_response('registration/password_reset_done.html', context_instance=RequestContext(request)) 
    6969 
    7070def password_change(request): 
    …… 
    7777            form.save(new_data) 
    7878            return HttpResponseRedirect('%sdone/' % request.path) 
    79     return render_to_response('registration/password_change_form', {'form': forms.FormWrapper(form, new_data, errors)}, 
     79    return render_to_response('registration/password_change_form.html', {'form': forms.FormWrapper(form, new_data, errors)}, 
    8080        context_instance=RequestContext(request)) 
    8181password_change = login_required(password_change) 
    8282 
    8383def password_change_done(request): 
    84     return render_to_response('registration/password_change_done', context_instance=RequestContext(request)) 
     84    return render_to_response('registration/password_change_done.html', context_instance=RequestContext(request)) 

  • django/branches/magic-removal/django/contrib/comments/views/comments.py

    r2493 r2700  
    233233        comment = errors and '' or manipulator.get_comment(new_data) 
    234234        comment_form = CommentFormWrapper(manipulator, new_data, errors, rating_choices) 
    235         return render_to_response('comments/preview', { 
     235        return render_to_response('comments/preview.html', { 
    236236            'comment': comment, 
    237237            'comment_form': comment_form, 
    …… 
    301301    if errors or request.POST.has_key('preview'): 
    302302        comment = errors and '' or manipulator.get_comment(new_data) 
    303         return render_to_response('comments/free_preview', { 
     303        return render_to_response('comments/free_preview.html', { 
    304304            'comment': comment, 
    305305            'comment_form': forms.FormWrapper(manipulator, new_data, errors), 
    …… 
    338338        except ObjectDoesNotExist: 
    339339            pass 
    340     return render_to_response('comments/posted', {'object': obj}, context_instance=RequestContext(request)) 
     340    return render_to_response('comments/posted.html', {'object': obj}, context_instance=RequestContext(request)) 

  • django/branches/magic-removal/django/contrib/comments/views/karma.py

    r2050 r2700  
    2727    # Reload comment to ensure we have up to date karma count 
    2828    comment = comments.get_object(pk=comment_id) 
    29     return render_to_response('comments/karma_vote_accepted', {'comment': comment}, context_instance=RequestContext(request)) 
     29    return render_to_response('comments/karma_vote_accepted.html', {'comment': comment}, context_instance=RequestContext(request)) 

  • django/branches/magic-removal/django/contrib/comments/views/userflags.py

    r2497 r2700  
    2323        userflags.flag(comment, request.us