Skip to content

2
2018_web_app
Commit 0ae75b6e by gema
Options

1. modal resto del dia para menus personalizados 2. modal resto dia para menus… 

1. modal resto del dia para menus personalizados 2. modal resto dia para menus saludables, 3. modificaciones modal add producto. ajustes chechboxes lista compra4. ajustes detalle receta
parent d7fcdfe3
Showing with 66 additions and 15 deletions
fuel/app/views/listacompra/index.twig
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
</div> </div>
<div class="container-box-border-box"> <div class="container-box-border-box">
<form> <form class="ac-custom ac-checkbox" autocomplete="off">
{% for i in 0..14 %} <ul class="text-left ml0">
<div class="ac-custom ac-checkbox ac-checkmark mt10" autocomplete="off"> {% for i in 0..14 %}
<input id="check_{{ i }}" name="check_{{ i }}" type="checkbox"><label>Ingrediente {{ i }}</label> <li> <input id="check_{{ i }}" name="check_{{ i }}" type="checkbox" checked="true"/><label>Ingrediente {{ i }}</label></li>
</div> {% endfor %}
{% endfor %} </ul>
</form> </form>
</div> </div>
</div> </div>
......
fuel/app/views/listacompra/modal_add_product.twig
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center"> <div class="text-center">
<i class="fa fa-shopping-cart fa-5x"></i> <img src="assets/img/listacompra/add_producto.png" class="img-responsive-custom"/>
<h2>Añadir producto</h2> <h2>AÑADIR PRODUCTO</h2>
</div> </div>
<div class="content pb40"> <div class="content pb40">
......
fuel/app/views/menupersonalizado/index.twig
...@@ -185,16 +185,13 @@ ...@@ -185,16 +185,13 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-6"> <div class="col-md-6 col-md-offset-6">
<button class="btn btn-custom btn-menu-personalizado-light mt20"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button> <button class="btn btn-custom btn-menu-personalizado-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 col-md-offset-8"> <div class="col-md-4 col-md-offset-8">
<button class="btn btn-custom btn-menu-personalizado mt20" ><i class="fa fa-save"></i> Guardar Selección</button> <button class="btn btn-custom btn-menu-personalizado mt20" ><i class="fa fa-save"></i> Guardar Selección</button>
...@@ -203,6 +200,10 @@ ...@@ -203,6 +200,10 @@
</div> </div>
<!--modal recomendaciones resto del día-->
{% include 'modal_resto_dia.twig' %}
{% endblock %} {% endblock %}
......
fuel/app/views/menupersonalizado/modal_resto_dia.twig 0 → 100644
<!-- Modal info template -->
<div class="modal fade" id="modalRecomendaciones" tabindex="-1" role="dialog" aria-labelledby="modalRecomendaciones">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/menu_personalizado/recomendaciones.png" class="img-responsive-custom"/>
<h2>RECOMENDACIONES</h2>
</div>
<div class="content text-center pb40">
Texto recomendaciones de comidas para el menú
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
fuel/app/views/menussaludables/menu/index.twig
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 col-md-offset-6"> <div class="col-md-6 col-md-offset-6">
<button class="btn btn-custom btn-menus-saludables-light mt20"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button> <button class="btn btn-custom btn-menus-saludables-light mt20" data-toggle="modal" data-target="#modalRecomendaciones"> Recomendaciones resto del día <i class="fa fa-angle-double-right"></i> </button>
</div> </div>
</div> </div>
</div> </div>
...@@ -192,6 +192,10 @@ ...@@ -192,6 +192,10 @@
</div> </div>
<!--modal recomendaciones resto del día-->
{% include 'modal_resto_dia.twig' %}
{% endblock %} {% endblock %}
......
fuel/app/views/menussaludables/menu/modal_resto_dia.twig 0 → 100644
<!-- Modal info template -->
<div class="modal fade" id="modalRecomendaciones" tabindex="-1" role="dialog" aria-labelledby="modalRecomendaciones">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<div class="text-center">
<img src="assets/img/menus_saludables/recomendaciones.png" class="img-responsive-custom"/>
<h2>RECOMENDACIONES</h2>
</div>
<div class="content text-center pb40">
Texto recomendaciones resto del día
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
fuel/app/views/receta/content.twig
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<h2>{{ recipe.name }}</h2> <h2>{{ recipe.name }}</h2>
<!-- imagen mas caja negra--> <!-- imagen mas caja negra-->
<img src="{{ recipe.image }}" class="img-responsive-custom"> <img src="{{ recipe.image }}" class="img-responsive-custom w100pc">
<div class="solid-box bg-color-other mt0"> <div class="solid-box bg-color-other mt0">
<div class="row "> <div class="row ">
{#tiempo de receta#} {#tiempo de receta#}
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{{ recipe.time }} min {{ recipe.time }} min
</div> </div>
{#dificultad de recdeta#} {#dificultad de recdeta#}
<div class="col-md-6"> <div class="col-md-6 text-right">
<i class="fa fa-star-o"></i> Dificultad: <i class="fa fa-star-o"></i> Dificultad:
{{ recipe.difficulty }} {{ recipe.difficulty }}
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment