1
0
Fork 0

mejoras en la vista app

This commit is contained in:
humano 2017-11-05 10:28:52 -05:00
parent 50c1ae3f94
commit 8802854ce3
3 changed files with 190 additions and 212 deletions

View File

@ -101,7 +101,7 @@ $plantilla= $_REQUEST['plantilla'];
if($_REQUEST['tema'] !="") { $tema= "$_REQUEST[tema]";}
else {
if($v[0] =='a') { $tema='aplicacion'; }else{$tema="moon";}
if($v[0] =='a' OR $v[0] =='k') { $tema='aplicacion'; }else{$tema="moon";}
}
$presentacion_cabeza = "
<link rel='stylesheet' href='librerias/reveal/css/reveal.css'>
@ -374,11 +374,12 @@ if ($variable !=''){
<script src='librerias/reveal/js/reveal.js'></script>
<script>
// max-height: calc(100vh - 300px);
// min-height: calc(100vh - 300px);
// More info https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
width: '100%',
height: '95%',
height: '90%',
touch: false,
controls: false,
progress: true,
@ -444,7 +445,7 @@ if('serviceWorker' in navigator) {
$mapa = "
<a name='mapa'></a>
<iframe class='' src='mapero.php?id=$form' width='100%' height='800px;' webkitAllowFullScreen mozallowfullscreen allowFullScreen ></iframe>
<embed class='' src='mapero.php?id=$form' width='100%' style='height: calc(100vh - 150px);' webkitAllowFullScreen mozallowfullscreen allowFullScreen ></embed>
";
}else {$mapa = "";}
$estadisticas = portal_listado_campos("$form");
@ -452,17 +453,17 @@ if('serviceWorker' in navigator) {
$no_mostrar="display:none; ";
$footer="
<nav class='navbar navbar-inverse navbar-fixed-bottom'>
<div class=''>
<ul class='nav navbar-nav center-block' style='
float:none;
margin:0 auto;
display: block;
text-align: center;'>
$acciones
</ul>
</div>
</nav>";
<div class=''>
<ul class='nav navbar-nav center-block' style='
float:none;
margin:0 auto;
display: block;
text-align: center;'>
$acciones
</ul>
</div>
</nav>";
@ -472,9 +473,9 @@ if('serviceWorker' in navigator) {
<div class='slides' >
<section id='inicio' class='text-center' >
<img style='width: 20%;
display: block;
margin-left: auto;
margin-right: auto;' src='milfs/images/secure/?file=600/$logo[0]' alt='' class='img img-responsive center-block'>
display: block;
margin-left: auto;
margin-right: auto;' src='milfs/images/secure/?file=600/$logo[0]' alt='' class='img img-responsive center-block'>
<h1>$titulo[0]</h1>
<h2>$descripcion[0]</h2>
<hr>
@ -532,10 +533,43 @@ if('serviceWorker' in navigator) {
}else {}*/
$acceso = 1;
$embebido =1;
$aplicacion_pie="
$suite_listado = suite_listado("$id");
$onload = $suite_listado;
<script src='librerias/reveal/lib/js/head.min.js'></script>
<script src='librerias/reveal/js/reveal.js'></script>
<script>
// max-height: calc(100vh - 300px);
// min-height: calc(100vh - 300px);
// More info https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
width: '100%',
height: '90%',
touch: false,
controls: false,
progress: true,
history: true,
center: true,
transition: 'slide', // none/fade/slide/convex/concave/zoom
// More info https://github.com/hakimel/reveal.js#dependencies
dependencies: [
]
});
</script>
<script src='librerias/slick/slick.js' type='text/javascript' charset='utf-8'></script>
";
$librerias_pie = "$aplicacion_pie";
$librerias_cabeza ="
$presentacion_cabeza ";
$suite_listado = suite_listado("$id","$_REQUEST[suite]");
$onload = "$suite_listado";
}
else{
@ -920,6 +954,7 @@ $menu_lateral = "
<script src="./librerias/summernote/summernote.js"></script>
<!-- include summernote css/js-->
<link href="./librerias/summernote/summernote.css" rel="stylesheet">
<link href="./milfs/css/style.css" rel="stylesheet">
<!-- add after bootstrap.min.js -->
<script src="milfs/js/scripts.js"></script>

View File

@ -1,176 +1,7 @@
@media (max-width: 768px) {
.btn-responsive {
padding:2px 4px;
font-size:80%;
line-height: 1;
border-radius:3px;
}
.drop-up {
top: auto;
bottom: 100% !important;
}
@media (min-width: 769px) and (max-width: 992px) {
.btn-responsive {
padding:4px 9px;
font-size:90%;
line-height: 1.2;
}
}
* {
margin: 0;
padding: 0;
}
body {
background: #222;
font-family: Georgia, serif;
color: #fff;
font-size: 14px;
}
#dates a {
color: gray;
text-decoration: none;
-webkit-transition: 0.5s;
-moz-transition: 0.5s;
-o-transition: 0.5s;
-ms-transition: 0.5s;
transition: 0.5s;
font-size: 12px;
}
#dates a:hover,
#dates a.selected {
color: red;
font-size: 18px;
}
#timeline {
width: 95%;
height: 500px;
overflow: hidden;
margin: 100px auto;
position: relative;
}
#dates {
width: 800px;
height: 60px;
overflow: hidden;
background: url('timeline/dot.gif') left 45px repeat-x;
}
#dates li {
list-style: none;
float: left;
width: 100px;
height: 50px;
font-size: 24px;
text-align: center;
background: url('timeline/biggerdot.png') center bottom no-repeat;
}
#dates a {
line-height: 18px;
padding-bottom: 10px;
}
#dates .selected {
font-size: 18px;
}
#issues {
width: 800px;
height: 500px;
overflow: hidden;
}
#issues li {
width: 900px;
height: 500px;
list-style: none;
float: left;
}
#issues li.selected img {
-webkit-transform: scale(1.1,1.1);
-moz-transform: scale(1.1,1.1);
-o-transform: scale(1.1,1.1);
-ms-transform: scale(1.1,1.1);
transform: scale(1.1,1.1);
}
#issues li img {
float: left;
margin: 10px 30px 10px 50px;
background: transparent;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF)"; /* IE 8 */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);/* IE 6 & 7 */
zoom: 1;
-webkit-transition: all 2s ease-in-out;
-moz-transition: all 2s ease-in-out;
-o-transition: all 2s ease-in-out;
-ms-transition: all 2s ease-in-out;
transition: all 2s ease-in-out;
-webkit-transform: scale(0.7,0.7);
-moz-transform: scale(0.7,0.7);
-o-transform: scale(0.7,0.7);
-ms-transform: scale(0.7,0.7);
transform: scale(0.7,0.7);
}
#issues li h1 {
font-size: 48px;
margin: 20px 0;
color: red;
/*text-shadow: #000 1px 1px 2px;*/
}
#issues li p {
font-size: 14px;
margin-right: 70px;
font-weight: normal;
line-height: 22px;
/* text-shadow: #000 1px 1px 2px;*/
}
#grad_left,
#grad_right {
width: 100px;
height: 500px;
position: absolute;
top: 0;
}
#grad_left {
left: 0;
/* background: url('timeline/grad_left.png') repeat-y;*/
}
#grad_right {
right: 0;
/* background: url('timeline/grad_right.png') repeat-y;*/
}
#next,
#prev {
position: absolute;
top: 0;
font-size: 70px;
top: 170px;
width: 22px;
height: 38px;
background-position: 0 0;
background-repeat: no-repeat;
text-indent: -9999px;
overflow: hidden;
}
#next:hover,
#prev:hover {
background-position: 0 -76px;
}
#next {
right: 0;
background-image: url('timeline/next.png');
}
#prev {
left: 0;
background-image: url('timeline/prev.png');
}
#next.disabled,
#prev.disabled {
opacity: 0.2;
}

