imroved recipe printing and view

This commit is contained in:
vabene1111
2020-03-31 01:10:30 +02:00
parent d704ddacdd
commit b47a0197e2

View File

@ -60,6 +60,8 @@
{% endif %} {% endif %}
<a class="btn btn-info" href="{% url 'new_meal_plan' %}?recipe={{ recipe.pk }}"><i <a class="btn btn-info" href="{% url 'new_meal_plan' %}?recipe={{ recipe.pk }}"><i
class="fas fa-calendar"></i></a> class="fas fa-calendar"></i></a>
<a class="btn btn-light" onclick="window.print()"><i
class="fas fa-print"></i></a>
</div> </div>
</div> </div>
@ -98,7 +100,7 @@
<div class="row"> <div class="row">
{% if ingredients %} {% if ingredients %}
<div class="col-lg-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2"> <div class="col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@ -148,12 +150,16 @@
</td> </td>
<td style="vertical-align: middle!important;"> <td style="vertical-align: middle!important;">
{% if i.note %} {% if i.note %}
<button class="btn btn-light btn-sm" type="button" data-container="body" <button class="btn btn-light btn-sm d-print-none" type="button"
data-container="body"
data-toggle="popover" data-toggle="popover"
data-placement="right" data-html="true" data-trigger="focus" data-placement="right" data-html="true" data-trigger="focus"
data-content="{{ i.note }}"> data-content="{{ i.note }}">
<i class="fas fa-info"></i> <i class="fas fa-info"></i>
</button> </button>
<div class="d-none d-print-block">
<i class="far fa-comment-alt"></i> {{ i.note }}
</div>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -173,7 +179,7 @@
{% endif %} {% endif %}
{% if recipe.image %} {% if recipe.image %}
<div class="col-md-6 order-md-2 col-sm-12 order-sm-1 col-12 order-1 " style="text-align: center"> <div class="col-12 order-1 col-sm-12 order-sm-1 col-md-6 order-md-2" style="text-align: center">
<img class="img img-fluid rounded" src="{{ recipe.image.url }}" style="max-height: 30vh;" <img class="img img-fluid rounded" src="{{ recipe.image.url }}" style="max-height: 30vh;"
alt="{% trans 'Recipe Image' %}"> alt="{% trans 'Recipe Image' %}">
<br/> <br/>
@ -294,7 +300,8 @@
<br/> <br/>
<br/> <br/>
<h5><i class="far fa-comments"></i> {% trans 'Comments' %}</h5> <h5 {% if not comments %}class="d-print-none" {% endif %}><i class="far fa-comments"></i> {% trans 'Comments' %}
</h5>
{% for c in comments %} {% for c in comments %}
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">