Commit 5055ba82 by gema

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

parent 748af708
<?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
......@@ -12,7 +12,7 @@ use Fuel\Core\Response;
use \Parser\View;
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
private $_bc = array();
......@@ -35,7 +35,7 @@ class Controller_Menussaludables_Index extends \Controller_App{
public function action_index(){
$view = View::forge('menussaludables/index.twig');
$view = View::forge('menussaludables/menu/index.twig');
//Titulo de la vista
$view->title = "Menús Saludables";
......
......@@ -27,7 +27,10 @@ return array(
'dashboard' => 'dashboard/index',
'perfil' =>'perfil/index',
'menupersonalizado' =>'menupersonalizado/index',
'menussaludables' =>'menussaludables/index',
'menussaludables' =>'menussaludables/lista/index',
'menussaludables-menu' =>'menussaludables/menu/index',
);
\ No newline at end of file
{% extends 'layout/template.twig' %}
{% block content %}
<div class="container pt-container-ppal">
<div class="row">
......@@ -30,7 +28,6 @@
</div>
{#fila 2#}
<div class="col-container">
<div class="col bg-color-menus-saludables border-box-home btn-home">
<a href="menussaludables">
<div class="text-center">
......@@ -41,42 +38,32 @@
</div>
</a>
</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 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-2"><i class="fa fa-angle-right"></i></div>
</div>
<hr>
<div class="row">
<div class="row item-list-style">
<div class="col-xs-10"> Recetario</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></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-2"><i class="fa fa-angle-right"></i></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-2"><i class="fa fa-angle-right"></i></div>
</div>
</div>
</div>
</div>
{% endblock %}
......
<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
{% 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 %}
......@@ -36,32 +36,64 @@
</ul>
<div class="tab-content tab-content-menus-saludables">
<div class="tab-pane active" id="1">
{% include 'content_tab.twig' %}
</div>
<div class="tab-pane" id="2">
{% include 'content_tab.twig' %}
{% for i in 1..6 %}
<div class="tab-pane {% if i == 1 %}active {% endif %}" id="{{ i }}">
<div class="row">
{#comida#}
<div class="col-md-6">
<h2 class="color-menus-saludables">COMIDA {{ 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="tab-pane" id="3">
{% include 'content_tab.twig' %}
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
<div class="tab-pane" id="4">
{% include 'content_tab.twig' %}
</div>
<div class="tab-pane" id="5">
{% include 'content_tab.twig' %}
<div class="border-box border-menus-saludables-light">
<div class="title-box-border-box bg-color-menus-saludables-light">
SEGUNDO PLATO
</div>
<div class="tab-pane" id="6">
{% include 'content_tab.twig' %}
<div class="container-box-border-box">
dfsdfasdf
asdfasdfsdf
</div>
<div class="tab-pane" id="7">
{% include 'content_tab.twig' %}
</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 class="row">
<div class="col-md-4 col-md-offset-8">
......
......@@ -32,6 +32,24 @@ body{
.border-menus-saludables-light{border:2px solid #cdde87!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-----------*/
/*------------------------------------------------------*/
......@@ -44,11 +62,9 @@ body{
position: relative;
width: 60px;
}
.switch input {
display:none;
}
.slider {
background-color: #ccc;
bottom: 0;
......@@ -59,7 +75,6 @@ body{
top: 0;
transition: .4s;
}
.slider:before {
background-color: #fff;
bottom: 4px;
......@@ -70,30 +85,22 @@ body{
transition: .4s;
width: 26px;
}
input:checked + .slider {
background-color: #66bb6a;
}
input:checked + .slider:before {
transform: translateX(26px);
}
.slider.round {
border-radius: 34px;
}
.slider.round:before {
border-radius: 50%;
}
.mt-label-switch{
margin-top:10px;
}
/*END TOGGLE SWITCHES STYLE
*/
......@@ -123,8 +130,6 @@ input:checked + .slider:before {
margin-top:40px;
}
/*----------------------------------------------------*/
/*--------------BOTONES CORPORATIVOS------------------*/
/*-------------------------------------------------------*/
......@@ -145,6 +150,8 @@ input:checked + .slider:before {
.btn-menu-personalizado{background-color:#c966cd!important; }
.btn-perfil{background-color:#87cdde; }
.btn-menus-saludables{background-color:#92bb00 }
.btn-menus-saludables-light{background-color:#cdde87 }
.btn-trivial{background-color: #b3b3b3}
......@@ -204,6 +211,8 @@ input:checked + .slider:before {
padding:20px;
}
/*----------------------------------------------------*/
/*-------------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