View File

@ -2,13 +2,22 @@
date_default_timezone_set('America/Bogota');
function suite_listado($id_empresa){
$consulta= "SELECT *,count(grupo) as cantidad FROM form_grupo WHERE id_empresa= '$id_empresa' GROUP BY grupo ";
function suite_listado($id_empresa,$suite){
$suite=urldecode($suite) ;
if($suite!="") { $campo='id as campo, grupo'; $w_grupo ="AND grupo ='$suite'";}else {$w_grupo="GROUP BY grupo "; $campo ='grupo , count(grupo) as campo '; }
$consulta= "SELECT *, $campo FROM form_grupo WHERE id_empresa= '$id_empresa' $w_grupo ";
$miniatura ="";
$link=Conectarse();
mysqli_set_charset($link, "utf8");
$sql=mysqli_query($link,$consulta);
$linea="";
$linea_consultar="";
$linea_editar="";
$razon_social = remplacetas('empresa','id',"$id_empresa",'razon_social','') ;
$slogan = remplacetas('empresa','id',"$id_empresa",'slogan','') ;
$web = remplacetas('empresa','id',"$id_empresa",'web','');
$logo = remplacetas('empresa','id',"$id_empresa",'imagen','') ;
if (mysqli_num_rows($sql)!='0'){
$fila = 1;
@ -38,7 +47,11 @@ if (mysqli_num_rows($sql)!='0'){
elseif($vista=='agenda') { $favorita="?eventos=$row[id]";}
else{ $favorita="b$row[id]?registros=10";}
;
$titulo = remplacetas('form_id','id',$row['id'],'nombre',"") ;
$descripcion = remplacetas('form_id','id',$row['id'],'descripcion',"") ;
if($geo[0] !='') { $mapa= "<a class='boton_land btn btn-default ' href='mapero.php?id=$row[id]' target='mapa'><i class='fa fa-globe' aria-hidden='true'></i> Mapa</a>";}else {$mapa='';}
$descripcion_limpia = strip_tags($row['descripcion']);
if($imagen !="") {
@ -73,31 +86,130 @@ if($ver_data[0] !="0") {$boton_ver_data =" <a target='datos'class='boton_land bt
/// PRIVACIDAD
if($publico[0] =='1') {
$linea .= "
<li>$row[grupo] $row[cantidad]</li>
";
$linea .= "<li title='' data-toggle='tooltip' data-placement='auto' data-html='true'><a href='k$id_empresa&suite=$row[grupo]'>$row[grupo] </a></li>";
$linea_consulta .= "<li title='$descripcion[0]' data-toggle='tooltip' data-placement='auto' data-html='true'><a href='#'>$titulo[0]</a></li>";
$lista .= "<li class='list-group-item' ><a href='#'>$titulo[0]</a> $descripcion[0]</li>";
$linea_editar .= "<li title='$descripcion[0]' data-toggle='tooltip' data-placement='auto' data-html='true'><a href='#' class=' ' title='Agregar' onclick=\"xajax_formulario_embebido_ajax('$row[id]','','nuevo');\">$titulo[0]</a></li>";
}else{
if($llenar[0] !="0"){
$linea .="<li>$row[grupo] // $row[cantidad] </li>
";}
/// $linea .="<li>$row[grupo] // $row[campo] </li> ";
}
}
}else {
$linea .=" ";}
}
$fila++;
}
}
$linea ="
<div class='container' id='contenedor_suite'>
<h1>Suites</h1>
$linea
if($suite!="") {
$footer="
<nav class='navbar navbar-inverse navbar-fixed-bottom'>
<div class='list-inline'>
<ul class=' center-block' style='
float:none;
margin:0 auto;
display: block;
text-align: center;'>
<a href='k$id_empresa' class='btn btn-default ' >
<i class='fa fa-home' aria-hidden='true'></i>
</a>
<a href='#inicio' class='btn btn-default ' >
<i class='fa fa-list' aria-hidden='true'></i>
</a>
<a href='#mapa' class='btn btn-default ' >
<i class='fa fa-map' aria-hidden='true'></i>
</a>
<div class='btn-group'>
<a href='#' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='fa fa-eye' aria-hidden='true'></i>
</a>
<ul class='dropdown-menu drop-up dropdown-menu-right' role='menu'>
$linea_consulta
</ul>
</div>
<div class='btn-group'>
<a href='#' class='btn btn-default dropdown-toggle' data-toggle='dropdown'>
<i class='fa fa-plus' aria-hidden='true'></i>
</a>
<ul class='dropdown-menu drop-up dropdown-menu-right' role='menu'>
$linea_editar
</ul>
</div>
</ul>
</div>
</nav>
";
$resultado ="
<div class='reveal' style='bottom: 80px !important;'>
<div class='slides' >
<section id='inicio' class='scrollable present text-center' style='' >
<img style='width: 20%;
display: block;
margin-left: auto;
margin-right: auto;' src='milfs/images/secure/?file=600/$logo[0]' alt='' class='img img-responsive center-block'>
<h2>$descripcion[0]</h2>
<hr>
<h1>$razon_social[0]</h1>
<h2>$slogan[0]</h2>
<hr>
<ul class='list-group'>
$lista
</ul>
<hr>
<a href='https://tupale.co'>Tupale.co</a>
</section>
<section id='estadisticas' class='scrollable' >
Las estadisticas
</section>
<section id='mapa'>
el maopa
</section>
</div>
</div>
$footer
";
return $linea;
}else {
$titulo = remplacetas('empresa','id',"$id_empresa",'razon_social','') ;
$resultado ="
<div class='container center-text' id='contenedor_suite'>
<h1 class='text-center'>$titulo[0]</h1>
$linea
</div>
";
}
}else{$resultado ="";}
return $resultado;
}