kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 20:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Use new editor also for recipes

Browse Source
This commit is contained in:
Bernd Bestel
2018-10-03 16:41:21 +02:00
parent ebd9b1b851
commit ebd24bf30e
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/viewjs/recipeform.js
View File

@@ -169,3 +169,8 @@ $("#recipe-pos-add-button").on("click", function(e)
} }
); );
}); });
$('#description').summernote({
minHeight: '300px',
lang: L('summernote_locale')
});

1
public/viewjs/recipes.js
View File

@@ -159,4 +159,5 @@ $("#selectedRecipeToggleFullscreenButton").on('click', function(e)
{ {
$("#selectedRecipeCard").toggleClass("fullscreen"); $("#selectedRecipeCard").toggleClass("fullscreen");
$("#selectedRecipeCard .card-header").toggleClass("fixed-top"); $("#selectedRecipeCard .card-header").toggleClass("fixed-top");
$("#selectedRecipeCard .card-body").toggleClass("mt-5");
}); });

8
services/DemoDataGeneratorService.php
View File

@@ -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 (20, 1);
INSERT INTO shopping_list (product_id, amount) VALUES (17, 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('Pizza')}', '{$loremIpsumWithHtmlFormattings}'); --1
INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Spaghetti bolognese')}', '{$loremIpsum}'); --2 INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Spaghetti bolognese')}', '{$loremIpsumWithHtmlFormattings}'); --2
INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Sandwiches')}', '{$loremIpsum}'); --3 INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Sandwiches')}', '{$loremIpsumWithHtmlFormattings}'); --3
INSERT INTO recipes (name, description) VALUES ('{$localizationService->Localize('Pancakes')}', '{$loremIpsum}'); --4 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, 16, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1);

11
views/recipeform.blade.php
View File

@@ -8,6 +8,15 @@
@section('viewJsName', 'recipeform') @section('viewJsName', 'recipeform')
@push('pageScripts')
<script src="{{ $U('/node_modules/summernote/dist/summernote-bs4.js?v=', true) }}{{ $version }}"></script>
@if(!empty($L('summernote_locale')))<script src="{{ $U('/node_modules', true) }}/summernote/dist/lang/summernote-{{ $L('summernote_locale') }}.js?v={{ $version }}"></script>@endif
@endpush
@push('pageStyles')
<link href="{{ $U('/node_modules/summernote/dist/summernote-bs4.css?v=', true) }}{{ $version }}" rel="stylesheet">
@endpush
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col"> <div class="col">
@@ -33,7 +42,7 @@
<div class="form-group"> <div class="form-group">
<label for="description">{{ $L('Preparation') }}</label> <label for="description">{{ $L('Preparation') }}</label>
<textarea id="description" class="form-control" name="description" rows="25">@if($mode == 'edit'){{ $recipe->description }}@endif</textarea> <textarea id="description" class="form-control" name="description">@if($mode == 'edit'){{ $recipe->description }}@endif</textarea>
</div> </div>
<button id="save-recipe-button" class="btn btn-success">{{ $L('Save') }}</button> <button id="save-recipe-button" class="btn btn-success">{{ $L('Save') }}</button>

2
views/recipes.blade.php
View File

@@ -82,7 +82,7 @@
</ul> </ul>
<div class="card-body"> <div class="card-body">
<h5>{{ $L('Preparation') }}</h5> <h5>{{ $L('Preparation') }}</h5>
{!! nl2br(htmlentities($selectedRecipe->description)) !!} {!! $selectedRecipe->description !!}
</div> </div>
</div> </div>
</div> </div>