github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-08 13:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Little adjustments and changelog for #795

Browse Source
This commit is contained in:
Bernd Bestel 2020-04-24 18:06:57 +02:00
parent 9e824e1845
commit 37054475c2
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/60_UNRELEASED_2020-xx-xx.md
View File

@ -6,6 +6,12 @@
- Fixed that it was not possible to leave the "Barcode(s)" on the product edit page by `TAB` - Fixed that it was not possible to leave the "Barcode(s)" on the product edit page by `TAB`
- Fixed that when adding products through a product picker workflow and when the created products contains special characters, the product was not preselected on the previous page (thanks @Forceu) - Fixed that when adding products through a product picker workflow and when the created products contains special characters, the product was not preselected on the previous page (thanks @Forceu)
### Recipe improvements/fixes
- It's now possible to print recipes (button next to the recipe title) (thanks @zsarnett)
- Improved recipe card presentation (thanks @zsarnett)
- Improved the recipe adding workflow (a recipe called "New recipe" is now not automatically created when starting to add a recipe) (thanks @zsarnett)
- Fixed that images on the recipe gallery view were not scaled correctly on largers screens (thanks @zsarnett)
### Calendar improvements/fixes ### Calendar improvements/fixes
- Events are now links to the corresponding page (thanks @zsarnett) - Events are now links to the corresponding page (thanks @zsarnett)
- Fixed a PHP warning when using the "Share/Integrate calendar (iCal)" button (thanks @tsia) - Fixed a PHP warning when using the "Share/Integrate calendar (iCal)" button (thanks @tsia)

15
localization/strings.pot
View File

@ -454,9 +454,6 @@ msgstr ""
msgid "Edit recipe" msgid "Edit recipe"
msgstr "" msgstr ""
msgid "New recipe"
msgstr ""
msgid "Ingredients list" msgid "Ingredients list"
msgstr "" msgstr ""
@ -1801,3 +1798,15 @@ msgstr ""
msgid "Create inverse QU conversion" msgid "Create inverse QU conversion"
msgstr "" msgstr ""
msgid "Create recipe"
msgstr ""
msgid "Save & continue to add ingredients and included recipes"
msgstr ""
msgid "Save & continue"
msgstr ""
msgid "Save & return to recipes"
msgstr ""

8
views/recipeform.blade.php
View File

@ -44,7 +44,7 @@
<div class="form-group"> <div class="form-group">
<label for="name">{{ $__t('Name') }}</label> <label for="name">{{ $__t('Name') }}</label>
<input type="text" class="form-control" required id="name" name="name" placeholder="{{ $__t('New Recipe')}}" value="@if($mode == 'edit'){{ $recipe->name }}@endif"> <input type="text" class="form-control" required id="name" name="name" value="@if($mode == 'edit'){{ $recipe->name }}@endif">
<div class="invalid-feedback">{{ $__t('A name is required') }}</div> <div class="invalid-feedback">{{ $__t('A name is required') }}</div>
</div> </div>
@ -110,10 +110,10 @@
<textarea id="description" class="form-control wysiwyg-editor" name="description">@if($mode == 'edit'){{ $recipe->description }}@endif</textarea> <textarea id="description" class="form-control wysiwyg-editor" name="description">@if($mode == 'edit'){{ $recipe->description }}@endif</textarea>
</div> </div>
<small class="my-2 form-text text-muted @if($mode == 'edit') d-none @endif">{{ $__t('Save & Continue to add Ingredients and Included Recipes') }}</small> <small class="my-2 form-text text-muted @if($mode == 'edit') d-none @endif">{{ $__t('Save & continue to add ingredients and included recipes') }}</small>
<button class="save-recipe btn btn-success mb-2" data-location="continue">{{ $__t('Save & Continue') }}</button> <button class="save-recipe btn btn-success mb-2" data-location="continue">{{ $__t('Save & continue') }}</button>
<button class="save-recipe btn btn-info mb-2" data-location="return">{{ $__t('Save & Return to Recipes') }}</button> <button class="save-recipe btn btn-info mb-2" data-location="return">{{ $__t('Save & return to recipes') }}</button>
</form> </form>
</div> </div>