Permalink
Browse files

we should not use dashes within template names as it is a django guid…

…eline
  • Loading branch information...
1 parent 7a31036 commit 82af0400c6c0a0052d7251381e7a25ac3b94b3d3 @FinalAngel FinalAngel committed Jan 18, 2013
View
@@ -152,8 +152,8 @@ class PageAdmin(ModelAdmin):
form = PageForm
# TODO: add the new equivalent of 'cmsplugin__text__body' to search_fields'
search_fields = ('title_set__slug', 'title_set__title', 'reverse_id')
- revision_form_template = "admin/cms/page/history/revision-header.html"
- recover_form_template = "admin/cms/page/history/recover-header.html"
+ revision_form_template = "admin/cms/page/history/revision_header.html"
+ recover_form_template = "admin/cms/page/history/recover_header.html"
exclude = []
mandatory_placeholders = ('title', 'slug', 'parent', 'site', 'meta_description', 'meta_keywords', 'page_title', 'menu_title')
@@ -1285,7 +1285,7 @@ def edit_plugin(self, request, plugin_id):
context.update({
"deleted":True,
})
- return render_to_response('admin/cms/page/plugin/confirm-form.html', context, RequestContext(request))
+ return render_to_response('admin/cms/page/plugin/confirm_form.html', context, RequestContext(request))
if not instance:
# instance doesn't exist, call add view
@@ -1322,7 +1322,7 @@ def edit_plugin(self, request, plugin_id):
'icon': force_escape(saved_object.get_instance_icon_src()),
'alt': force_escape(saved_object.get_instance_icon_alt()),
}
- return render_to_response('admin/cms/page/plugin/confirm-form.html', context, RequestContext(request))
+ return render_to_response('admin/cms/page/plugin/confirm_form.html', context, RequestContext(request))
return response
@@ -1547,9 +1547,9 @@ def edit_title(self, request, page_id):
context.update({
'cancel': True,
})
- return render_to_response('admin/cms/page/plugin/confirm-form.html', context, RequestContext(request))
+ return render_to_response('admin/cms/page/plugin/confirm_form.html', context, RequestContext(request))
if not cancel_clicked and request.method == 'POST' and saved_successfully:
- return render_to_response('admin/cms/page/plugin/confirm-form.html', context, RequestContext(request))
+ return render_to_response('admin/cms/page/plugin/confirm_form.html', context, RequestContext(request))
return render_to_response('admin/cms/page/page_attribute_change_form.html', context, RequestContext(request))
@@ -220,7 +220,7 @@ def edit_plugin(self, request, plugin_id):
context.update({
"deleted":True,
})
- return render_to_response('admin/cms/page/plugin/confirm-form.html', context, RequestContext(request))
+ return render_to_response('admin/cms/page/plugin/confirm_form.html', context, RequestContext(request))
if not instance:
# instance doesn't exist, call add view
@@ -247,7 +247,7 @@ def edit_plugin(self, request, plugin_id):
'icon': force_escape(saved_object.get_instance_icon_src()),
'alt': force_escape(escapejs(saved_object.get_instance_icon_alt())),
}
- return render_to_response('admin/cms/page/plugin/confirm-form.html', context, RequestContext(request))
+ return render_to_response('admin/cms/page/plugin/confirm_form.html', context, RequestContext(request))
return response
View
@@ -81,7 +81,7 @@ class CMSPluginBase(admin.ModelAdmin):
name = ""
form = None
- change_form_template = "admin/cms/page/plugin/change-form.html"
+ change_form_template = "admin/cms/page/plugin/change_form.html"
frontend_edit_template = 'cms/toolbar/placeholder_plugin.html'
# Should the plugin be rendered in the admin?
admin_preview = False
@@ -1,4 +1,4 @@
-{% extends "admin/cms/page/plugin/change-form.html" %}
+{% extends "admin/cms/page/plugin/change_form.html" %}
{% load adminmedia %}
{% block fieldsets %}
@@ -1,4 +1,4 @@
-{% extends "admin/cms/page/history/revision-header.html" %}
+{% extends "admin/cms/page/history/revision_header.html" %}
{% load i18n %}
{% load url from future %}
{% comment %}
@@ -1,3 +1,3 @@
-{% extends "admin/cms/page/plugin/change-form.html" %}
+{% extends "admin/cms/page/plugin/change_form.html" %}
{% load i18n admin_modify adminmedia cms_admin %}
-{% load url from future %}
+{% load url from future %}
@@ -189,7 +189,7 @@ def get_context(self, context, plugin):
class PageSubmitRow(InclusionTag):
name = 'page_submit_row'
- template = 'admin/cms/page/submit-row.html'
+ template = 'admin/cms/page/submit_row.html'
def get_context(self, context):
opts = context['opts']

0 comments on commit 82af040

Please sign in to comment.