Skip to content

GitLab

N
nutrapharm_producto
Commit 0c04e425 authored by Cristian Mauricio Diaz Canales's avatar Cristian Mauricio Diaz Canales 💬
Browse files
Options

Actualizacion css

parent 8007bad2
Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 110 deletions
app/Resources/views/base.html.twig
View file @ 0c04e425
...@@ -11,74 +11,43 @@ ...@@ -11,74 +11,43 @@
<meta content="Cristian Diaz" name="author" /> <meta content="Cristian Diaz" name="author" />
<!-- ================== BEGIN BASE CSS STYLE ================== --> <!-- ================== BEGIN BASE CSS STYLE ================== -->
<link href="{{ asset('backend/plugins/jquery-ui/themes/base/minified/jquery-ui.min.css')}}" rel="stylesheet" /> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="{{ asset('backend/plugins/bootstrap/css/bootstrap.min.css')}}" rel="stylesheet" /> <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<link href="{{ asset('backend/plugins/font-awesome/css/font-awesome.min.css')}}" rel="stylesheet" /> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<link href="{{ asset('frontend/css/landing.css')}}" rel="stylesheet" /> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat">
<!-- ================== END BASE CSS STYLE ================== --> <!-- ================== END BASE CSS STYLE ================== -->
<link href="https://fonts.googleapis.com/css?family=Rubik:300,400,500,500i,700,900" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/css/bootstrap-select.min.css" rel="stylesheet"/>
{% block stylesheets %} {% block stylesheets %}
{% endblock %} {% endblock %}
<!-- ================== BEGIN BASE JS ================== --> <!-- ================== BEGIN BASE JS ================== -->
<script src="{{ asset('backend/plugins/pace/pace.min.js')}}"></script>
<!-- ================== END BASE JS ================== --> <!-- ================== END BASE JS ================== -->
{% block head %} {% block head %}
{% endblock %} {% endblock %}
</head> </head>
<!-- end #header -->
<body> <body>
<!-- end #header -->
<!-- end #sidebar -->
<!-- begin #content --> <!-- begin #content -->
<div id="content" class="content"> <div id="content" class="content">
{% block body %} {% block body %}
{% endblock %} {% endblock %}
</div> </div>
<!-- end #content -->
<!-- end page container -->
<!-- ================== BEGIN BASE JS ================== --> <!-- ================== BEGIN BASE JS ================== -->
<script src="{{ asset('backend/plugins/jquery/jquery-1.9.1.min.js')}}"></script> <script src="{{ asset('backend/plugins/jquery/jquery-1.9.1.min.js')}}"></script>
<script src="{{ asset('backend/plugins/jquery/jquery-migrate-1.1.0.min.js')}}"></script> <script src="{{ asset('backend/plugins/jquery/jquery-migrate-1.1.0.min.js')}}"></script>
<script src="{{ asset('backend/plugins/jquery-ui/ui/minified/jquery-ui.min.js')}}"></script>
<script src="{{ asset('backend/plugins/bootstrap/js/bootstrap.min.js')}}"></script>
<!--[if lt IE 9]>
<script src="{{ asset('backend/crossbrowserjs/html5shiv.js')}}"></script>
<script src="{{ asset('backend/crossbrowserjs/respond.min.js')}}"></script>
<script src="{{ asset('backend/crossbrowserjs/excanvas.min.js')}}"></script>
<![endif]-->
<script src="{{ asset('backend/plugins/slimscroll/jquery.slimscroll.min.js')}}"></script>
<script src="{{ asset('backend/plugins/jquery-cookie/jquery.cookie.js')}}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/bootstrap-select.min.js"></script>
<!-- ================== END BASE JS ================== --> <!-- ================== END BASE JS ================== -->
<!-- ================== BEGIN PAGE LEVEL JS ================== --> <!-- ================== BEGIN PAGE LEVEL JS ================== -->
<script src="{{ asset('backend/js/apps.js')}}"></script>
{% block javascripts %} {% block javascripts %}
{% endblock %} {% endblock %}
<!-- ================== END PAGE LEVEL JS ================== --> <!-- ================== END PAGE LEVEL JS ================== -->
{% block jsApp %} {% block jsApp %}
<script>
$(document).ready(function () {
App.init();
});
</script>
{% endblock %} {% endblock %}
</body> </body>
{% block docready %}
{% endblock %}
</html> </html>
app/Resources/views/producto/landing_producto_generar_comparacion.html.twig
View file @ 0c04e425
{% extends 'base.html.twig' %} {% extends 'base.html.twig' %}
{% block stylesheets %}
<link href="{{ asset('nutrapharm/css/nutra-style.css')}}" rel="stylesheet" />
{% endblock %}
{% block head %} {% block head %}
<meta property="fb:app_id" content="{{facebookAppId}}" /> <meta property="fb:app_id" content="{{facebookAppId}}" />
<meta property="og:url" content="{{urlSitio}}{{seccionGenerarCambios}}?idp={{idp}}" /> <meta property="og:url" content="{{urlSitio}}{{seccionGenerarCambios}}?idp={{idp}}" />
...@@ -25,87 +28,91 @@ ...@@ -25,87 +28,91 @@
<div class="row"> <div class="row">
{{ include('producto/includes/alert.messages.html.twig') }} {{ include('producto/includes/alert.messages.html.twig') }}
</div> </div>
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="panel-body"> <div class="col-md-12" id="title">
<h2>COMIENZA TU TRATAMIENTO CON INOVAGE</h2> &nbsp;
</div>
</div>
<div class="row">
<div class="col-lg-12">
<label>Esta es la foto que te tomaste al iniciar el tratamiento</label>
</div> </div>
</div> </div>
<br><br><br>
<div class="row"> <div class="row" id="foto" align="center">
<div class="col-lg-12"> <div class="col-md-6 col-xs-12">
<img width="200" height="auto" src="{{urlSitio}}nutrapharm/get/photo?file_name={{idp}}.{{extInicial}}" /> <div id="foto_anterior"></div><br>
<p align="center"><button id="btn-ant" class="btn btn-lg btn-warning">FOTO ANTERIOR</button></p>
</div>
<div class="col-md-6 col-xs-12">
<div id="foto_siguiente"></div><br>
<p align="center"><button id="btn-sig" class="btn btn-lg btn-warning">TOMAR FOTO</button></p>
</div> </div>
</div>
<div class="row">
<div class="col-lg-12">
<label>Ahora queremos ver cuales han sido los cambios en estos días</label>
</div>
</div> </div>
<br><br><br><br><br><br><br><br><br>
<div class="row"> <div class="row">
<div class="panel-body"> <div class="col-md-12">
<label class="col-md-12 control-label">Toma una foto con tu cámara aquí</label> <div class="row">
<div class="col-md-12"> <div class="col-md-3 col-xs-12">
<button id="tomarFoto" name="tomarFoto" onclick="mostrarTomarFoto(event)">Tomar Foto</button>
</div>
<label class="col-md-12 control-label">Subo una foto desde tu galería o desde tu PC</label>
<div class="col-md-12">
<button id="subirFoto" name="subirFoto" onclick="mostrarSubirFoto(event)">Subir Foto</button>
</div>
<div class="col-md-12">
<div id="tomarFotoContainer" style="display:none">
<div class="form-group">
<div id="cameraContainer" class="camera" style="display: block">
<video id="video" width="600" height="315">No se encuentra disponible una camara</video>
<button id="startbutton">Tomar Foto</button>
</div>
</div>
<div class="form-group">
<canvas id="canvas" width="auto" height="auto">
</canvas>
<div class="output">
<img id="photo" width="auto" height="auto" alt="Foto Tomada" src="">
</div>
</div>
</div> </div>
</div> <div class="col-md-6 col-xs-12">
<div class="col-md-12"> <h3 align="center">Tú Experiencia</h3>
<div id="subirFotoContainer" style="display:none"> <textarea id="comentario" class="form-control" cols="20" rows="4"></textarea>
<div class="form-group"> </div>
<input type='file' id="imgInp" accept="image/*" /> <div class="col-md-3 col-xs-12">
<img id="imagenUsuario" width="200" height="auto" style="display:none" src="#" alt="Imagen subida" />
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<br><br>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-md-12" align="center">
<div id="containerFormulario" style="display:none"> <a href="#" target="_blank"><img src="img/fb.png" height="50" width="50"></a>
<div class="panel-body"> &nbsp;
<div class="form-group"> <a href="#" target="_blank"><img src="img/ig.png" height="50" width="50"></a>
<label class="col-md-12 control-label"> Escribe un comentario de como va el tratamiento</label> </div>
<div class="col-md-12"> </div>
<input id="comentarioFotoUsuario" type="textarea" placeholder="Comentario..."/> <div class="row">
</div>
</div> <div class="col-md-12" align="center">
</div> <span class="titulo">COMPARTE con el hashtag</span><br>
<div class="panel-body"> <span class="subtitulo">#selfietesinvage</span>
<div class="form-group">
<div class="col-md-12">
<button id="btnGuardar">Guardar</button>
</div>
</div>
<div id="mensaje-nutrapharm" style="display:none" class="alert alert-success" role="alert"></div>
</div>
</div>
</div> </div>
</div> </div>
<br><br>
</div>
{% endblock %} {% endblock %}
{% block javascripts %} {% block javascripts %}
<script src="{{asset('frontend/js/capture.js')}}"></script> <script src="{{asset('frontend/js/capture.js')}}"></script>
......
app/Resources/views/producto/landing_producto_generar_comparacion.html_original.twig 0 → 100644
View file @ 0c04e425
{% extends 'base.html.twig' %}
{% block stylesheets %}
<link href="{{ asset('nutrapharm/css/nutra-style.css')}}" rel="stylesheet" />
{% endblock %}
{% block head %}
<meta property="fb:app_id" content="{{facebookAppId}}" />
<meta property="og:url" content="{{urlSitio}}{{seccionGenerarCambios}}?idp={{idp}}" />
<meta property="og:type" content="website" />
<meta property="og:title" content="NutraPharm - Comparación Foto" />
<meta property="og:description" content="Visualiza tus cambios!" />
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta property="og:image" content="{{urlSitio}}uploads/users/{{idp}}.{{extInicial}}"/>
<link href="{{asset('frontend/css/camara.css')}}" rel="stylesheet" />
<script>
(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id))
return;
js = d.createElement(s);
js.id = id;
js.src = "//connect.facebook.net/es_ES/sdk.js";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>
{% endblock %}
{% block body %}
<div class="row">
{{ include('producto/includes/alert.messages.html.twig') }}
</div>
<div class="row">
<div class="panel-body">
<h2>COMIENZA TU TRATAMIENTO CON INOVAGE</h2>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<label>Esta es la foto que te tomaste al iniciar el tratamiento</label>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<img width="200" height="auto" src="{{urlSitio}}nutrapharm/get/photo?file_name={{idp}}.{{extInicial}}" />
</div>
</div>
<div class="row">
<div class="col-lg-12">
<label>Ahora queremos ver cuales han sido los cambios en estos días</label>
</div>
</div>
<div class="row">
<div class="panel-body">
<label class="col-md-12 control-label">Toma una foto con tu cámara aquí</label>
<div class="col-md-12">
<button id="tomarFoto" name="tomarFoto" onclick="mostrarTomarFoto(event)">Tomar Foto</button>
</div>
<label class="col-md-12 control-label">Subo una foto desde tu galería o desde tu PC</label>
<div class="col-md-12">
<button id="subirFoto" name="subirFoto" onclick="mostrarSubirFoto(event)">Subir Foto</button>
</div>
<div class="col-md-12">
<div id="tomarFotoContainer" style="display:none">
<div class="form-group">
<div id="cameraContainer" class="camera" style="display: block">
<video id="video" width="600" height="315">No se encuentra disponible una camara</video>
<button id="startbutton">Tomar Foto</button>
</div>
</div>
<div class="form-group">
<canvas id="canvas" width="auto" height="auto">
</canvas>
<div class="output">
<img id="photo" width="auto" height="auto" alt="Foto Tomada" src="">
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div id="subirFotoContainer" style="display:none">
<div class="form-group">
<input type='file' id="imgInp" accept="image/*" />
<img id="imagenUsuario" width="200" height="auto" style="display:none" src="#" alt="Imagen subida" />
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div id="containerFormulario" style="display:none">
<div class="panel-body">
<div class="form-group">
<label class="col-md-12 control-label"> Escribe un comentario de como va el tratamiento</label>
<div class="col-md-12">
<input id="comentarioFotoUsuario" type="textarea" placeholder="Comentario..."/>
</div>
</div>
</div>
<div class="panel-body">
<div class="form-group">
<div class="col-md-12">
<button id="btnGuardar">Guardar</button>
</div>
</div>
<div id="mensaje-nutrapharm" style="display:none" class="alert alert-success" role="alert"></div>
</div>
</div>
</div>
</div>
{% endblock %}
{% block javascripts %}
<script src="{{asset('frontend/js/capture.js')}}"></script>
<script>
var imagenSubida = false;
var imagenTomada = false;
var usuarioNutraPharm = "{{idp}}";
var tipoUsuarioFormulario = 3;
var upload;
</script>
<script>
function mostrarTomarFoto(event) {
event.preventDefault();
console.log("mostrando tomar foto...");
$("#tomarFotoContainer").show();
$("#cameraContainer").show();
$("#subirFotoContainer").hide();
imagenTomada = false;
imagenTomada = true;
}
function mostrarSubirFoto(event) {
event.preventDefault();
console.log("mostrando subir foto...");
$("#tomarFotoContainer").hide();
$("#subirFotoContainer").show();
imagenTomada = false;
imagenSubida = true;
}
function readURL(input) {
if (input.files && input.files[0]) {
var reader = new FileReader();
reader.onload = function (e) {
$('#imagenUsuario').attr('src', e.target.result);
}
reader.readAsDataURL(input.files[0]); // convert to base64 string
$('#imagenUsuario').show();
}
}
$("#imgInp").change(function () {
readURL(this);
});
var Upload = function (file) {
this.file = file;
};
Upload.prototype.getType = function () {
return this.file.type;
};
Upload.prototype.getSize = function () {
return this.file.size;
};
Upload.prototype.getName = function () {
if (this.file != null)
return this.file.name;
else
return "";
};
Upload.prototype.doUpload = function () {
var that = this;
var url = "{{ path('nutrapharm_upload') }}";
var formData = new FormData();
$("#btnGuardar").prop("disabled", true);
if (imagenTomada == true && imagenSubida == false) {
formData.append("upload_file", 0);
formData.append("imagen", $("#photo").attr('src'));
} else if (imagenSubida == true && imagenTomada == false) {
formData.append("upload_file", 1);
}
console.log(this.file);
if (this.file != null) {
formData.append("imagen", this.file, this.getName());
}
formData.append("comentarioFotoUsuario", $("#comentarioFotoUsuario").val());
formData.append("usuarioNutraPharm", usuarioNutraPharm);
formData.append("tipoUsuarioFormulario", tipoUsuarioFormulario);
$.ajax
({
type: "POST",
url: url,
data: formData,
async: true,
cache: false,
contentType: false,
processData: false,
timeout: 60000,
statusCode: {
400: function (respuesta) {
console.log(respuesta.responseText);
var respuestaJson = JSON.parse(respuesta.responseText);
$("#mensaje-nutrapharm").removeClass("alert-success");
$("#mensaje-nutrapharm").addClass("alert-danger");
$("#mensaje-nutrapharm").html(respuestaJson.msg);
$("#mensaje-nutrapharm").show();
$("#btnGuardar").prop("disabled", false);
},
500: function (respuesta) {
console.log(respuesta.responseText);
var respuestaJson = JSON.parse(respuesta.responseText);
$("#mensaje-nutrapharm").removeClass("alert-success");
$("#mensaje-nutrapharm").addClass("alert-danger");
$("#mensaje-nutrapharm").html(respuestaJson.msg);
$("#mensaje-nutrapharm").show();
$("#btnGuardar").prop("disabled", false);
}
},
success: function (data) {
$("#shareButtonContainer").show();
if (data.tipo === 2) {
tipoUsuarioFormulario = data.tipo;
usuarioNutraPharm = data.usuario;
}
$("#mensaje-nutrapharm").removeClass("alert-danger");
$("#mensaje-nutrapharm").addClass("alert-success");
$("#mensaje-nutrapharm").html(data.msg);
$("#mensaje-nutrapharm").show();
window.location.assign("{{path('nutrapharm_comparacion',{ 'idp': idp })}}");
},
complete: function (data) {
$("#btnGuardar").prop("disabled", false);
}
});
};
$("#btnGuardar").click(function (e) {
e.preventDefault();
if (imagenSubida == false && imagenTomada == false) {
$("#mensaje-nutrapharm").removeClass("alert-success");
$("#mensaje-nutrapharm").addClass("alert-danger");
$("#mensaje-nutrapharm").html("Debe seleccionar o tomar una imagen!");
$("#mensaje-nutrapharm").show();
return false;
}
if (typeof upload == "undefined") {
upload = new Upload(null);
}
upload.doUpload();
});
$("#imgInp").on("change", function (e) {
e.preventDefault();
if ($(this)[0].files.length != 0) {
var file = $(this)[0].files[0];
upload = new Upload(file);
console.log(upload)
imagenSubida = true;
} else
upload = new Upload(null);
});
</script>
{%endblock%}
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