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

Merge branch 'master' of https://code.tupale.co/qwerty/tupali

Browse Source
This commit is contained in:
kleper 2017-03-17 09:40:06 -05:00
commit 8062b66792
6 changed files with 467 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
Mapero.php Normal file
View File

@ -0,0 +1,262 @@
<?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");
//require_once ('includes/markdown.php');
//require ('funciones/convert.php');
$xajax->processRequests();
//if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ;
$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
$id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa') ;
$plantilla ="mapa";
?>
<!DOCTYPE html>
<html lang="en">
<head >
<title><?php echo $formulario_nombre[0] ?> MILFS</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="">
<?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.css"/>
<link rel="stylesheet" href="librerias/leaflet/leaflet-search.css"/>
<script src="librerias/leaflet/leaflet.js"></script>
<script src="https://code.jquery.com/jquery-1.11.3.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">
<style type="text/css">
.navbar-default {
background:rgba(255,255,255,1) ;
}
@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
-------------------------------------------------- */
html {
position: relative;
min-height: 100%;
}
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
padding: 0; margin: 0;
}
/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */
body > .container {
padding: 60px 15px 0;
}
.container .text-muted {
margin: 20px 0;
}
.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;
}
code {
font-size: 80%;
}
.modal-dialog {
width: 70%;
height: 50%;
padding: 0;
}
.modal-content {
height: 50%;
}
</style>
<?php
$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>
<div id="map" style="">
<?php $categorias = lista_categorias($_REQUEST['id'],'','') ;
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;
?>
</div>
<script type="text/javascript">
var map = L.map('map');
//var terrainTiles = L.tileLayer.provider('OpenTopoMap');
//terrainTiles.addTo(map);
map.setView([4, -74.9005222], 5);
function addDataToMap(data, map) {
var dataLayer = L.geoJson(data, {
pointToLayer: function(feature, latlng) {
var smallIcon = new L.Icon({
iconSize: [60, 60],
iconAnchor: [13, 27],
popupAnchor: [1, -24],
iconUrl: feature.properties.icon.iconUrl
});
return L.marker(latlng, {icon: smallIcon});
},
onEachFeature: function(feature, layer) {
var popupText = feature.properties.description
layer.bindPopup(popupText); }
});
map.fitBounds(dataLayer.getBounds());
dataLayer.addTo(map);
}
/* PROVIDERS */
var legend = L.control({position: 'bottomright'});
legend.onAdd = function (map) {
var div = L.DomUtil.create('div', 'info legend');
div.innerHTML = "<?php echo $leyenda; ?> <a class='btn btn-info btn-xs' onclick=\"xajax_contenido_show('div_leyenda'); \"><span class=''>Leyenda</span></a>";
div.id = "info legend"
return div;
};
legend.addTo(map);
var defaultLayer = L.tileLayer.provider('OpenTopoMap').addTo(map);
var baseLayers = {
'Topográfico': defaultLayer,
'OpenStretMap': L.tileLayer.provider('OpenStreetMap.Mapnik') ,
'Blanco y Negro': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
'Humanitario.': L.tileLayer.provider('OpenStreetMap.HOT'),
'Satelital': L.tileLayer.provider('Esri.WorldImagery')
};
var overlayLayers = {
};
var layerControl = L.control.layers(baseLayers, overlayLayers,{collapsed:false}).addTo(map);
// resize layers control to fit into view.
function resizeLayerControl() {
var layerControlHeight = document.body.clientHeight - (10 + 50);
var layerControl = document.getElementsByClassName('leaflet-control-layers-expanded')[0];
layerControl.style.overflowY = 'auto';
layerControl.style.maxHeight = layerControlHeight + 'px';
}
map.on('resize', resizeLayerControl);
resizeLayerControl();
map.addControl( new L.Control.Search({
url: 'https://nominatim.openstreetmap.org/search?format=json&q={s}',
jsonpParam: 'json_callback',
propertyName: 'display_name',
propertyLoc: ['lat','lon'],
markerLocation: true,
autoCollapse: true,
autoType: false,
minLength: 2,
zoom:17
}) );
/* PROVIDERS */
/* $.getJSON("http://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_day.geojson", function(data) { addDataToMap(data, map); });*/
$.getJSON("milfs/geojson.php?id=<?php echo $_REQUEST['id'] ?>&buscar=<?php echo $_REQUEST['buscar'] ?>", function(data) { addDataToMap(data, map); });
</script>
</body>
</html>

