Skip to content

GitLab

M
musica_listas_umusic
Commit ffe01484 authored by Ana's avatar Ana
Browse files
Options

cambios

parent e4da85de
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 33 deletions
src/FrontendBundle/Controller/IndexController.php
View file @ ffe01484
......@@ -62,7 +62,11 @@ class IndexController extends AbstractController {
if ($session->get('msisdn')=="") {
return $this->render('frontend/paginas/ingresar_numero.html.twig');
$log->debug("no encontro msisdn....:" .$session->get('msisdn') );
if (!Utiles::formatMsisdnSpecial($session->get('msisdn')) || !Utiles::formatMsisdnSpecial($msisdn)) {
$modal = 1;
return $this->render('frontend/paginas/ingresar_numero.html.twig');
}
}
##LOGICA DE LA VISTA##
......@@ -126,7 +130,7 @@ class IndexController extends AbstractController {
$em->persist($usuarioAcceso);
$em->flush();
$log->debug("OPCIONES FRONT | MSISDN SALIENTE : $msisdn | isChrome : ".Utiles::isWindowsChrome($ua));
$log->debug("OPCIONES FRONT | MSISDN SALIENTE : $msisdn | modal? : $modal | isChrome : ".Utiles::isWindowsChrome($ua));
return $this->render('frontend/index.html.twig', [
"listas" => $listasFiltradas,
......@@ -137,6 +141,7 @@ class IndexController extends AbstractController {
"IdentificadorListaCanciones" => 0,
"cancionesLista" => array(),
"msisdn" => $msisdn,
"modal" => $modal,
"isChrome" => Utiles::isWindowsChrome($ua)
]);
}
......
templates/frontend/base.html.twig
View file @ ffe01484
......@@ -29,10 +29,7 @@
<body>
{%include 'frontend/includes/navbar.html.twig' %}
<br/><br/>
<div class="navbar navbar-expand-lg navbar-dark navbar-custom justify-content-between">
<a href="{{path('front_index')}}" class="navbar-brand mx-auto d-block text-center order-0 order-md-1 w-25"><img src="{{asset('frontend/img/umusic-logo.svg')}}" height="110" class="img-fluid"/></a>
</div>
{%block body %}{% endblock %}
<!-- Footer -->
......@@ -49,6 +46,28 @@
<script src="{{asset('frontend/js/html5slider.js')}}"></script>
<script src="{{asset('frontend/js/musicplayer.js')}}"></script>
<script src="{{asset('frontend/js/jquery-1.7.2.min.js')}}"></script>
<script>
function openNav() {
document.getElementById("myNav").style.height = "100%";
}
function closeNav() {
document.getElementById("myNav").style.height = "0%";
}
</script>
<!-- código para filas clickeables -->
<script>
$('*[data-href]').on("click",function(){
window.location = $(this).data('href');
return false;
});
$("td > a").on("click",function(e){
e.stopPropagation();
});
</script>
{% block javascripts %}{% endblock %}
</body>
......
templates/frontend/includes/navbar.html.twig
View file @ ffe01484
<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark navbar-custom fixed-top">
<div class="container">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto">
{#falta agregar ir a inicio#}
<li class="nav-item">
<a class="nav-link" href="{{path('front_index', {msisdn: app.session.get('msisdn')})}}">Inicio</a>
</li>
<!-- Menu navegacion nuevo codigo -->
<div id="myNav" class="overlay">
<a href="javascript:void(0)" class="closebtn" onclick="closeNav()">&times;</a>
<div class="overlay-content">
<a class="nav-link" href="{{path('front_index', {msisdn: app.session.get('msisdn')})}}">Inicio</a>
{% if app.session.get('msisdn')!="" %}
<li class="nav-item">
<a class="nav-link" href="{{path('front_mi_cuenta', {msisdn: app.session.get('msisdn')})}}">Mi cuenta</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{path('salir', {msisdn: app.session.get('msisdn')})}}">Salir</a>
</li>
{% endif %}
</ul>
</div>
{% endif %}
</div>
</nav>
\ No newline at end of file
</div>
<nav class="navbar navbar-expand-lg navbar-dark navbar-custom justify-content-between">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".dual-nav" onclick="openNav()">
<span class="navbar-toggler-icon"></span>
</button>
<a href="{{path('front_index', {msisdn: app.session.get('msisdn')})}}" class="navbar-brand mx-auto d-block text-center order-0 order-md-1 w-25"><img src="{{asset('frontend/img/umusic-logo.svg')}}" height="110" class="img-fluid"/></a>
</div>
</nav>
templates/frontend/index.html.twig
View file @ ffe01484
......@@ -25,9 +25,10 @@
<!-- Menú interior página -->
<div class="masthead-content">
<div class="container">
{% if cantidadListas > 0%}
{%for lista in listas%}
<div class="container">
<a href="{{ path('front_mostrar_contratar', { 'msisdn': msisdn, 'lisId': lista.lisId }) }}" class="menu-musica">{{lista.lisNombre}}</a>
{% endfor %}
{% else %}
......@@ -41,9 +42,6 @@
</div>
</div>
</header>
{% endblock %}
templates/frontend/paginas/ingresar_numero.html.twig
View file @ ffe01484
......@@ -17,6 +17,8 @@
<form action="{{ path('front_validar_msisdn') }}" method="post" }}>
<div class="form-row align-items-center">
<div class="col-2">
<label for="staticEmail2" class="sr-only"><p>+56</p></label>
<input type="text" readonly class="codigo-ciudad form-control-plaintext" id="staticEmail2" value="+56">
</div>
<div class="col-7">
<label class="sr-only" for="inlineFormInputGroup">Ingrésalo aquí</label>
......
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