cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

side nav in recipe edit

Browse Source
This commit is contained in:
vabene1111 2020-06-29 16:12:24 +02:00
parent dbdb35e2f3
commit 8f28e4766d
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/serializer.py
View File

@ -99,7 +99,7 @@ class RecipeSerializer(WritableNestedModelSerializer):
class Meta:
model = Recipe
fields = ['name', 'image', 'keywords', 'steps', 'working_time', 'waiting_time', 'created_by', 'created_at', 'updated_at', 'internal']
fields = ['id', 'name', 'image', 'keywords', 'steps', 'working_time', 'waiting_time', 'created_by', 'created_at', 'updated_at', 'internal']
read_only_fields = ['image', 'created_by', 'created_at']

2
cookbook/templates/base.html
View File

@ -161,7 +161,7 @@
<br/>
<br/>
<div class="container-fluid">
<div class="container-fluid" id="id_base_container">
<div class="row">
<div class="col-xl-2 d-none d-xl-block">
{% block content_xl_left %}

43
cookbook/templates/forms/edit_internal_recipe.html
View File

@ -23,11 +23,6 @@
margin-top: 2px;
}
.break-column {
flex-basis: 100%;
width: 0;
}
</style>
{% endblock %}
@ -50,7 +45,8 @@
<div class="row">
<div class="col-md-6">
<img src="{{ recipe.image.url }}" id="id_image" class="img img-fluid img-responsive"
<img src="{% if recipe.image %}{{ recipe.image.url }}{% endif %}" id="id_image"
class="img img-fluid img-responsive"
style="max-height: 20vh">
<input type="file" @change="imageChanged">
</div>
@ -184,16 +180,39 @@
<br/>
</div>
<button type="button" @click="updateRecipe(true)" class="btn btn-success">{% trans 'Save & View' %}</button>
<button type="button" @click="updateRecipe(false)" class="btn btn-info">{% trans 'Save' %}</button>
<button type="button" @click="addStep()" class="btn btn-primary">{% trans 'Add Step' %}</button>
<button type="button" @click="updateRecipe(true)" class="btn btn-success shadow-none">{% trans 'Save & View' %}</button>
<button type="button" @click="updateRecipe(false)" class="btn btn-info shadow-none">{% trans 'Save' %}</button>
<button type="button" @click="addStep()" class="btn btn-primary shadow-none">{% trans 'Add Step' %}</button>
<a href="{% url 'view_recipe' recipe.pk %}" @click="addStep()"
class="btn btn-secondary">{% trans 'View Recipe' %}</a>
class="btn btn-secondary shadow-none">{% trans 'View Recipe' %}</a>
<br/>
<br/>
</div>
</div>
{% endblock %}
{% block content_xl_right %}
<div class="sticky-top" style="top: 2vh">
<div class="row">
<div class="col-md-8">
<button type="button" @click="updateRecipe(true)"
class="btn btn-success btn-block shadow-none">{% trans 'Save & View' %}</button>
<button type="button" @click="updateRecipe(false)"
class="btn btn-info btn-block shadow-none">{% trans 'Save' %}</button>
<button type="button" @click="addStep()"
class="btn btn-primary btn-block shadow-none">{% trans 'Add Step' %}</button>
<a href="{% url 'view_recipe' recipe.pk %}" @click="addStep()"
class="btn btn-secondary btn-block shadow-none">{% trans 'View Recipe' %}</a> <br/>
</div>
</div>
</div>
{% endblock %}
{% block script %}
<script type="application/javascript">
let csrftoken = Cookies.get('csrftoken');
Vue.http.headers.common['X-CSRFToken'] = csrftoken;
@ -205,7 +224,7 @@
Multiselect: window.VueMultiselect.default
},
delimiters: ['[[', ']]'],
el: '#app',
el: '#id_base_container',
data: {
recipe: undefined,
keywords: [],
@ -330,6 +349,4 @@
}
});
</script>
{% endblock %}