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-07 08:53:27 -05:00
commit 76185a86c2
6 changed files with 551 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@ -466,7 +466,8 @@ legend.legend-area {
}
else {
$tema= "magazine";
// $tema= "magazine";
$tema ="";
$css ='
<!-- incluir tema bootstrap por defecto -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css?'.time().'" integrity="sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous" >';

385
librerias/leaflet/css/sidebar.css Normal file
View File

@ -0,0 +1,385 @@
/* Adding gvnix styles css - NO COPIAR */
/* @import 'http://geo-gvnix.rhcloud.com/resources/styles/standard.css';*/
/* Custom fixed navs */
.sidebar-logo{
padding: 20px;
margin: 0px auto;
text-align:center;
}
h1{
font-size: 20px; !important;
}
h2{
font-size: 16px; !important;
}
header.navbar+nav.navbar{
/* margin-top: 20px;same margin-bottom .navbar */
}
.navbar.navbar-default.navbar-fixed-top{
margin-top: 50px;
}
.sidebar.navbar-fixed-top{
margin-top: 100px;
}
@media (min-width: 768px) and (max-width: 998px){
.navbar.navbar-default.navbar-fixed-top{
margin-top: 100px;
}
.sidebar.navbar-fixed-top{
margin-top: 150px;
}
}
/* Custom navbar default: global*/
.navbar.navbar-default{
background-color: #f8f8f8;
border-color: #e7e7e7;
margin: 0;
border-radius: 0;
}
.navbar.navbar-default .navbar-brand {
color: #666;
text-shadow: none;
min-width: 150px;
}
.navbar.navbar-default .navbar-nav > li > a {
color: #666;
text-shadow: none;
}
.navbar.navbar-default .navbar-nav > li > a {
color: #666;
text-shadow: none;
}
.navbar.navbar-default .navbar-nav > li > a:hover{
color: #acc47f;
}
.navbar.navbar-default .navbar-nav > .active > a{
color: #fff;
background-color: #acc47f;
}
.navbar.navbar-default .navbar-nav > .active > a:hover{
color: #608224;
background-color: #acc47f;
}
.navbar.navbar-default .caret {
border-top-color: #ccc;
border-bottom-color: #ccc;
}
.navbar.navbar-default .caret:hover {
border-top-color: #333;
border-bottom-color: #333;
}
/* Custom sidebar menu */
/*Remove rounded coners*/
nav.sidebar.navbar {
border-radius: 0px;
}
nav.sidebar, .main{
-webkit-transition: margin 200ms ease-out;
-moz-transition: margin 200ms ease-out;
-o-transition: margin 200ms ease-out;
transition: margin 200ms ease-out;
}
/* Add gap to nav and right windows.*/
.main{
padding: 10px 10px 0 10px;
}
/* .....NavBar: Icon only with coloring/layout.....*/
/*small/medium side display*/
@media (min-width: 768px) {
/*Allow main to be next to Nav*/
.main{
position: absolute;
width: calc(100% - 40px); /*keeps 100% minus nav size*/
margin-left: 40px;
float: right;
}
/*lets nav bar to be showed on mouseover*/
nav.sidebar:hover + .main{
margin-left: 200px;
}
/*Center Brand*/
nav.sidebar.navbar.sidebar>.container .navbar-brand, .navbar>.container-fluid .navbar-brand {
margin-left: 0px;
}
/*Center Brand*/
nav.sidebar .navbar-brand, nav.sidebar .navbar-header{
text-align: center;
width: 100%;
margin-left: 0px;
}
/*Center Icons*/
nav.sidebar a{
padding-right: 13px;
min-width: 100px;
}
/*custom sidebar nav*/
nav.sidebar ul.nav.navbar-nav{
margin: 0;
}
nav.sidebar.navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
color: white;
}
/*adds border top to first nav box */
nav.sidebar .navbar-nav > li:first-child{
border-top: 1px #e5e5e5 solid;
}
/*adds border to bottom nav boxes*/
nav.sidebar .navbar-nav > li{
border-bottom: 1px #e5e5e5 solid;
}
/*adds background on hover*/
nav.sidebar .navbar-nav > li:hover{
color: #fff;
background-color: #43600E;
}
/*removes border last element*/
nav.sidebar .navbar-nav > li.last{
border-bottom: none;
}
/* Colors/style dropdown box*/
nav.sidebar .navbar-nav .open .dropdown-menu {
position: static;
float: none;
width: auto;
margin-top: 0;
background-color: transparent;
border: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
/*allows nav box to use 100% width*/
nav.sidebar .navbar-collapse, nav.sidebar .container-fluid{
padding: 0 0px 0 0px;
}
/*colors dropdown box text */
.navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
color: #777;
}
/*O quanto o menu irá esconder á esquerda*/
/*gives sidebar width/height*/
nav.sidebar{
width: 200px;
height: 100%;
margin-left: -270px;
float: left;
z-index: 8000;
margin-bottom: 0px;
}
/*give sidebar 100% width;*/
nav.sidebar li {
width: 100%;
}
/* Move nav to full on mouse over*/
nav.sidebar:hover{
margin-left: 0px;
}
/*for hiden things when navbar hidden*/
.forAnimate{
opacity: 0;
}
}
/* .....NavBar: Fully showing nav bar..... */
@media (min-width: 1330px) {
/* Allow main to be next to Nav
.main{
width: calc(100% - 200px); keeps 100% minus nav size
margin-left: 200px;
}
Show all nav
nav.sidebar{
margin-left: 0px;
float: left;
}
Show hidden items on nav
nav.sidebar .forAnimate{
opacity: 1;
} */
}
nav.sidebar .navbar-nav .open .dropdown-menu>li>a:hover, nav.sidebar .navbar-nav .open .dropdown-menu>li>a:focus {
color: #CCC;
background-color: transparent;
}
nav:hover .forAnimate{
opacity: 1;
}
/*---- FIM SLIDE MENU*/
.nav-side-menu {
overflow: auto;
font-family: verdana;
font-size: 12px;
font-weight: 200;
background-color: #2e353d;
position: fixed;
top: 0px;
width: 300px;
height: 100%;
color: #e1ffff;
}
.nav-side-menu .brand {
background-color: #23282e;
line-height: 50px;
display: block;
text-align: center;
font-size: 14px;
}
.nav-side-menu .toggle-btn {
display: none;
}
.nav-side-menu ul,
.nav-side-menu li {
list-style: none;
padding: 0px;
margin: 0px;
line-height: 35px;
cursor: pointer;
/*
.collapsed{
.arrow:before{
font-family: FontAwesome;
content: "\f053";
display: inline-block;
padding-left:10px;
padding-right: 10px;
vertical-align: middle;
float:right;
}
}
*/
}
.nav-side-menu ul :not(collapsed) .arrow:before,
.nav-side-menu li :not(collapsed) .arrow:before {
font-family: FontAwesome;
content: "\f078";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
float: right;
}
.nav-side-menu ul .active,
.nav-side-menu li .active {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
}
.nav-side-menu ul .sub-menu li.active,
.nav-side-menu li .sub-menu li.active {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li.active a,
.nav-side-menu li .sub-menu li.active a {
color: #d19b3d;
}
.nav-side-menu ul .sub-menu li,
.nav-side-menu li .sub-menu li {
background-color: #181c20;
border: none;
line-height: 28px;
border-bottom: 1px solid #23282e;
margin-left: 0px;
}
.nav-side-menu ul .sub-menu li:hover,
.nav-side-menu li .sub-menu li:hover {
background-color: #020203;
}
.nav-side-menu ul .sub-menu li:before,
.nav-side-menu li .sub-menu li:before {
font-family: FontAwesome;
content: "\f105";
display: inline-block;
padding-left: 10px;
padding-right: 10px;
vertical-align: middle;
}
.nav-side-menu li {
padding-left: 0px;
border-left: 3px solid #2e353d;
border-bottom: 1px solid #23282e;
}
.nav-side-menu li a {
text-decoration: none;
color: #e1ffff;
}
.nav-side-menu li a i {
padding-left: 10px;
width: 20px;
padding-right: 20px;
}
.nav-side-menu li:hover {
border-left: 3px solid #d19b3d;
background-color: #4f5b69;
-webkit-transition: all 1s ease;
-moz-transition: all 1s ease;
-o-transition: all 1s ease;
-ms-transition: all 1s ease;
transition: all 1s ease;
}
@media (max-width: 767px) {
.nav-side-menu {
position: relative;
width: 100%;
margin-bottom: 10px;
}
.nav-side-menu .toggle-btn {
display: block;
cursor: pointer;
position: absolute;
right: 10px;
top: 10px;
z-index: 10 !important;
padding: 3px;
background-color: #ffffff;
color: #000;
width: 40px;
text-align: center;
}
.brand {
text-align: left !important;
font-size: 22px;
padding-left: 20px;
line-height: 50px !important;
}
}
@media (min-width: 767px) {
.nav-side-menu .menu-list .menu-content {
display: block;
}
}
body {
margin: 0px;
padding: 0px;
}

6
metafisico.php
View File

@ -18,9 +18,11 @@ if(isset($_REQUEST['debug'])) {ini_set('display_errors', 'On');}
<meta http-equiv="Cache-control" content="public">
<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="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=590">
<!-- Chrome, Firefox OS y Opera -->

25
milfs/funciones/funciones.php
View File

@ -3185,8 +3185,9 @@ if (mysqli_num_rows($sql)!='0'){
mysqli_data_seek($sql, 0);
$fila=1;
$divider=6;
$divider=3;
$cols = (12/$divider);
$sm = 4;
$i =0;
while( $row = mysqli_fetch_array( $sql ) ) {
if($i % $divider==0) {
@ -3203,7 +3204,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
// $slogan= substr($row[slogan],0, $length = 100)."";
$slogan = $row['slogan'];
$contenido ="
<div class='proyecto col-md-$cols' title=''>
<div class='proyecto col-md-$cols col-sm-$cols' title=''>
<div class='div_proyecto'>
<a href='e$row[id_empresa]' data-toggle='modal' data-target='#myModal'>
<div class='proyecto_titulo' style='
@ -3231,7 +3232,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
<p class='lead'>Conoce los proyectos que usan Tupale.co para la implementación de sus herramientas, selecciona para conocer más</p>
</div>
<div class='container-fluid'>
<div class='col-sm-10 col-sm-offset-1'>
<div class='col-sm-8 col-sm-offset-2'>
$encontrados
<!-- Modal para contenido de paso colombia-->
<div class='modal fade' id='myModal' tabindex='-1' role='dialog' aria-labelledby='myModalLabel'>
@ -5060,7 +5061,9 @@ $consulta = "
$sql=mysqli_query($link,$consulta);
if (mysqli_num_rows($sql)!='0'){
$resultado = "<div class='' style='vertical-align: top; text-align:center;'>";
$resultado = "<ul class='list-group'>
";
while( $row = mysqli_fetch_array( $sql ) ) {
$icono = remplacetas('form_parametrizacion','campo',$perfil,'descripcion'," tabla='form_id' and opcion = 'categoria:icon:$row[md5_contenido]'") ;
@ -5071,10 +5074,18 @@ while( $row = mysqli_fetch_array( $sql ) ) {
$icon = $icono[0];
}
$icono = "$icon";
$contenido= substr($row[contenido],0, $length = 15);
$resultado .= "<div class='' style='width:50px; heigth:100px; float:left; vertical-align: top; margin: 5px; text-align:center'><a href='?id=$perfil&buscar=$categoria_campo:$contenido'><img style=' height:50px;' class='' src='$icono' style=''></a><small>$contenido</small></div>";
$contenido= html_entity_decode($row[contenido]);
$resultadox .= "
<div class='' style='width:50px; heigth:100px; float:left; vertical-align: top; margin: 5px; text-align:center'>
<a href='?id=$perfil&buscar=$categoria_campo:$contenido'>
<img style=' height:50px;' class='' src='$icono' style=''>
</a>
<small>$contenido</small>
</div>";
$resultado .="<li class='list-group'><a href='?id=$perfil&buscar=$categoria_campo:$contenido'><img style=' height:50px;' class='' src='$icono' style=''> $contenido</a></li>";
}
$resultado .= " </div >";
$resultado .= " </ul >";
}
else{$resultado = '';}
}

168
nomapa.php
View File

@ -10,8 +10,11 @@ require ("milfs/funciones/conex.php");
$xajax->processRequests();
//if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
$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') ;
$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','') ;
$plantilla ="mapa";
?>
<!DOCTYPE html>
@ -19,9 +22,9 @@ $plantilla ="mapa";
<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 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="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">
@ -32,8 +35,8 @@ $plantilla ="mapa";
<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">
<link rel="stylesheet" type="text/css" media="screen" href="milfs/css/bootstrap.css">
@ -48,12 +51,9 @@ $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'] ?>"></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) ;
}
<style type="text/css">
@media (max-width: 800px) {
.panel-map{
max-width: 970px;
@ -73,28 +73,9 @@ background:rgba(255,255,255,1) ;
#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;
@ -121,9 +102,7 @@ body > .container {
}
code {
font-size: 80%;
}
.modal-dialog {
width: 70%;
height: 50%;
@ -133,8 +112,23 @@ code {
.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] !="") {
@ -149,9 +143,54 @@ code {
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>
<div class='input-group '>
<input type='text' id='buscador_campos' class='form-control' placeholder='Buscador de campos' onkeyup = \" xajax_campos_tabla(document.getElementById('filtro_campos').value,'div_tabla_campos','','',(this.value));\" >
<span class='input-group-addon' id='basic-addon2'><i class='glyphicon glyphicon-search'></i></span>
</div><br>
<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 $categorias = lista_categorias($_REQUEST['id'],'','') ;
<?php
if($categorias !="") {
$pie="
<div style='' class='' id='contenedor_pie' >
@ -171,14 +210,66 @@ $leyenda ="<div id='div_leyenda'><a class='btn btn-default btn-xs' onclick=xaja
<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 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]});
var map = L.map('map', {center: latlng, zoom: 5, layers: [tiles],zoomControl: false});
var geojson = L.geoJson(geojsonSample, {
@ -207,14 +298,21 @@ onEachFeature: function(feature, layer) {
var markers = L.markerClusterGroup();
markers.addLayer(geojson);
map.fitBounds(geojson.getBounds());
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) {
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"

9
temas/landingpage/css/landingpage.css
View File

@ -164,12 +164,21 @@ transition: all 0.3s ease;
.img-gris{
<<<<<<< HEAD
-webkit-filter: grayscale(100%) blur(3px) ;
max-height: 200px;
max-width: 200px;
z-index:10;
transition:filter 0.2s;
-webkit-transition:-webkit-filter 1s;
=======
-webkit-filter: grayscale(100%) blur(3px) ;
height: 200px;
width: 200px;
z-index:10;
transition:filter 0.2s;
-webkit-transition:-webkit-filter 1s;
>>>>>>> 4e304354f68bfb9c6ff10bfa59215a36ea9a90ff
}
.img-gris:hover{
filter: grayscale(0);