h4ckypurpl3/tupali_fork
1
0
Fork 0
forked from qwerty/tupali
Code Releases Wiki Activity

arreglando conflicto

Browse Source
This commit is contained in:
Hacky Purple 2018-11-05 14:31:09 -05:00
commit c648d45027
2 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
index.php
View File

@ -34,6 +34,7 @@
<meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/> <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
<!-- Chrome, Firefox OS y Opera --> <!-- Chrome, Firefox OS y Opera -->
<link rel='stylesheet' href='./librerias/animate/animate.min.css'> <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
<<<<<<< HEAD
<script type="text/javascript"> <script type="text/javascript">
window.addEventListener("load",function() { window.addEventListener("load",function() {
setTimeout(function(){ setTimeout(function(){
@ -41,6 +42,9 @@ window.addEventListener("load",function() {
}, 0); }, 0);
}); });
</script> </script>
=======
>>>>>>> c119b18641256b0d142514cd0030b24aa799685a
@ -182,6 +186,7 @@ $presentacion_pie="
progress: true, progress: true,
history: true, history: true,
center: true, center: true,
mouseWheel: true,
transition: 'slide', // none/fade/slide/convex/concave/zoom transition: 'slide', // none/fade/slide/convex/concave/zoom
@ -479,6 +484,11 @@ if ($variable !=''){
</script> </script>
"; ";
// $no_mostrar="display:none; ";
$onload =" <script type=\"text/javascript\">xajax_formulario_embebido_ajax('','$form','','nuevo')</script>"; $onload =" <script type=\"text/javascript\">xajax_formulario_embebido_ajax('','$form','','nuevo')</script>";
} }
elseif($v[0] =='c') { elseif($v[0] =='c') {
@ -487,6 +497,8 @@ if ($variable !=''){
//$presentacion = contenido_presentacion("$form"); //$presentacion = contenido_presentacion("$form");
$presentacion = contenido_presentacion("$form"); $presentacion = contenido_presentacion("$form");
$embebido = "1"; $embebido = "1";
//$no_mostrar ="display:none; ";
$empresa = remplacetas('form_id','id',"$form",'id_empresa',"") ; $empresa = remplacetas('form_id','id',"$form",'id_empresa',"") ;
$id_empresa= $empresa[0]; $id_empresa= $empresa[0];
$logo = remplacetas('empresa','id',$id_empresa,'imagen','') ; $logo = remplacetas('empresa','id',$id_empresa,'imagen','') ;
@ -505,17 +517,9 @@ if ($variable !=''){
} }
elseif($v[0] =='a') { elseif($v[0] =='a') {
$form =$v[1]; $form =$v[1];
$plantilla="carousel";
/// a=Aplicacion
$geo = buscar_campo_tipo($form,"14");
$embebido = "1"; $embebido = "1";
$empresa = remplacetas('form_id','id',$form,'id_empresa',"") ; $no_mostrar ="display:none; ";
$razon_social_portal = remplacetas('empresa','id',"1",'razon_social','') ; $aplicacion_pie="
$id_empresa = $empresa[0];
$titulo = remplacetas('form_id','id',$form,'nombre',"") ;
$descripcion = remplacetas('form_id','id',$form,'descripcion',"") ;
$no_mostrar ="display:none; ";
$aplicacion_pie="
<script src='librerias/reveal/lib/js/head.min.js'></script> <script src='librerias/reveal/lib/js/head.min.js'></script>
@ -664,6 +668,7 @@ if('serviceWorker' in navigator) {
"; ";
<<<<<<< HEAD
// $registros = aplicacion_carrusel("$form",'10','','embebido','',"carousel"); // $registros = aplicacion_carrusel("$form",'10','','embebido','',"carousel");
//$registros="<div id='mostrar_carrusel'>$registros</div>"; //$registros="<div id='mostrar_carrusel'>$registros</div>";
// $formulario = formulario_embebido($form,$opciones); // $formulario = formulario_embebido($form,$opciones);
@ -781,6 +786,9 @@ $acciones
</div>$footer"; </div>$footer";
//$onload = "$footer $aplicacion "; //$onload = "$footer $aplicacion ";
=======
$onload = vista_aplicacion($form);
>>>>>>> c119b18641256b0d142514cd0030b24aa799685a
} }
elseif($v[0] =='g') { elseif($v[0] =='g') {
/// g=FORMULARIO EMBEBIDO /// g=FORMULARIO EMBEBIDO
@ -826,8 +834,7 @@ $acciones
}); });
</script> </script>
"; ";}
}
elseif($v[0] =='h') { elseif($v[0] =='h') {
/// h=ADDON /// h=ADDON
$addon =$v[1]; $addon =$v[1];
@ -1421,7 +1428,7 @@ document.oncopy = addLink;
<?php } ?> <?php } ?>
</head> </head>
<body data-spy="scroll" data-target="#toc" onload="revisarSession()"; > <body data-spy="scroll" data-target="#toc" onload="revisarSession(); "; >
<?php <?php
if(isset($_REQUEST['debug'])) { if(isset($_REQUEST['debug'])) {
print_r( $_SESSION ); print_r( $_SESSION );
@ -1821,6 +1828,34 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
<span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span> <span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span>
</div> </div>
</form> </form>
<script type="text/javascript">
$('.navbar-collapse a').click(function(){
$(".navbar-collapse").collapse('hide');
});
var page_size_check = null, q_body;
(q_body = $('#body')).bind('DOMSubtreeModified', function() {
if (page_size_check === null) {
return;
}
page_size_check = setTimeout(function() {
q_body.css('height', '');
if (q_body.height() < window.innerHeight) {
q_body.css('height', window.innerHeight + 'px');
}
if (!(window.pageYOffset > 1)) {
window.scrollTo(0, 1);
}
page_size_check = null;
}, 400);
});
/*
window.addEventListener("load",function() {
setTimeout(function(){
window.scrollTo(0, 1);
}, 0);
});*/
</script>
</body> </body>

4
mapero.php
View File

@ -71,7 +71,7 @@ $plantilla ="mapa";
<link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.css" /> <link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.css" />
<link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.Default.css" /> <link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.Default.css" />
<script src="librerias/leaflet/dist/leaflet.markercluster-src.js"></script> <script src="librerias/leaflet/dist/leaflet.markercluster-src.js"></script>
<script type="text/javascript" src="milfs/geojson.js.php?id=<?php echo $_REQUEST['id'] ?>&buscar=<?php echo $_REQUEST['buscar'] ?>"></script> <script type="text/javascript" src="milfs/geojson.js.php?id=<?php echo $_REQUEST['id'] ?>&buscar=<?php echo $_REQUEST['buscar'] ?>&item=<?php echo $_REQUEST['item'] ?>"></script>
<?php <?php
$otro_json = remplacetas('form_parametrizacion','campo',$_REQUEST[id],'descripcion'," tabla='form_id' and opcion = 'json'") ;; $otro_json = remplacetas('form_parametrizacion','campo',$_REQUEST[id],'descripcion'," tabla='form_id' and opcion = 'json'") ;;
//$obj = file_get_contents('https://www.kleper.net/wiki/RutaPazTerritorial.geojson'); //$obj = file_get_contents('https://www.kleper.net/wiki/RutaPazTerritorial.geojson');
@ -135,7 +135,7 @@ $ids = json_decode($otro_json[0]);
} }
.leaflet-popup-content { word-wrap: break-word !important; /*width:600px !important; */ } .leaflet-popup-content { word-wrap: break-word !important; width:600px !important; }
#map { position:absolute; top:0; bottom:0; width:100%; } #map { position:absolute; top:0; bottom:0; width:100%; }
/* Sticky footer styles /* Sticky footer styles