diff --git a/public/viewjs/recipeform.js b/public/viewjs/recipeform.js index 0d42139f..37e53075 100644 --- a/public/viewjs/recipeform.js +++ b/public/viewjs/recipeform.js @@ -169,3 +169,8 @@ $("#recipe-pos-add-button").on("click", function(e) } ); }); + +$('#description').summernote({ + minHeight: '300px', + lang: L('summernote_locale') +}); diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js index cb11ad21..44308ddd 100644 --- a/public/viewjs/recipes.js +++ b/public/viewjs/recipes.js @@ -159,4 +159,5 @@ $("#selectedRecipeToggleFullscreenButton").on('click', function(e) { $("#selectedRecipeCard").toggleClass("fullscreen"); $("#selectedRecipeCard .card-header").toggleClass("fixed-top"); + $("#selectedRecipeCard .card-body").toggleClass("mt-5"); }); diff --git a/services/DemoDataGeneratorService.php b/services/DemoDataGeneratorService.php index 75c3c483..15e5f703 100644 --- a/services/DemoDataGeneratorService.php +++ b/services/DemoDataGeneratorService.php @@ -67,10 +67,10 @@ class DemoDataGeneratorService extends BaseService INSERT INTO shopping_list (product_id, amount) VALUES (20, 1); INSERT INTO shopping_list (product_id, amount) VALUES (17, 1); - INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Pizza')}', '{$loremIpsum}'); --1 - INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Spaghetti bolognese')}', '{$loremIpsum}'); --2 - INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Sandwiches')}', '{$loremIpsum}'); --3 - INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Pancakes')}', '{$loremIpsum}'); --4 + INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Pizza')}', '{$loremIpsumWithHtmlFormattings}'); --1 + INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Spaghetti bolognese')}', '{$loremIpsumWithHtmlFormattings}'); --2 + INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Sandwiches')}', '{$loremIpsumWithHtmlFormattings}'); --3 + INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Pancakes')}', '{$loremIpsumWithHtmlFormattings}'); --4 INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 16, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1); diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php index 0dbdc3b7..feddb61e 100644 --- a/views/recipeform.blade.php +++ b/views/recipeform.blade.php @@ -8,6 +8,15 @@ @section('viewJsName', 'recipeform') +@push('pageScripts') + + @if(!empty($L('summernote_locale')))@endif +@endpush + +@push('pageStyles') + +@endpush + @section('content')
@@ -33,7 +42,7 @@
- +
diff --git a/views/recipes.blade.php b/views/recipes.blade.php index 1158519a..4fa06428 100644 --- a/views/recipes.blade.php +++ b/views/recipes.blade.php @@ -82,7 +82,7 @@
{{ $L('Preparation') }}
- {!! nl2br(htmlentities($selectedRecipe->description)) !!} + {!! $selectedRecipe->description !!}