IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-07 22:53:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #958

Browse Source
This commit is contained in:
James Cole 2017-11-18 20:26:57 +01:00
parent cd42399c29
commit 7e66794cf5
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Support/Twig/General.php
View File

@ -25,6 +25,7 @@ namespace FireflyIII\Support\Twig;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionJournal;
use League\CommonMark\CommonMarkConverter;
use Route;
use Steam;
use Twig_Extension;
@ -45,6 +46,7 @@ class General extends Twig_Extension
$this->balance(),
$this->formatFilesize(),
$this->mimeIcon(),
$this->markdown(),
];
}
@ -146,6 +148,21 @@ class General extends Twig_Extension
);
}
/**
* @return Twig_SimpleFilter
*/
protected function markdown(): Twig_SimpleFilter
{
return new Twig_SimpleFilter(
'markdown',
function (string $text): string {
$converter = new CommonMarkConverter;
return $converter->convertToHtml($text);
},['is_safe' => ['html']]
);
}
/**
* @return Twig_SimpleFilter
*/
@ -164,6 +181,7 @@ class General extends Twig_Extension
);
}
/**
* @return Twig_SimpleFunction
*/

2
resources/views/form/location.twig
View File

@ -3,7 +3,7 @@
<div class="col-sm-8">
{% if env('MAPBOX_API_KEY','') == '' %}
<p class="text-danger">
{{ trans('mapbox_api_key')|raw }}
{{ trans('firefly.mapbox_api_key')|raw }}
</p>
{% else %}
<div id="{{ name }}_map" style="width:100%;height:300px;"></div>

2
resources/views/rules/index.twig
View File

@ -130,7 +130,7 @@
{% if not rule.active %}
class="text-muted"
{% endif %}
><br/>{{ rule.description }}</small>
><br/>{{ rule.description|markdown }}</small>
{% endif %}
</td>

2
resources/views/rules/rule/create.twig
View File

@ -31,7 +31,7 @@
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.textarea('description') }}
{{ ExpandedForm.textarea('description', null, {helpText: trans('firefly.field_supports_markdown')}) }}
</div>
</div>
</div>

2
resources/views/rules/rule/edit.twig
View File

@ -30,7 +30,7 @@
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.textarea('description') }}
{{ ExpandedForm.textarea('description', null, {helpText: trans('firefly.field_supports_markdown')}) }}
</div>
</div>
</div>