mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 2

Browse Source
This commit is contained in:
Götz 2017-10-26 02:27:56 +02:00
parent f04fe449e9
commit 0d5579891d
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ofu_app/templates/macros/food_macros.jinja
View File

@ -35,24 +35,6 @@
{% for single_food in menu %}
<li data-food="{{ single_food.id }}" data-rating="{{ single_food.rating }}" class="food-item">
<div class="row">
<<<<<<< HEAD
<div class="food-name col-8"><p>{{ single_food.name }}</p></div>
{#<div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="" width="1024"
height="800"><i class="img-placeholder fa fa-cutlery text-right"></i></div>#}
</div>
<div class="row">
<div class="rating-wrapper col-6 text-left"></div>
{#<div class="col-6 text-right">
<label for="pic-upload-{{ single_food.id }}" class="custom-pic-upload">
<i class="fa fa-camera" aria-hidden="true"></i>
</label>
<div class="pic-input-wrapper">
#}{# TODO: extract style to external css file#}{#
<input id="pic-upload-{{ single_food.id }}" class="pic-upload" type="file" name="photo"
id="upload-photo" style="display: none !important;"/>
</div>
</div>#}
=======
<div class="food-name col-8"><a href="{{ url('food-detail', args=[single_food.id]) }}"><p>{{ single_food.name }}</p></a></div>
<div class="col-4"><span class="float-right">{{ single_food.price_student}}</span></div>
{# <div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="" width="1024"
@ -70,7 +52,6 @@
id="upload-photo" style="display: none !important;"/>
</div> #}
</div>
>>>>>>> develop
</div>
</li>
{% endfor %}