Skip to content

2
2018_web_app
Commit 5055ba82 by gema
Options

1. reajuste en layout menús saludables. añadida vista listado menus saludables

parent 748af708
Showing with 173 additions and 118 deletions
fuel/app/classes/controller/menussaludables/lista/index.php 0 → 100644
<?php
/**
* Created by JetBrains PhpStorm.
* User: Luis
* Date: 16/12/13
* Time: 20:55
* To change this template use File | Settings | File Templates.
*/
use Fuel\Core\DB;
use Fuel\Core\Response;
use \Parser\View;
use Auth\Auth;
class Controller_Menussaludables_Lista_Index extends \Controller_App{
//Variable para guardar las migas de pan que van a aparecer en las vistas
private $_bc = array();
//Array con los elementos del menu que se deben marcar con la clase "active" para que esten seleccionados en el menu.
private $_option_menu=array('Menús Saludables');
public function before(){
// //Se cargan funciones de javascript especificas de esta funcionalidad
// Casset::js('dashboard/index.js');
//
// //Se marca la navegación en forma de migas de pan. Cada miga de pan la forman dos variables:
// // ds : String a mostrar
// // url : url del enlace en modo absoluto
// $this->_bc[] = array('ds'=>'Inicio','url'=>'/dashboard');
parent::before();
}
public function action_index(){
$view = View::forge('menussaludables/lista/index.twig');
//Titulo de la vista
$view->title = "Listado Menús Saludables";
//Paso de las migas de pan a la vista
$view->bc = $this->_bc;
//Paso de las opciones de menu que deben aparecer seleccionadas
$view->option_menu = $this->_option_menu;
return Response::forge($view);
}
}
\ No newline at end of file
fuel/app/classes/controller/menussaludables/index.php → fuel/app/classes/controller/menussaludables/menu/index.php
...@@ -12,7 +12,7 @@ use Fuel\Core\Response; ...@@ -12,7 +12,7 @@ use Fuel\Core\Response;
use \Parser\View; use \Parser\View;
use Auth\Auth; use Auth\Auth;
class Controller_Menussaludables_Index extends \Controller_App{ class Controller_Menussaludables_Menu_Index extends \Controller_App{
//Variable para guardar las migas de pan que van a aparecer en las vistas //Variable para guardar las migas de pan que van a aparecer en las vistas
private $_bc = array(); private $_bc = array();
...@@ -35,7 +35,7 @@ class Controller_Menussaludables_Index extends \Controller_App{ ...@@ -35,7 +35,7 @@ class Controller_Menussaludables_Index extends \Controller_App{
public function action_index(){ public function action_index(){
$view = View::forge('menussaludables/index.twig'); $view = View::forge('menussaludables/menu/index.twig');
//Titulo de la vista //Titulo de la vista
$view->title = "Menús Saludables"; $view->title = "Menús Saludables";
......
fuel/app/config/routes.php
...@@ -27,7 +27,10 @@ return array( ...@@ -27,7 +27,10 @@ return array(
'dashboard' => 'dashboard/index', 'dashboard' => 'dashboard/index',
'perfil' =>'perfil/index', 'perfil' =>'perfil/index',
'menupersonalizado' =>'menupersonalizado/index', 'menupersonalizado' =>'menupersonalizado/index',
'menussaludables' =>'menussaludables/index',
'menussaludables' =>'menussaludables/lista/index',
'menussaludables-menu' =>'menussaludables/menu/index',
); );
\ No newline at end of file
fuel/app/views/dashboard/index.twig
{% extends 'layout/template.twig' %} {% extends 'layout/template.twig' %}
{% block content %} {% block content %}
<div class="container pt-container-ppal"> <div class="container pt-container-ppal">
<div class="row"> <div class="row">
...@@ -30,7 +28,6 @@ ...@@ -30,7 +28,6 @@
</div> </div>
{#fila 2#} {#fila 2#}
<div class="col-container"> <div class="col-container">
<div class="col bg-color-menus-saludables border-box-home btn-home"> <div class="col bg-color-menus-saludables border-box-home btn-home">
<a href="menussaludables"> <a href="menussaludables">
<div class="text-center"> <div class="text-center">
...@@ -41,42 +38,32 @@ ...@@ -41,42 +38,32 @@
</div> </div>
</a> </a>
</div> </div>
{#<div class="col bg-color-trivial border-box">#}
{#<img src="assets/img/home/trivial.png" class="img-responsive-custom"/>#}
{#<div class="p-text-btn-home">#}
{#<p class="whitecolor">Trivial</p>#}
{#</div>#}
{#</div>#}
</div> </div>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<hr>
<div class="row"> <div class="row item-list-style">
<div class="col-xs-10"> Inicio</div> <div class="col-xs-10"> Inicio</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div> <div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div> </div>
<hr>
<div class="row"> <div class="row item-list-style">
<div class="col-xs-10"> Recetario</div> <div class="col-xs-10"> Recetario</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div> <div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div> </div>
<hr>
<div class="row"> <div class="row item-list-style">
<div class="col-xs-10">Boletín saludable</div> <div class="col-xs-10">Boletín saludable</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div> <div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div> </div>
<hr>
<div class="row"> <div class="row item-list-style">
<div class="col-xs-10">Lista de la compra </div> <div class="col-xs-10">Lista de la compra </div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div> <div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
......
fuel/app/views/menussaludables/content_tab.twig deleted 100644 → 0
<div class="row">
{#comida#}
<div class="col-md-6">
<h2 class="color-menus-saludables">COMIDA</h2>
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
PRIMER PLATO
</div>
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
</div>
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
SEGUNDO PLATO
</div>
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
</div>
</div>
{#cena#}
<div class="col-md-6">
<h2 class="color-menus-saludables">CENA</h2>
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
PRIMER PLATO
</div>
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
</div>
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
SEGUNDO PLATO
</div>
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
</div>
</div>
</div>
\ No newline at end of file
fuel/app/views/menussaludables/lista/index.twig 0 → 100644
{% extends 'layout/template.twig' %}
{% block content %}
<!-- barra superior titulo de pagina-->
<div class="div-title bg-color-menus-saludables">
<div class="container">
{{ title }}
</div>
</div>
<div class="container mt20" >
{% for i in 0..5 %}
<a href="menussaludables-menu">
<div class="row item-list-style">
<div class="col-xs-10"> Menú tipo {{ i }}</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div>
</a>
{% endfor %}
</div>
{% endblock %}
fuel/app/views/menussaludables/index.twig → fuel/app/views/menussaludables/menu/index.twig
...@@ -36,33 +36,65 @@ ...@@ -36,33 +36,65 @@
</ul> </ul>
<div class="tab-content tab-content-menus-saludables"> <div class="tab-content tab-content-menus-saludables">
<div class="tab-pane active" id="1"> {% for i in 1..6 %}
{% include 'content_tab.twig' %} <div class="tab-pane {% if i == 1 %}active {% endif %}" id="{{ i }}">
</div> <div class="row">
<div class="tab-pane" id="2"> {#comida#}
{% include 'content_tab.twig' %} <div class="col-md-6">
</div> <h2 class="color-menus-saludables">COMIDA {{ i }}</h2>
<div class="tab-pane" id="3"> <div class="border-box border-menus-saludables-light">
{% include 'content_tab.twig' %} <div class="title-box-border-box bg-color-menus-saludables-light">
</div> PRIMER PLATO
<div class="tab-pane" id="4"> </div>
{% include 'content_tab.twig' %} <div class="container-box-border-box">
</div> dfsdfasdf
<div class="tab-pane" id="5"> asdfasdfsdf
{% include 'content_tab.twig' %} </div>
</div> </div>
<div class="tab-pane" id="6"> <div class="border-box border-menus-saludables-light">
{% include 'content_tab.twig' %} <div class="title-box-border-box bg-color-menus-saludables-light">
</div> SEGUNDO PLATO
<div class="tab-pane" id="7"> </div>
{% include 'content_tab.twig' %} <div class="container-box-border-box">
</div> dfsdfasdf
asdfasdfsdf
</div>
</div>
</div>
{#cena#}
<div class="col-md-6">
<h2 class="color-menus-saludables">CENA {{ i }}</h2>
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
PRIMER PLATO
</div>
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
</div>
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
SEGUNDO PLATO
</div>
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
</div>
</div>
</div>
<div class="row">
<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>
</div>
</div>
</div>
{% endfor %}
</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-menus-saludables mt20" ><i class="fa fa-save"></i> Guardar Perfil</button> <button class="btn btn-custom btn-menus-saludables mt20" ><i class="fa fa-save"></i> Guardar Perfil</button>
......
public/assets/css/custom.css
...@@ -32,6 +32,24 @@ body{ ...@@ -32,6 +32,24 @@ body{
.border-menus-saludables-light{border:2px solid #cdde87!important; } .border-menus-saludables-light{border:2px solid #cdde87!important; }
.border-trivial{border:2px solid #b3b3b3!important;} .border-trivial{border:2px solid #b3b3b3!important;}
/*------------------------------------------------*/
/*---------------LISTADOS-------------------------*/
/*------------------------------------------------*/
.item-list-style{
padding:20px 5px 20px 5px;
border-bottom:1px solid #ccc;
cursor:pointer;
color:#333!important;
}
.item-list-style:hover, .item-list-style:active,.item-list-style:active {
background-color: #ccc;
}
/*-----------------------------------------------------*/ /*-----------------------------------------------------*/
/*----------- DIVS, CAJAS , ESTILOS GENÉRICOS-----------*/ /*----------- DIVS, CAJAS , ESTILOS GENÉRICOS-----------*/
/*------------------------------------------------------*/ /*------------------------------------------------------*/
...@@ -44,11 +62,9 @@ body{ ...@@ -44,11 +62,9 @@ body{
position: relative; position: relative;
width: 60px; width: 60px;
} }
.switch input { .switch input {
display:none; display:none;
} }
.slider { .slider {
background-color: #ccc; background-color: #ccc;
bottom: 0; bottom: 0;
...@@ -59,7 +75,6 @@ body{ ...@@ -59,7 +75,6 @@ body{
top: 0; top: 0;
transition: .4s; transition: .4s;
} }
.slider:before { .slider:before {
background-color: #fff; background-color: #fff;
bottom: 4px; bottom: 4px;
...@@ -70,30 +85,22 @@ body{ ...@@ -70,30 +85,22 @@ body{
transition: .4s; transition: .4s;
width: 26px; width: 26px;
} }
input:checked + .slider { input:checked + .slider {
background-color: #66bb6a; background-color: #66bb6a;
} }
input:checked + .slider:before { input:checked + .slider:before {
transform: translateX(26px); transform: translateX(26px);
} }
.slider.round { .slider.round {
border-radius: 34px; border-radius: 34px;
} }
.slider.round:before { .slider.round:before {
border-radius: 50%; border-radius: 50%;
} }
.mt-label-switch{ .mt-label-switch{
margin-top:10px; margin-top:10px;
} }
/*END TOGGLE SWITCHES STYLE /*END TOGGLE SWITCHES STYLE
*/ */
...@@ -123,8 +130,6 @@ input:checked + .slider:before { ...@@ -123,8 +130,6 @@ input:checked + .slider:before {
margin-top:40px; margin-top:40px;
} }
/*----------------------------------------------------*/ /*----------------------------------------------------*/
/*--------------BOTONES CORPORATIVOS------------------*/ /*--------------BOTONES CORPORATIVOS------------------*/
/*-------------------------------------------------------*/ /*-------------------------------------------------------*/
...@@ -145,6 +150,8 @@ input:checked + .slider:before { ...@@ -145,6 +150,8 @@ input:checked + .slider:before {
.btn-menu-personalizado{background-color:#c966cd!important; } .btn-menu-personalizado{background-color:#c966cd!important; }
.btn-perfil{background-color:#87cdde; } .btn-perfil{background-color:#87cdde; }
.btn-menus-saludables{background-color:#92bb00 } .btn-menus-saludables{background-color:#92bb00 }
.btn-menus-saludables-light{background-color:#cdde87 }
.btn-trivial{background-color: #b3b3b3} .btn-trivial{background-color: #b3b3b3}
...@@ -204,6 +211,8 @@ input:checked + .slider:before { ...@@ -204,6 +211,8 @@ input:checked + .slider:before {
padding:20px; padding:20px;
} }
/*----------------------------------------------------*/ /*----------------------------------------------------*/
/*-------------TEXTOS, PADINGS, MARGINS------------------*/ /*-------------TEXTOS, PADINGS, MARGINS------------------*/
/*-------------------------------------------------------*/ /*-------------------------------------------------------*/
......
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