From 1fee62566b3a512da23aae4cf37741cab9a42730 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 22 Nov 2017 18:12:09 +0100 Subject: [PATCH] Fix some markdown related items for #1009 --- resources/views/piggy-banks/show.twig | 2 +- resources/views/transactions/show.twig | 2 +- resources/views/transactions/single/create.twig | 2 +- resources/views/transactions/single/edit.twig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index c429a24e14..fc45aa4490 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -100,7 +100,7 @@

{{ trans('form.notes') }}

- {{ note.markdown|raw }} + {{ note.text|markdown }}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig index 0a9c0b8167..b13a5d7823 100644 --- a/resources/views/transactions/show.twig +++ b/resources/views/transactions/show.twig @@ -240,7 +240,7 @@ {% if journal.notes.count == 1 %} {{ trans('list.notes') }} - {{ journal.notes.first.markdown|raw }} + {{ journal.notes.first.text|markdown }} {% endif %} diff --git a/resources/views/transactions/single/create.twig b/resources/views/transactions/single/create.twig index 3d6b24ec9a..58ae331006 100644 --- a/resources/views/transactions/single/create.twig +++ b/resources/views/transactions/single/create.twig @@ -165,7 +165,7 @@ {# NOTES #} {% if optionalFields.notes %} - {{ ExpandedForm.textarea('notes') }} + {{ ExpandedForm.textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }} {% endif %} diff --git a/resources/views/transactions/single/edit.twig b/resources/views/transactions/single/edit.twig index 21bc2f7d7c..19b1f6992e 100644 --- a/resources/views/transactions/single/edit.twig +++ b/resources/views/transactions/single/edit.twig @@ -184,7 +184,7 @@ {% if optionalFields.notes or data['notes'] %} - {{ ExpandedForm.textarea('notes', data['notes']) }} + {{ ExpandedForm.textarea('notes', data['notes'], {helpText: trans('firefly.field_supports_markdown')}) }} {% endif %}