added description to search and recipe view

This commit is contained in:
smilerz 2021-03-06 16:32:59 -06:00
parent 11240dcf48
commit d3e6b34a63
6 changed files with 30 additions and 24 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -47,7 +47,7 @@ class RecipeTable(tables.Table):
model = Recipe model = Recipe
template_name = 'recipes_table.html' template_name = 'recipes_table.html'
fields = ( fields = (
'id', 'name', 'all_tags', 'image', 'instructions', 'id', 'name', 'all_tags', 'description', 'image', 'instructions',
'working_time', 'waiting_time', 'internal' 'working_time', 'waiting_time', 'internal'
) )

View File

@ -46,6 +46,16 @@
<input class="form-control" id="id_name" v-model="recipe.name"> <input class="form-control" id="id_name" v-model="recipe.name">
</div> </div>
</div> </div>
<div class="row">
<div class="col-12">
<label for="id_description">
{% trans 'Description' %}
</label>
<textarea id="id_description" class="form-control" v-model="recipe.description"
maxlength="512"></textarea>
</div>
</div>
<br/> <br/>
<div class="row"> <div class="row">
@ -90,19 +100,6 @@
</div> </div>
</div> </div>
<div class="row">
<div class="col-12">
<label for="id_description">
{% trans 'Description' %}
</label>
<textarea id="id_description" class="form-control" v-model="recipe.description"
maxlength="512"></textarea>
</div>
</div>
<template v-if="recipe !== undefined"> <template v-if="recipe !== undefined">
<div class="row" v-if="recipe.nutrition" style="margin-top: 1vh"> <div class="row" v-if="recipe.nutrition" style="margin-top: 1vh">
<div class="col-md-12"> <div class="col-md-12">

View File

@ -11,13 +11,13 @@
{% block table %} {% block table %}
<table {% render_attrs table.attrs class="table" %}> <table {% render_attrs table.attrs class="table" %}>
{% for row in table.paginated_rows %} {% for row in table.paginated_rows %}
<div class="card" style="margin-top: 2px;"> <div class="card" style="margin-top: 1px;">
<div class="row no-gutters"> <div class="row no-gutters">
<div class="col-md-4"> <div class="col-md-4">
<a href="{% url 'view_recipe' row.cells.id %}"> <a href="{% url 'view_recipe' row.cells.id %}">
{% if row.cells.image|length > 1 %} {% if row.cells.image|length > 1 %}
<img src=" {{ row.cells.image }}" alt="{% trans 'Recipe Image' %}" <img src=" {{ row.cells.image }}" alt="{% trans 'Recipe Image' %}"
class="card-img" style="object-fit: cover;height: 130px"> class="card-img" style="object-fit:cover;height: 160px">
{% else %} {% else %}
<img src="{% static 'assets/recipe_no_image.svg' %}" <img src="{% static 'assets/recipe_no_image.svg' %}"
alt="{% trans 'Recipe Image' %}" alt="{% trans 'Recipe Image' %}"
@ -31,10 +31,15 @@
<div class="card-body"> <div class="card-body">
<div class="d-flex"> <div class="d-flex">
<div class="flex-fill"> <div class="flex-fill">
<h5 class="card-title">{{ row.cells.name }} <h5 class="card-title p-0 m-0">{{ row.cells.name }}
{% recipe_rating row.record request.user as rating %} {% recipe_rating row.record request.user as rating %}
{{ rating|safe }} {{ rating|safe }}
</h5> </h5>
{%if row.record.description|length > 0 %}
<p class="card-subtitle p-0 m-0 text-muted">
{{ row.cells.description }}
</p>
{% endif %}
<p class="card-text{% if not row.record.keywords %} d-none d-lg-block{% endif %}"> <p class="card-text{% if not row.record.keywords %} d-none d-lg-block{% endif %}">
{% for x in row.record.keywords.all %} {% for x in row.record.keywords.all %}
<span class="badge badge-pill badge-light">{{ x }}</span> <span class="badge badge-pill badge-light">{{ x }}</span>
@ -80,6 +85,10 @@
onclick="openCookLogModal({{ row.record.pk }})"><i onclick="openCookLogModal({{ row.record.pk }})"><i
class="fas fa-clipboard-list fa-fw"></i> {% trans 'Log Cooking' %} class="fas fa-clipboard-list fa-fw"></i> {% trans 'Log Cooking' %}
</button> </button>
<a class="dropdown-item"
href="{% url 'delete_recipe' row.record.pk %}"><i
class="fas fa-trash fa-fw"></i> {% trans 'Delete' %}
</a>
</div> </div>
</div> </div>

View File

@ -11,16 +11,16 @@
</div> </div>
</div> </div>
<div style="text-align: center"> <div class="my-auto">
<keywords :recipe="recipe"></keywords>
</div>
<div class="row" style="margin-top: 8px">
<div class="col-12" style="text-align: center"> <div class="col-12" style="text-align: center">
<i>{{ recipe.description }}</i> <i>{{ recipe.description }}</i>
</div> </div>
</div> </div>
<div style="text-align: center">
<keywords :recipe="recipe"></keywords>
</div>
<hr/> <hr/>
<div class="row"> <div class="row">
<div class="col col-md-3"> <div class="col col-md-3">