From 4927f8bf4d4a182d59550f6f7fb9545ec3d3f804 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 29 Oct 2021 14:25:20 +0200
Subject: [PATCH] fixed nutrition form

---
 .../apps/RecipeEditView/RecipeEditView.vue    | 30 ++++++++++++-------
 vue/src/locales/en.json                       |  2 ++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue
index 076656648..2c025dc56 100644
--- a/vue/src/apps/RecipeEditView/RecipeEditView.vue
+++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue
@@ -93,21 +93,26 @@
                     <h5 class="d-table-cell align-middle">{{ $t('Nutrition') }}</h5>
                   </div>
                   <div class="col-md-3">
-                    <button type="button" @click="addNutrition()"
-                            class="btn btn-sm btn-light shadow-none float-right" v-b-toggle.id_nutrition_collapse
-                            v-if="recipe.nutrition === null"><i class="fas fa-plus-circle"></i>
+                    <button type="button" @click="addNutrition()" v-if="recipe.nutrition === null"
+                            v-b-tooltip.hover v-bind:title="$t('Add_nutrition_recipe')"
+                            class="btn btn-sm btn-success shadow-none float-right" ><i class="fas fa-plus-circle"></i>
                     </button>
                     <button type="button" @click="removeNutrition()" v-if="recipe.nutrition !== null"
-                            v-b-toggle.id_nutrition_collapse
-                            class="btn btn-sm btn-light shadow-none float-right"><i class="fas fa-minus-circle"></i>
+                            v-b-tooltip.hover v-bind:title="$t('Remove_nutrition_recipe')"
+                            class="btn btn-sm btn-danger shadow-none float-right"><i class="fas fa-trash-alt"></i>
                     </button>
                   </div>
                 </div>
 
               </div>
 
-              <b-collapse id="id_nutrition_collapse" class="mt-2">
-                <div class="card-body " v-if="recipe.nutrition">
+              <b-collapse id="id_nutrition_collapse" class="mt-2" v-model="nutrition_visible">
+                <div class="card-body " v-if="recipe.nutrition !== null">
+                  <b-alert show>
+                    There is currently only very basic support for tracking nutritional information.
+                    A <a href="https://github.com/vabene1111/recipes/issues/896" target="_blank" rel="noreferrer nofollow">big update</a> is planned to improve on this in many different areas.
+                  </b-alert>
+
                   <label for="id_name"> {{ $t('Calories') }}</label>
                   <input class="form-control" id="id_calories" v-model="recipe.nutrition.calories">
 
@@ -461,7 +466,8 @@
           </button>
         </div>
         <div class="col-md-3 col-6">
-          <button type="button" @click="updateRecipe(true)" v-b-tooltip.hover :title="`${$t('Key_Ctrl')} + ${$t('Key_Shift')} + S`"
+          <button type="button" @click="updateRecipe(true)" v-b-tooltip.hover
+                  :title="`${$t('Key_Ctrl')} + ${$t('Key_Shift')} + S`"
                   class="btn btn-sm btn-block btn-success shadow-none">{{ $t('Save_and_View') }}
           </button>
         </div>
@@ -505,7 +511,7 @@ Vue.use(VueMarkdownEditor);
 Vue.use(BootstrapVue)
 
 export default {
-  name: 'RecipeSearchView',
+  name: 'RecipeEditView',
   mixins: [ResolveUrlMixin, ApiMixin],
   components: {Multiselect, LoadingSpinner, draggable},
   data() {
@@ -527,7 +533,11 @@ export default {
     }
 
   },
-  computed: {},
+  computed: {
+    nutrition_visible: function () {
+      return this.recipe.nutrition !== null
+    }
+  },
   mounted() {
 
     this.loadRecipe()
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index 8e3e7e310..1bae903b6 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -26,6 +26,8 @@
   "Recipes_per_page": "Recipes per Page",
   "Show_as_header": "Show as header",
   "Hide_as_header": "Hide as header",
+  "Add_nutrition_recipe": "Add nutrition to recipe",
+  "Remove_nutrition_recipe": "Delete nutrition from recipe",
   "Copy_template_reference": "Copy template reference",
   "Save_and_View": "Save & View",
   "Manage_Books": "Manage Books",