From 8c675615dfe7e90a8511cf1dcf1df8e27f4756d9 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 22 Oct 2016 11:47:47 +0200
Subject: [PATCH] Support markdown in notes.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
---
 app/Http/Controllers/PiggyBankController.php |  8 ++++-
 resources/lang/en_US/firefly.php             |  1 +
 resources/views/form/textarea.twig           |  1 +
 resources/views/piggy-banks/create.twig      |  2 +-
 resources/views/piggy-banks/edit.twig        |  2 +-
 resources/views/piggy-banks/show.twig        | 31 ++++++++++----------
 6 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index ae9f639afb..1870a74e2f 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -17,11 +17,13 @@ use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Http\Requests\PiggyBankFormRequest;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Note;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Support\Collection;
 use Input;
+use League\CommonMark\CommonMarkConverter;
 use Log;
 use Preferences;
 use Session;
@@ -347,7 +349,11 @@ class PiggyBankController extends Controller
      */
     public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-        $note     = $piggyBank->notes()->first();
+        /** @var Note $note */
+        $note       = $piggyBank->notes()->first();
+        $converter  = new CommonMarkConverter;
+        $note->text = $converter->convertToHtml($note->text);
+
         $events   = $repository->getEvents($piggyBank);
         $subTitle = e($piggyBank->name);
 
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 773bef3979..768413e3fd 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -70,6 +70,7 @@ return [
     'source_accounts'                           => 'Source account(s)',
     'destination_accounts'                      => 'Destination account(s)',
     'user_id_is'                                => 'Your user id is <strong>:user</strong>',
+    'field_supports_markdown'                   => 'This field supports <a href="https://en.support.wordpress.com/markdown-quick-reference/">Markdown</a>.',
 
     // repeat frequencies:
     'repeat_freq_monthly'                       => 'monthly',
diff --git a/resources/views/form/textarea.twig b/resources/views/form/textarea.twig
index 0e534179e0..9bed7883e2 100644
--- a/resources/views/form/textarea.twig
+++ b/resources/views/form/textarea.twig
@@ -3,6 +3,7 @@
 
     <div class="col-sm-8">
         {{ Form.textarea(name, value, options) }}
+        {% include 'form/help.twig' %}
         {% include 'form/feedback.twig' %}
     </div>
 </div>
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index f6d055b46e..c2d5480ef1 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -31,7 +31,7 @@
                     </div>
                     <div class="box-body">
                         {{ ExpandedForm.date('targetdate') }}
-                        {{ ExpandedForm.textarea('note') }}
+                        {{ ExpandedForm.textarea('note', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
                     </div>
                 </div>
 
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index c12e629504..8daeef739f 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -33,7 +33,7 @@
                 </div>
                 <div class="box-body">
                     {{ ExpandedForm.date('targetdate') }}
-                    {{ ExpandedForm.textarea('note') }}
+                    {{ ExpandedForm.textarea('note', null, {helpText: trans('firefly.field_supports_markdown')}) }}
                 </div>
             </div>
 
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index 0b625d7680..6b394d3faa 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -73,20 +73,6 @@
                     </table>
                 </div>
             </div>
-
-            {% if note %}
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ trans('form.notes') }}</h3>
-                </div>
-                <div class="box-body">
-                    <p>
-                    {{ note.text|nl2br }}
-                    </p>
-                </div>
-            </div>
-            {% endif %}
-
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'table'|_ }}</h3>
@@ -96,8 +82,23 @@
                 </div>
             </div>
         </div>
-
     </div>
+    {% if note %}
+        <div class="row">
+            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ trans('form.notes') }}</h3>
+                    </div>
+                    <div class="box-body">
+                            {{ note.text|raw }}
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block scripts %}