Compare commits

...

5 Commits
master ... v3

Author SHA1 Message Date
kleper b78e7a65d1 Asegurando que en tupale v3 quede milfs v3 2019-07-27 07:53:37 -05:00
Gogs 0a718046b1 Resolviendo problema con submodulo 2019-07-27 07:50:16 -05:00
Gogs 873a628062 Corrigiendo problemas en v3 2019-07-27 07:43:18 -05:00
Gogs ca08ce1b0e Garantizando que estamos en la rama v3 2019-07-27 07:28:18 -05:00
Gogs f434bcd306 Cambiando milfs a v3 en branch v3 de Tupale 2019-07-27 07:16:59 -05:00
9 changed files with 658 additions and 28 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "milfs"]
path = milfs
url = https://code.tupale.co/kleper/milfskleper
url = https://code.tupale.co/qwerty/milfs

6
includes/salir.php Normal file
View File

@ -0,0 +1,6 @@
<?php if(!isset($_SESSION)) { if(!isset($_SESSION)) { session_start(); } }
session_destroy();
$pagina=$_SERVER['HTTP_REFERER'];
header("Location:../");
?>

View File

@ -126,7 +126,7 @@ $v = decodifica_parametro($variable);
if ($v[0] =='e') {
if(!isset($_REQUEST['home'])){
$pagina_inicio_definida = remplacetas('form_parametrizacion','id_empresa',$v[1],'descripcion'," tabla='empresa' AND opcion='pagina_inicio'","") ;
$pagina_inicio_definida = remplacetas('form_parametrizacion','id_empresa',$v[1],'descripcion'," tabla='empresa' AND opcion='pagina_inicio'") ;
$vista_favorita = vista_favorita($pagina_inicio_definida[0]);
// $onload = "<script type=\"text/javascript\">window.location.href='$vista_favorita';</script> ";
if($vista_favorita[0] !=""){
@ -213,7 +213,6 @@ if ($variable !=''){
<script src='./librerias/bootstrap-toc/bootstrap-toc.min.js'></script>
";
if($titulo[0] !="") {
$logo = remplacetas('empresa','id',"$id_empresa",'imagen','') ;
$descripcion = remplacetas('empresa','id',"$id_empresa",'slogan','') ;
@ -228,7 +227,6 @@ if ($variable !=''){
$onload = "<script type=\"text/javascript\">window.location.href='$vista_favorita';</script> ";
}
* */
//echo "<br><br><br><br><br><br><br><br>$logo[2] / $logo[0]";
$acceso = 1;
$menu ="
<div class='col-sm-3 col-lg-2 hidden-xs hidden-sm' id='caja_lateral_derecha'>
@ -239,7 +237,6 @@ if ($variable !=''){
$cols_interior ="10";
}else {
$onload = "<script type=\"text/javascript\">location.href='404';</script> ";
}
}
elseif($v[0] =='b') {
@ -1433,7 +1430,7 @@ document.oncopy = addLink;
}
$eventos="";
if(isset($_REQUEST['eventos'])) {
//$embebido='1';
@ -1671,7 +1668,7 @@ echo $css_adicional;
echo "
";
echo mas_visto("ultimos","4","4","","");
echo mas_visto("ultimos","4","4");
echo "<div class='clearfix visible-lg-block visible-md-block visible-sm-block visible-xs-block'></div>";
// echo mas_visto("identificador","4","");
//echo "<div class='clearfix visible-lg-block visible-md-block visible-sm-block visible-xs-block'></div>";

View File

@ -15,3 +15,15 @@ $('.dropdown-menu').click(function(e) {
e.stopPropagation(); //This will prevent the event from bubbling up and close the dropdown when you type/click on text boxes.
});
$(window).on('load', function() {
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
$('#div_tpaga_mobile').show();
$('#div_tpaga_desktop').hide();
}
else {
$('#div_tpaga_mobile').hide();
$('#div_tpaga_desktop').show();
}
});

View File

@ -1,10 +1,7 @@
/* Adding gvnix styles css - NO COPIAR */
/* @import 'http://geo-gvnix.rhcloud.com/resources/styles/standard.css';*/
/* Custom fixed navs */
.nav-side-menu li {
background-color: #2e353d !important ;
border:none;
};
.sidebar-logo{
padding: 20px;
margin: 0px auto;

View File

@ -15,15 +15,15 @@ if(isset($_REQUEST[categoria]) AND isset($_REQUEST[buscar])) {
$_REQUEST['buscar'] = "$_REQUEST[categoria]:$_REQUEST[buscar]";
}
$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre',"","") ;
$formulario_descripcion = remplacetas('form_id','id',$_REQUEST[id],'descripcion',"","") ;
$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ;
$formulario_descripcion = remplacetas('form_id','id',$_REQUEST[id],'descripcion') ;
$descripcion_meta = preg_replace("[\n|\r|\n\r|\t]",'', strip_tags($formulario_descripcion[0]));
$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre',"","") ;
$id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa',"","") ;
$twitter = remplacetas('empresa','id',"$id_empresa[0]",'twitter','',"","") ;
$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
$id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa') ;
$twitter = remplacetas('empresa','id',"$id_empresa[0]",'twitter','') ;
if($twitter[0] =="") {$twitter[0] ="@tupaleCo";}
$logo = remplacetas('empresa','id',"$id_empresa[0]",'imagen','',"","") ;
$razon_social = remplacetas('empresa','id',"$id_empresa[0]",'razon_social','',"","") ;
$logo = remplacetas('empresa','id',"$id_empresa[0]",'imagen','') ;
$razon_social = remplacetas('empresa','id',"$id_empresa[0]",'razon_social','') ;
$campos_formulario = input_campos("$_REQUEST[id]","categoria");
$uri = "$_SERVER[SERVER_NAME]/$_SERVER[REQUEST_URI]";
$background_imagen = buscar_imagen("$_REQUEST[id]","","","$id_empresa");
@ -66,9 +66,7 @@ $plantilla ="mapa";
<script src="librerias/jquery/jquery-2.1.4.min.js"></script>
<script src="librerias/leaflet/leaflet-providers.js"></script>
<script src="librerias/leaflet/leaflet-search.js"></script>
<link rel="stylesheet" href="librerias/bootstrap/css/bootstrap.min.css" >
<link rel="stylesheet" type="text/css" media="screen" href="milfs/css/bootstrap.css">
<link rel="stylesheet" href="librerias/leaflet/leaflet.css" />
<script src="librerias/leaflet/leaflet.js"></script>
<link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.css" />
@ -76,7 +74,7 @@ $plantilla ="mapa";
<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'] ?>&item=<?php echo $_REQUEST['item'] ?>"></script>
<?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');
$ids = json_decode($otro_json[0]);
foreach ($ids as $clave => $valor) {
@ -198,11 +196,8 @@ $ids = json_decode($otro_json[0]);
}
</style>
<?php
$categorias = lista_categorias($_REQUEST['id'],'','mapa') ;
$categorias = lista_categorias($_REQUEST['id'],'','') ;
$css_adicional = remplacetas('form_parametrizacion','campo',"index",'descripcion'," tabla='css' and opcion = 'adicional' and id_empresa = '$id_empresa[0]'") ;
$fijar_barra = remplacetas('form_parametrizacion','campo',$_REQUEST['id'],'descripcion'," tabla='form_id' and opcion = 'fijar_barra'") ;
$mostrar_items = remplacetas('form_parametrizacion','campo',$_REQUEST['id'],'descripcion'," tabla='form_id' and opcion = 'mostrar_items'") ;
if( $fijar_barra[0] !='1'){ $sidebar='sidebar';} else{$sidebar='';}
if($css_adicional[0] !="") {
$css_adicional ="<style >
@ -218,7 +213,7 @@ $ids = json_decode($otro_json[0]);
<body>
<!--nav sidebar -->
<aside>
<nav class="navbar navbar-inverse <?php echo $sidebar; ?> navbar-fixed-top" role="navigation">
<nav class="navbar navbar-inverse sidebar navbar-fixed-top" role="navigation">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
<link href="librerias/leaflet/css/sidebar.css" rel="stylesheet">

456
maperorob.php Normal file
View File

@ -0,0 +1,456 @@
<?php session_start();
if(isset($_REQUEST['debug'])) {ini_set('display_errors', 'On');}
require ('milfs/xajax/xajax.inc.php');
$xajax = new xajax();
//require ('json.lab.php');
require ('milfs/funciones/funciones.php');
require ("milfs/funciones/conex.php");
include ('milfs/librerias/parsedown/Parsedown.php');
//require_once ('includes/markdown.php');
//require ('funciones/convert.php');
$xajax->processRequests();
//if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
if(isset($_REQUEST[categoria]) AND isset($_REQUEST[buscar])) {
$cadena_busqueda = "$_REQUEST[buscar]";
$_REQUEST['buscar'] = "$_REQUEST[categoria]:$_REQUEST[buscar]";
}
$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ;
$formulario_descripcion = remplacetas('form_id','id',$_REQUEST[id],'descripcion') ;
$descripcion_meta = preg_replace("[\n|\r|\n\r|\t]",'', strip_tags($formulario_descripcion[0]));
$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
$id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa') ;
$twitter = remplacetas('empresa','id',"$id_empresa[0]",'twitter','') ;
if($twitter[0] =="") {$twitter[0] ="@tupaleCo";}
$logo = remplacetas('empresa','id',"$id_empresa[0]",'imagen','') ;
$razon_social = remplacetas('empresa','id',"$id_empresa[0]",'razon_social','') ;
$campos_formulario = input_campos("$_REQUEST[id]","categoria");
$uri = "$_SERVER[SERVER_NAME]/$_SERVER[REQUEST_URI]";
$background_imagen = buscar_imagen("$_REQUEST[id]","","","$id_empresa");
$plantilla ="mapa";
?>
<!DOCTYPE html>
<html lang="en">
<head >
<title><?php echo "$formulario_nombre[0] / $cadena_busqueda" ?> tupale.co</title>
<meta charset="utf-8">
<!-- <meta name="viewport" content="user-scalable=no, width=device-width, maximum-scale=1, initial-scale=1"> -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
<meta name="description" content="">
<meta NAME="Language" CONTENT="Spanish">
<meta NAME="Revisit" CONTENT="1 days">
<meta NAME="Distribution" CONTENT="Global">
<meta NAME="Robots" CONTENT="All">
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="<?php echo $twitter[0]; ?>">
<meta name="twitter:creator" content="@qwerty_co">
<meta name="twitter:url" content="<?php echo $uri ; ?>">
<meta name="twitter:title" content="<?php echo "$formulario_nombre[0] / $cadena_busqueda" ?> tupale.co">
<meta name="twitter:description" content=" <?php echo $descripcion_meta; ?>">
<meta name="twitter:image" content="<?php echo "$_SESSION[url]images/secure/?file=full/$background_imagen"; ?>">
<meta property="og:type" content="article">
<meta property="og:title" content="<?php echo "$formulario_nombre[0] / $cadena_busqueda" ?> tupale.co" />
<meta property="og:type" content="website" />
<meta property="og:url" content="<?php echo "$uri"; ?>" />
<meta property="og:image" content="<?php echo "$_SESSION[url]images/secure/?file=full/$background_imagen"; ?>" />
<meta property="og:site_name" content="<?php echo $razon_social[0]; ?>" />
<meta property="og:description" content=" <?php echo $descripcion_meta; ?>" />
<link rel="shortcut icon" href="<?php echo "milfs/images/secure/?file=150/$logo[0]"; ?>">
<?php $xajax->printJavascript("milfs/xajax/"); ?>
<link rel="shortcut icon" href="favicon-152.png">
<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
<link rel="stylesheet" href="librerias/leaflet/leaflet-search.css"/>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.4.0/leaflet.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.4.0/leaflet.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.5.0/proj4.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/proj4leaflet/1.0.2/proj4leaflet.min.js"></script>
<script src="librerias/proj4js/leaflet.proj4.js"></script>
//<script src="librerias/leaflet/leaflet.js"></script>
<script src="librerias/jquery/jquery-2.1.4.min.js"></script>
<script src="librerias/leaflet/leaflet-providers.js"></script>
<script src="librerias/leaflet/leaflet-search.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="milfs/css/bootstrap.css">
<link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.css" />
<link rel="stylesheet" href="librerias/leaflet/dist/MarkerCluster.Default.css" />
<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'] ?>&item=<?php echo $_REQUEST['item'] ?>"></script>
<?php
$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');
$ids = json_decode($otro_json[0]);
foreach ($ids as $clave => $valor) {
if($valor !=""){
$obj=file_get_contents("$valor[0]");
$li .="<script>var geojsonAuxiliar_$clave = $obj ;</script>";
$layer .= "
var geojsonAux_$clave = L.geoJson(geojsonAuxiliar_$clave, {
pointToLayer: function(feature, latlng) {
var smallIcon = new L.Icon({
iconSize: [100, 100],
iconAnchor: [13, 27],
popupAnchor: [1, -24],
/*iconUrl: feature.properties.icon.iconUrl*/
iconUrl: 'https://tupale.co/milfs/images/secure/?file=150/da6d16547658ebc06c5378b30d1ee4bf.png'
});
return L.marker(latlng, {icon: smallIcon});
},
onEachFeature: function(feature, layer) {
var popupText = feature.properties.description
layer.bindPopup(popupText); }
});
";
$add_layer .= "markers.addLayer(geojsonAux_$clave);";
$capas_nombre .="geojsonAux_$clave,";
$capas .= "{
'$clave': geojsonAux_$clave
};";
$overlays ="
var overlays = $capas ";
}
}
echo $li;
?>
<style type="text/css">
@media (max-width: 800px) {
.panel-map{
max-width: 970px;
}
}
@media (min-width: 800px) {
.panel-map{
max-width: 200px;
}
}
.leaflet-popup-content { word-wrap: break-word !important; width:600px !important; }
#map { position:absolute; top:0; bottom:0; width:100%; }
/* Sticky footer styles
-------------------------------------------------- */
.footer {
position: absolute;
bottom: 3px;
width: 95%;
margin: 0 auto;
height: 120px;
/* Set the fixed height of the footer here */
z-index: 999999;
}
#div_leyenda {
padding: 2px;
background-color: white;
border-radius: 3px;
width: 90%;
overflow-x: scroll;
}
.modal-dialog {
width: 70%;
height: 50%;
padding: 0;
}
.modal-content {
height: 50%;
}
::-webkit-scrollbar {
width: 12px;
}
::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
border-radius: 10px;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
}
</style>
<?php
$categorias = lista_categorias($_REQUEST['id'],'','') ;
$css_adicional = remplacetas('form_parametrizacion','campo',"index",'descripcion'," tabla='css' and opcion = 'adicional' and id_empresa = '$id_empresa[0]'") ;
if($css_adicional[0] !="") {
$css_adicional ="<style >
$css_adicional[0]
<!-- adicional -->
</style>";
}
else {
$css_adicional ="<style ><!-- nada --></style>";
}
echo $css_adicional; ?>
</head>
<body>
<!--nav sidebar -->
<aside>
<nav class="navbar navbar-inverse sidebar navbar-fixed-top" role="navigation">
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
<link href="librerias/leaflet/css/sidebar.css" rel="stylesheet">
<div class="nav-side-menu">
<div class="brand"><a href="./"><img style='width: 100%;' src='images/banner.png' class='image-responsive'></a><br> <i class="fa fa-info-circle fa-lg pull-right" style="margin-top: 10px; margin-right: 5px;"></i></div>
<i class="fa fa-bars fa-2x toggle-btn" data-toggle="collapse" data-target="#menu-content"></i>
<br>
<form action="?id=<?php echo $_REQUEST[id]; ?>" method="get">
<div class='input-group '>
<input type='hidden' id='id' name='id' value="<?php echo $_REQUEST[id]; ?>" >
<?php echo $campos_formulario; ?><div id='div_campos'></div>
<input type='text' id='buscar' name='buscar' class='form-control' placeholder='Buscar' >
<input type="submit" class="btn btn-info " value="Buscar">
</div>
</form>
<hr>
<div class="menu-list">
<div style='width: calc(90% - 40px);;' class="container-fluid">
<h1><?php echo $formulario_nombre[0]; ?></h1>
<h2><?php echo $formulario_descripcion[0]; ?></h2>
<hr>
<h3>Categorías</h3>
<div style="height: 300px; overflow: auto;" >
<?php echo $categorias; ?>
</div>
<div class="sidebar-logo">
<a href="e<?php echo $id_empresa[0]; ?>" >
<img style='margin: 0px auto;' class='img img-responsive block-center' src="milfs/images/secure/?file=150/<?php echo $logo[0]; ?>" alt="<?php echo $razon_social[0]; ?>">
<h4><?php echo $razon_social[0]; ?></h4>
</a>
</div>
</div>
</div>
</div>
</nav>
</aside>
<div id="map"></div>
<?php
if($categorias !="") {
$pie="
<div style='' class='' id='contenedor_pie' >
<div style='' class='container' >
<a href='#' onclick=\"xajax_limpia_div('contenedor_pie'); \"><span class='pull-right'><i class='fa fa-times'></i></span></a>
$categorias
</div></div>
</div>";
$leyenda ="<div id='div_leyenda'><a class='btn btn-default btn-xs' onclick=xajax_contenido_ocultar('div_leyenda');>Cerrar</a> $categorias </div> ";
}else{
}
//echo $pie;
?>
<script type="text/javascript">
function htmlbodyHeightUpdate(){
var height3 = $( window ).height()
var height1 = $('.nav').height()+50
height2 = $('.main').height()
if(height2 > height3){
$('html').height(Math.max(height1,height3,height2)+10);
$('body').height(Math.max(height1,height3,height2)+10);
}
else
{
$('html').height(Math.max(height1,height3,height2));
$('body').height(Math.max(height1,height3,height2));
}
}
$(document).ready(function () {
htmlbodyHeightUpdate()
$( window ).resize(function() {
htmlbodyHeightUpdate()
});
$( window ).scroll(function() {
height2 = $('.main').height()
htmlbodyHeightUpdate()
});
});
function htmlbodyHeightUpdate(){
var height3 = $( window ).height()
var height1 = $('.nav').height()+50
height2 = $('.main').height()
if(height2 > height3){
$('html').height(Math.max(height1,height3,height2)+10);
$('body').height(Math.max(height1,height3,height2)+10);
}
else
{
$('html').height(Math.max(height1,height3,height2));
$('body').height(Math.max(height1,height3,height2));
}
}
$(document).ready(function () {
htmlbodyHeightUpdate()
$( window ).resize(function() {
htmlbodyHeightUpdate()
});
$( window ).scroll(function() {
height2 = $('.main').height()
htmlbodyHeightUpdate()
});
});
var crs = new L.Proj.CRS('EPSG:2400',
'+lon_0=15.808277777799999 +lat_0=0.0 +k=1.0 +x_0=1500000.0 ' +
'+y_0=0.0 +proj=tmerc +ellps=bessel +units=m ' +
'+towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +no_defs',
{
resolutions: [8192, 4096, 2048] // 3 example zoom level resolutions
}
);
var tiles = L.tileLayer('https://maps.omniscale.net/v2/tupalerobinsonmap-6a2fc4aa/style.default/{z}/{x}/{y}.png', {
maxZoom: 18,
attribution: '<a href="https://tupale.co">https://tupale.co</a> &copy; <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}),
latlng = L.latLng(4, -74.9005222);
var map = L.map('map',{
center: latlng,
zoom: 5,
layers: [tiles],
zoomControl: false
});
var geojson = L.geoJson(geojsonSample, {
pointToLayer: function(feature, latlng) {
var smallIcon = new L.Icon({
iconSize: [100, 100],
iconAnchor: [13, 27],
popupAnchor: [1, -24],
iconUrl: feature.properties.icon.iconUrl
/* iconUrl: "http://localhost/default/tupali/milfs/images/secure/?file=150/da6d16547658ebc06c5378b30d1ee4bf.png"*/
});
return L.marker(latlng, {icon: smallIcon});
},
onEachFeature: function(feature, layer) {
var popupText = feature.properties.description
layer.bindPopup(popupText); }
});
/*
var geojsonAux = L.geoJson(geojsonAuxiliar, {
pointToLayer: function(feature, latlng) {
var smallIcon = new L.Icon({
iconSize: [60, 60],
iconAnchor: [13, 27],
popupAnchor: [1, -24],
iconUrl: "http://localhost/default/tupali/milfs/images/secure/?file=150/da6d16547658ebc06c5378b30d1ee4bf.png"
});
return L.marker(latlng, {icon: smallIcon});
},
onEachFeature: function(feature, layer) {
var popupText = feature.properties.description
layer.bindPopup(popupText); }
});
*/
<?php echo $layer; ?>
var markers = L.markerClusterGroup();
markers.addLayer(geojson);
// markers.addLayer(geojsonAux);
<?php echo $add_layer; ?>
map.fitBounds(geojson.getBounds());
var legend = L.control({position: 'bottomright'});
//disable zoomControl when initializing map (which is topleft by default)
///L.control.layers(<?php echo $capas_nombre; ?>).addTo(map);
/* //add zoom control with your options
L.control.zoom({
position:'topright'
}).addTo(map);
*/
legend.onAdd = function (map) {
var div = L.DomUtil.create('div', 'info legend');
div.innerHTML = "";
div.id = "info legend"
return div;
};
legend.addTo(map);
map.addLayer(markers);
</script>
</body>
</html>

2
milfs

@ -1 +1 @@
Subproject commit debb238d179a35513955d1c9fde4f0e3c39d416a
Subproject commit d2a1aa3cb2e59e86ba1f09f66fa151651aa2636a

167
yp.php Normal file
View File

@ -0,0 +1,167 @@
<?php
///este archivo debe estar un nivel superior al directorio milfs
session_start();
if(isset($_REQUEST[debug])) {ini_set('display_errors', 'On');}
require ('milfs/xajax/xajax.inc.php');
$xajax = new xajax();
require ('milfs/funciones/funciones.php');
//require ('milfs/funciones/experimentales.php');
//require ('milfs/funciones/convert.php');
require ('milfs/funciones/login.php');
require_once ('milfs/includes/markdown.php');
require ("milfs/funciones/conex.php");
$formulario ="66";
$campo_filtro ="515";
$xajax->processRequests();
$logo = remplacetas('empresa','id','1','imagen') ;
$direccion = remplacetas('empresa','id','1','direccion') ;
$telefono = remplacetas('empresa','id','1','telefono_1') ;
$email = remplacetas('empresa','id','1','email') ;
$razon_social = remplacetas('empresa','id','1','razon_social') ;
$sigla = remplacetas('empresa','id','1','sigla') ;
$facebook = remplacetas('empresa','id','1','facebook') ;
$twitter = remplacetas('empresa','id','1','twitter') ;
$slogan = remplacetas('empresa','id','1','slogan') ;
$web = remplacetas('empresa','id','1','web') ;
$formulario_descripcion = remplacetas('form_id','id',"$formulario",'descripcion',"") ;
$formulario_nombre = remplacetas('form_id','id',"$formulario",'nombre',"") ;
?>
<!DOCTYPE html>
<html lang="en">
<head >
<meta charset="utf-8">
<meta name="viewport" content="user-scalable=no, width=device-width, maximum-scale=1, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="fredyrivera" >
<?php $xajax->printJavascript("milfs/xajax/"); ?>
<link rel="shortcut icon" href="favicon-152.png">
<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous">
<link rel="stylesheet" href="milfs/css/style.css" media="screen" />
<!-- <link href="http://getbootstrap.com/examples/sticky-footer-navbar/sticky-footer-navbar.css" rel="stylesheet"> -->
<!-- <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script> -->
<!-- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" /> -->
<link href="milfs/css/bootstrap.min.css" rel="stylesheet">
<!-- <link href="milfs/css/estilos.php" rel="stylesheet"> -->
<script src="milfs/js/jquery.min.js"></script>
<script src="milfs/js/jquery.timelinr-0.9.54.js"></script>
<style type="text/css">
/*@font-face {
font-family: Brandon_light;
src: url("milfs/patos/fuentes/Brandon_light.otf") format("opentype");
}*/
body{
}
.modal-dialog {
padding: 5px;
border-radius: 3px;
max-width: 700px;
}
.modal-content {
/*height: 100%;*/
border-radius: 5px;;
}
.container-fluid {
/*padding: 0px !important;*/
}
a.pie{
color: white !important;
}
a.menu{
color: white !important;
}
a:active{
color: black !important;
}
</style>
</head>
<body >
<!-- /container -->
<br> <br>
<div class='container'>
<div class='jumbotron'>
<div class='row'>
<div class='col-md-3'>
<img class="img img-responsive" style="width:100%; " src="milfs/images/secure/?file=600/<?php echo $logo[0] ?>" >
</div>
<div class='col-md-9'>
<h1><?php echo $razon_social[0]; ?></h1>
<?php echo "<h2>$formulario_nombre[0] <br><small>$formulario_descripcion[0]<small></h2> "; ?>
</div>
</div>
</div>
<div class='row'>
<div class='col-sm-7 col-md-2' >
<div class='btn btn-success btn-block' onclick ="xajax_mostrar_modal('<?php echo $formulario; ?>','','');"> <i class='fa fa-plus-square'></i> Agregar </a></div>
</div>
<div class='col-sm-7 col-md-5' >
<div class='input-group'>
<span class='input-group-addon'>Filtro <i class='fa fa-filter'></i> </span>
<?php echo portal_filtro_campos_select($formulario,"$campo_filtro","mostrar_resultado","grid"); ?>
</div>
</div>
<?php echo buscar_datos("","$formulario","grid","mostrar_resultado"); ?>
</div>
<br>
<div id ='mostrar_resultado' style=' ' class="container">
</div>
<div class="" style="background-color: black; color:white; ">
<!-- <img class='img img-resposive' src="milfs/patos/images/pie.png" style="width:100%" alt=""> -->
</div>
</div>
</div>
<!-- Modal -->
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div class='modal-dialog modal-lg' style=' ' >
<div class='modal-content' style=' '>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<br>
</div>
<div class='modal-body'>
<div id='muestra_form' class="row"></div>
</div>
</div>
</div>
<!--
<div class='pie' style=" position: fixed;
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
">
</div> -->
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="milfs/js/jquery.min.js"></script> -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<!-- <script src="milfs/js/bootstrap.min.js"></script> -->
<script src="milfs/js/scripts.js"></script>
</body>
</html>