3
iconoclasta/funciones/funciones.php
View File

@ -42,6 +42,8 @@ if (cxt1) {
cxt1.beginPath() //iniciar ruta cxt1.beginPath() //iniciar ruta
// #g8 // #g8
cxt1.save(); cxt1.save();
cxt1.transform(50, 0.000000, 0.000000, 50, 30, 30); cxt1.transform(50, 0.000000, 0.000000, 50, 30, 30);
@ -97,6 +99,7 @@ cxt1.beginPath() //iniciar ruta
cxt1.restore(); cxt1.restore();
cxt1.restore(); cxt1.restore();
}} }}

277
mapero.php
View File

@ -9,36 +9,56 @@ require ("milfs/funciones/conex.php");
//require ('funciones/convert.php'); //require ('funciones/convert.php');
$xajax->processRequests(); $xajax->processRequests();
//if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];} //if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
if(isset($_REQUEST[categoria]) AND isset($_REQUEST[buscar])) {
$_REQUEST[buscar] = "$_REQUEST[categoria]:$_REQUEST[buscar]";
}
$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ; $formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ;
$formulario_descripcion = remplacetas('form_id','id',$_REQUEST[id],'descripcion') ;
$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ; $agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
$id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa') ; $id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa') ;
$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");
$plantilla ="mapa"; $plantilla ="mapa";
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head > <head >
<title><?php echo $formulario_nombre[0] ?> MILFS</title> <title><?php echo $formulario_nombre[0] ?> MILFS</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="user-scalable=no, width=device-width, maximum-scale=1, initial-scale=1"> <!-- <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 http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
<meta name="description" content=""> <meta name="description" content="">
<?php $xajax->printJavascript("milfs/xajax/"); ?> <?php $xajax->printJavascript("milfs/xajax/"); ?>
<link rel="shortcut icon" href="favicon-152.png"> <link rel="shortcut icon" href="favicon-152.png">
<link rel="apple-touch-icon-precomposed" href="favicon-152.png"> <link rel="apple-touch-icon-precomposed" href="favicon-152.png">
<link rel="stylesheet" href="librerias/leaflet/leaflet.css"/>
<link rel="stylesheet" href="librerias/leaflet/leaflet-search.css"/> <link rel="stylesheet" href="librerias/leaflet/leaflet-search.css"/>
<script src="librerias/leaflet/leaflet.js"></script> <script src="librerias/leaflet/leaflet.js"></script>
<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script> <script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
<script src="librerias/leaflet/leaflet-providers.js"></script> <script src="librerias/leaflet/leaflet-providers.js"></script>
<script src="librerias/leaflet/leaflet-search.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" type="text/css" media="screen" href="milfs/css/bootstrap.css">
<style type="text/css">
.navbar-default {
background:rgba(255,255,255,1) ;
}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.3/leaflet.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.3/leaflet.js"></script>
<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'] ?>"></script>
<style type="text/css">
@media (max-width: 800px) { @media (max-width: 800px) {
.panel-map{ .panel-map{
max-width: 970px; max-width: 970px;
@ -58,28 +78,9 @@ background:rgba(255,255,255,1) ;
#map { position:absolute; top:0; bottom:0; width:100%; } #map { position:absolute; top:0; bottom:0; width:100%; }
/* Sticky footer styles /* Sticky footer styles
-------------------------------------------------- */ -------------------------------------------------- */
html {
position: relative;
min-height: 100%;
}
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
padding: 0; margin: 0;
}
/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */
body > .container {
padding: 60px 15px 0;
}
.container .text-muted {
margin: 20px 0;
}
.footer { .footer {
position: absolute; position: absolute;
@ -106,9 +107,7 @@ body > .container {
} }
code {
font-size: 80%;
}
.modal-dialog { .modal-dialog {
width: 70%; width: 70%;
height: 50%; height: 50%;
@ -118,8 +117,23 @@ code {
.modal-content { .modal-content {
height: 50%; 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> </style>
<?php <?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]'") ; $css_adicional = remplacetas('form_parametrizacion','campo',"index",'descripcion'," tabla='css' and opcion = 'adicional' and id_empresa = '$id_empresa[0]'") ;
if($css_adicional[0] !="") { if($css_adicional[0] !="") {
@ -134,10 +148,64 @@ code {
echo $css_adicional; ?> echo $css_adicional; ?>
</head> </head>
<body> <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 id="map" style=""> <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>
<?php $categorias = lista_categorias($_REQUEST['id'],'','') ;
<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 !="") { if($categorias !="") {
$pie=" $pie="
<div style='' class='' id='contenedor_pie' > <div style='' class='' id='contenedor_pie' >
@ -154,16 +222,73 @@ $leyenda ="<div id='div_leyenda'><a class='btn btn-default btn-xs' onclick=xaja
} }
//echo $pie; //echo $pie;
?> ?>
</div>
<script type="text/javascript"> <script type="text/javascript">
var map = L.map('map'); function htmlbodyHeightUpdate(){
//var terrainTiles = L.tileLayer.provider('OpenTopoMap'); var height3 = $( window ).height()
//terrainTiles.addTo(map); var height1 = $('.nav').height()+50
map.setView([4, -74.9005222], 5); 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 tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
maxZoom: 18,
attribution: '&copy; <a href="http://osm.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, {
function addDataToMap(data, map) {
var dataLayer = L.geoJson(data, {
pointToLayer: function(feature, latlng) { pointToLayer: function(feature, latlng) {
var smallIcon = new L.Icon({ var smallIcon = new L.Icon({
iconSize: [60, 60], iconSize: [60, 60],
@ -174,26 +299,35 @@ function addDataToMap(data, map) {
}); });
return L.marker(latlng, {icon: smallIcon}); return L.marker(latlng, {icon: smallIcon});
}, },
onEachFeature: function(feature, layer) { onEachFeature: function(feature, layer) {
var popupText = feature.properties.description var popupText = feature.properties.description
layer.bindPopup(popupText); } layer.bindPopup(popupText); }
}); });
map.fitBounds(dataLayer.getBounds());
dataLayer.addTo(map);
}
/* PROVIDERS */
var markers = L.markerClusterGroup();
markers.addLayer(geojson);
map.fitBounds(geojson.getBounds());
var legend = L.control({position: 'bottomright'}); var legend = L.control({position: 'bottomright'});
//disable zoomControl when initializing map (which is topleft by default)
//add zoom control with your options
L.control.zoom({
position:'topright'
}).addTo(map);
legend.onAdd = function (map) { legend.onAdd = function (map) {
var div = L.DomUtil.create('div', 'info legend'); var div = L.DomUtil.create('div', 'info legend');
div.innerHTML = "<?php echo $leyenda; ?> <a class='btn btn-info btn-xs' onclick=\"xajax_contenido_show('div_leyenda'); \"><span class=''>Leyenda</span></a>"; div.innerHTML = "";
div.id = "info legend" div.id = "info legend"
@ -202,61 +336,8 @@ var legend = L.control({position: 'bottomright'});
legend.addTo(map); legend.addTo(map);
var defaultLayer = L.tileLayer.provider('OpenTopoMap').addTo(map); map.addLayer(markers);
var baseLayers = {
'Topográfico': defaultLayer,
'OpenStretMap': L.tileLayer.provider('OpenStreetMap.Mapnik') ,
'Blanco y Negro': L.tileLayer.provider('OpenStreetMap.BlackAndWhite'),
'Humanitario.': L.tileLayer.provider('OpenStreetMap.HOT'),
'Satelital': L.tileLayer.provider('Esri.WorldImagery')
};
var overlayLayers = {
};
var layerControl = L.control.layers(baseLayers, overlayLayers,{collapsed:false}).addTo(map);
// resize layers control to fit into view.
function resizeLayerControl() {
var layerControlHeight = document.body.clientHeight - (10 + 50);
var layerControl = document.getElementsByClassName('leaflet-control-layers-expanded')[0];
layerControl.style.overflowY = 'auto';
layerControl.style.maxHeight = layerControlHeight + 'px';
}
map.on('resize', resizeLayerControl);
resizeLayerControl();
map.addControl( new L.Control.Search({
url: 'https://nominatim.openstreetmap.org/search?format=json&q={s}',
jsonpParam: 'json_callback',
propertyName: 'display_name',
propertyLoc: ['lat','lon'],
markerLocation: true,
autoCollapse: true,
autoType: false,
minLength: 2,
zoom:17
}) );
/* PROVIDERS */
/* $.getJSON("http://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_day.geojson", function(data) { addDataToMap(data, map); });*/
$.getJSON("milfs/geojson.php?id=<?php echo $_REQUEST['id'] ?>&buscar=<?php echo $_REQUEST['buscar'] ?>", function(data) { addDataToMap(data, map); });
</script> </script>
</body> </body>
</html> </html>

18
metafisico.php
View File

@ -373,7 +373,7 @@ $css_adicional = remplacetas('form_parametrizacion','campo',"index",'descripcion
$uri = trim($_SESSION['site'], '/').$_SERVER['REQUEST_URI']; $uri = trim($_SESSION['site'], '/').$_SERVER['REQUEST_URI'];
$slogan_texto = strip_tags($slogan[0]);
?> ?>
<meta NAME="Language" CONTENT="Spanish"> <meta NAME="Language" CONTENT="Spanish">
<meta NAME="Revisit" CONTENT="1 days"> <meta NAME="Revisit" CONTENT="1 days">
@ -399,7 +399,7 @@ $uri = trim($_SESSION['site'], '/').$_SERVER['REQUEST_URI'];
<link rel='icon' sizes='192x192' href='<?php echo "milfs/images/secure/?file=150/$logo[0]"; ?>'> <link rel='icon' sizes='192x192' href='<?php echo "milfs/images/secure/?file=150/$logo[0]"; ?>'>
<link rel="apple-touch-icon-precomposed" href="<?php echo "milfs/images/secure/?file=150/$logo[0]"; ?>"> <link rel="apple-touch-icon-precomposed" href="<?php echo "milfs/images/secure/?file=150/$logo[0]"; ?>">
<title><?php echo @$titulo[0]; ?> <?php echo strip_tags($slogan[0]); ?> Tupale.co </title> <title><?php echo @$titulo[0]; ?> <?php echo strip_tags($slogan[0]); ?> // Tupale.co </title>
<?php $xajax->printJavascript("milfs/xajax/"); <?php $xajax->printJavascript("milfs/xajax/");
//$xajax->debugOn(); //$xajax->debugOn();
@ -617,6 +617,7 @@ $barra_back="
</ul> </ul>
"; ";
if(isset($_SESSION['id'])) {$id_empresa_portada='1'; $panel_aplicaciones= panel_aplicaciones('1',"$_SESSION[id_empresa]","");;}
$barra =" $barra ="
<nav class='navbar navbar-inverse navbar-fixed-top'> <nav class='navbar navbar-inverse navbar-fixed-top'>
<div class='container navegacion'> <div class='container navegacion'>
@ -628,9 +629,10 @@ $barra ="
<span class='icon-bar'></span> <span class='icon-bar'></span>
</button> </button>
<a class='navbar-brand' href='#'> <a class='navbar-brand' href='#'>
<img src='temas/landingpage/images/logo.png' alt='Tupale.co'> <img src='milfs/images/secure/?file=600/$logo[0]' alt='Tupale.co $slogan_texto'>
</a> </a>
</div> </div>
<div id='navbar' class='navbar-collapse collapse'> <div id='navbar' class='navbar-collapse collapse'>
<ul class='nav navbar-nav'> <ul class='nav navbar-nav'>
@ -661,8 +663,9 @@ $barra ="
<br><br> <br><br>
<section class='container-fluid' id='home'> <section class='container-fluid' id='home'>
<div class='container'> <div class='container'>
<div class='panel_aplicaciones text-center'>$panel_aplicaciones</div>
<div class='col-sm-8 col-sm-offset-2 text-center'> <div class='col-sm-8 col-sm-offset-2 text-center'>
<h2>Plataforma local que nos conecta al movimiento global de datos abiertos</h2> <h2 id='slogan'>$descripcion[0]</h2>
</div> </div>
<div class='row'> <div class='row'>
<div class='col-sm-4'> <div class='col-sm-4'>
@ -685,6 +688,7 @@ $barra ="
<div class='row'><br></div> <div class='row'><br></div>
</div><!--/container--> </div><!--/container-->
</section> </section>
"; ";
$menu_lateral_back = " $menu_lateral_back = "
@ -789,7 +793,7 @@ document.oncopy = addLink;
}else{ }else{
echo " " ; echo " " ;
} }
if(isset($_SESSION['id'])) {$id_empresa_portada='1'; echo panel_aplicaciones('1',"$_SESSION[id_empresa]",""); }
if( $embebido =="1" ){ /* SI SE SOLICITA UN EMBEBIDO SE MUESTRA ESTO */ if( $embebido =="1" ){ /* SI SE SOLICITA UN EMBEBIDO SE MUESTRA ESTO */
@ -850,7 +854,7 @@ document.oncopy = addLink;
<div class="row"> <div class="row">
<div class='pull-right'> <!-- <div class='pull-right'>
<a href="#" class="js-fh5co-nav-toggle fh5co-nav-toggle"><i></i></a> <a href="#" class="js-fh5co-nav-toggle fh5co-nav-toggle"><i></i></a>
<ul class="fh5co-social list-inline intro-social-buttons "> <ul class="fh5co-social list-inline intro-social-buttons ">
@ -859,7 +863,7 @@ document.oncopy = addLink;
<li><?php echo milfs_session("$login_formulario","$login_campo_usuario","$login_campo_password","boton",""); ?></li> <li><?php echo milfs_session("$login_formulario","$login_campo_usuario","$login_campo_password","boton",""); ?></li>
</ul> </ul>
-->
</div> </div>
<div id='meta_cabecera' class="col-lg-12 col-md-12 "> <div id='meta_cabecera' class="col-lg-12 col-md-12 ">

2
milfs/funciones/funciones.php
View File

@ -12736,7 +12736,7 @@ Esta herramienta es creada y proporcionada por Tupale.co, como portal para el ac
}else{ }else{
$mensaje =" $mensaje ="
<div class='alert alert-success text-center'><h1><i class='glyphicon glyphicon-smile-o'></i><small> Todo bien pero al parecer no se modificaron registros $debug </small></h1></div>"; <div class='alert alert-success text-center'><h1><i class='glyphicon glyphicon-smile-o'></i><small> Todo bien pero al parecer no se modificaron registros </small></h1></div>";
$respuesta->addAssign("div_$control","innerHTML","$mensaje"); $respuesta->addAssign("div_$control","innerHTML","$mensaje");
} }
//$respuesta->addAssign("respuesta_$control","innerHTML","$resultado"); //$respuesta->addAssign("respuesta_$control","innerHTML","$resultado");

3
temas/landingpage/css/landingpage.css
View File

@ -29,7 +29,10 @@ h1, h2, h3, h4, h5, h6 {
line-height: 1.1; line-height: 1.1;
color: inherit; color: inherit;
} }
.panel_aplicaciones{
padding-top: 20px;
}
p{ p{
margin: 0 0 10px; margin: 0 0 10px;