Merge remote-tracking branch 'origin/main-heading'

This commit is contained in:
Chris Hill-Scott
2017-05-16 11:22:48 +01:00
3 changed files with 5 additions and 5 deletions

View File

@@ -290,7 +290,7 @@ class EmailTemplateForm(BaseTemplateForm):
class LetterTemplateForm(EmailTemplateForm): class LetterTemplateForm(EmailTemplateForm):
subject = TextAreaField( subject = TextAreaField(
u'Title', u'Main heading',
validators=[DataRequired(message="Cant be empty")]) validators=[DataRequired(message="Cant be empty")])
template_content = TextAreaField( template_content = TextAreaField(

View File

@@ -167,9 +167,9 @@ def add_template_by_type(service_id):
blank_letter = service_api_client.create_service_template( blank_letter = service_api_client.create_service_template(
'Untitled', 'Untitled',
'letter', 'letter',
'Content', 'Body',
service_id, service_id,
'Title', 'Main heading',
'normal', 'normal',
) )
return redirect(url_for( return redirect(url_for(

View File

@@ -1,10 +1,10 @@
<h2 class="heading-medium">Formatting</h2> <h2 class="heading-medium">Formatting</h2>
<p> <p>
To put a title in your template, use a hash: To put a heading in your template, use a hash:
</p> </p>
<div class="panel panel-border-wide"> <div class="panel panel-border-wide">
<p> <p>
# This is a title # This is a heading
</p> </p>
</div> </div>
<p> <p>