From 37054475c291564322bd4ad36775670e5b2dd1ec Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Fri, 24 Apr 2020 18:06:57 +0200
Subject: [PATCH] Little adjustments and changelog for #795

---
 changelog/60_UNRELEASED_2020-xx-xx.md |  6 ++++++
 localization/strings.pot              | 15 ++++++++++++---
 views/recipeform.blade.php            |  8 ++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/changelog/60_UNRELEASED_2020-xx-xx.md b/changelog/60_UNRELEASED_2020-xx-xx.md
index e28a97a2..cf60b141 100644
--- a/changelog/60_UNRELEASED_2020-xx-xx.md
+++ b/changelog/60_UNRELEASED_2020-xx-xx.md
@@ -6,6 +6,12 @@
 - 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)
 
+### 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
 - Events are now links to the corresponding page (thanks @zsarnett)
 - Fixed a PHP warning when using the "Share/Integrate calendar (iCal)" button (thanks @tsia)
diff --git a/localization/strings.pot b/localization/strings.pot
index 2f4dc585..aced7907 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -454,9 +454,6 @@ msgstr ""
 msgid "Edit recipe"
 msgstr ""
 
-msgid "New recipe"
-msgstr ""
-
 msgid "Ingredients list"
 msgstr ""
 
@@ -1801,3 +1798,15 @@ msgstr ""
 
 msgid "Create inverse QU conversion"
 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 ""
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index b28653e2..a5e3159c 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -44,7 +44,7 @@
 
 			<div class="form-group">
 				<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>
 			
@@ -110,10 +110,10 @@
 				<textarea id="description" class="form-control wysiwyg-editor" name="description">@if($mode == 'edit'){{ $recipe->description }}@endif</textarea>
 			</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-info mb-2" data-location="return">{{ $__t('Save & Return to Recipes') }}</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>
 
 		</form>
 	</div>