From 21a95124598d34265a2b77566b816e675b5222e0 Mon Sep 17 00:00:00 2001
From: humano <fredyrivera@gmail.com>
Date: Tue, 28 Oct 2014 18:57:03 -0500
Subject: [PATCH] cambio de mapa en la visualizacion

---
 milfs/funciones/funciones.php | 12 ++++++++----
 milfs/index.php               | 34 ++++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/milfs/funciones/funciones.php b/milfs/funciones/funciones.php
index a2dbb8a..21c32c4 100644
--- a/milfs/funciones/funciones.php
+++ b/milfs/funciones/funciones.php
@@ -48,7 +48,7 @@ function json($datos){
 //return $datos[control];
 
 	mysql_query("SET NAMES 'UTF8'");
-	$sql = mysql_query($consulta,$link) or die("error al ejecutar consulta $consulta ");
+	$sql = mysql_query($consulta,$link) or die("error al ejecutar consulta ");
  if (mysql_num_rows($sql)!='0'){
 	$id = 1;
 	$features = array();
@@ -830,7 +830,7 @@ $xajax->registerFunction("editar_campo");
 
 
 function formulario_imprimir($id,$control,$tipo) {
-require ('includes/markdown.php');
+require_once ('includes/markdown.php');
 	$id = mysql_seguridad($id);
 		$publico = remplacetas('form_id','id',$id,'publico') ;
 		if($publico[0] != "1" and (!isset ( $_SESSION[id]) )) {
@@ -895,7 +895,9 @@ if (mysql_num_rows($sql)!='0'){
 														$lon = $campos[1];
 														$zoom = $campos[2];			
 			$contenido = "
-			<img class='img-thumbnail '  src='http://dev.openstreetmap.de/staticmap/staticmap.php?center=$lon,$lat&zoom=$zoom&size=350x150&maptype=mapnik&markers=$lon,$lat,red-pushpin' >"; 
+
+			<img class='img-thumbnail '  src='http://api.tiles.mapbox.com/v4/examples.map-zr0njcqy/url-http%3A%2F%2Fqwerty.co%2Fdemo%2Fimages%2Fpin.png($lat,$lon,$zoom)/$lat,$lon,$zoom/350x150.png?access_token=pk.eyJ1IjoiaHVtYW5vIiwiYSI6IlgyRTFNdFEifQ.OmQBXmcVg_zq-vMpr8P5vQ' >
+			"; 
 										}
 			}
 		elseif($campo_tipo=='4'){ $contenido = "<a href='$contenido'>$contenido</a>";}
@@ -1346,7 +1348,9 @@ $td .= "<td>$imagen</td>";
 														$lat = $campos[0];
 														$lon = $campos[1];
 														$zoom = $campos[2];			
-			$contenido = "<img class='img-round'  src='http://dev.openstreetmap.de/staticmap/staticmap.php?center=$lon,$lat&zoom=$zoom&size=350x100&maptype=mapnik&markers=$lon,$lat,red-pushpin' >";
+			$contenido = "
+			<!-- <img class='img-round'  src='http://dev.openstreetmap.de/staticmap/staticmap.php?center=$lon,$lat&zoom=$zoom&size=350x100&maptype=mapnik&markers=$lon,$lat,red-pushpin' > -->
+						<img class='img-round '  src='http://api.tiles.mapbox.com/v4/examples.map-zr0njcqy/url-http%3A%2F%2Fqwerty.co%2Fdemo%2Fimages%2Fpin.png($lat,$lon,$zoom)/$lat,$lon,$zoom/350x100.png?access_token=pk.eyJ1IjoiaHVtYW5vIiwiYSI6IlgyRTFNdFEifQ.OmQBXmcVg_zq-vMpr8P5vQ' >";
 											} else { $contenido ='';}
 			}
 			}
diff --git a/milfs/index.php b/milfs/index.php
index 43474ed..4a3f91e 100755
--- a/milfs/index.php
+++ b/milfs/index.php
@@ -6,6 +6,7 @@ $xajax = new xajax();
 require ('funciones/funciones.php');
 require ('funciones/convert.php');
 require ('funciones/login.php');
+
 $xajax->processRequests(); 
 //$xajax->debugOn();
 ?>
@@ -19,11 +20,18 @@ $xajax->processRequests();
     <meta name="description" content="">
     <meta name="author" content="fredyrivera" >
      <?php $xajax->printJavascript("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 href="css/font-awesome/css/font-awesome.css" rel="stylesheet">
- <link href="http://getbootstrap.com/examples/sticky-footer-navbar/sticky-footer-navbar.css" rel="stylesheet">
-<link href="css/estilos.php?d" rel="stylesheet">
+<!-- 	<link href="css/estilos.php?dd" rel="stylesheet">
+	<link href="css/bootstrap.min.css" rel="stylesheet">
+	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
+	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
+	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css"> -->
+	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
+	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
+	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css">
+
 
 <style>
   #map {width: 500px;height:200px;}
@@ -34,7 +42,7 @@ $xajax->processRequests();
     <title>I<3MILFS</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
+    
 <!--     <script language="JavaScript" src="escritorio/librerias/scripts.js" type="text/javascript"></script> -->
     <!-- Custom styles for this template -->
     
@@ -146,7 +154,7 @@ if($_REQUEST[id] !=''){$onload ="<script type=\"text/javascript\"> xajax_formula
         <h4 class='modal-title' id='myModalLabel_info'><div id='titulo_modal'></div></h4>
       </div>
       <div class='modal-body'>
-      
+
        <div id='muestra_form'></div>
       </div>
       <div class='modal-footer' id='pie_modal'>
@@ -170,9 +178,19 @@ if($_REQUEST[id] !=''){$onload ="<script type=\"text/javascript\"> xajax_formula
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-     <script src="js/jquery.min.js"></script> 
-    <script src="js/bootstrap.min.js"></script>
+      <script src="js/jquery.min.js"></script>
+  <script src="js/bootstrap.js"></script>
+  <script src="js/markdown.js"></script>
+  <script src="js/to-markdown.js"></script>
+  <script src="js/bootstrap-markdown.js"></script>
+      <script src="js/scripts.js"></script>
+<!-- <script src="js/jquery.min.js"></script> 
+<script src="js/bootstrap.min.js"></script>
     <script src="js/scripts.js"></script>
-
+<script src="js/bootstrap-markdown.js"></script>
+<script src="js/markdown.js"></script>
+<script src="js/to-markdown.js"></script>
+<script src="js/bootstrap-markdown.js"></script>
+ -->
 </body>
 </html>
\ No newline at end of file