From bc2c50b1fcade7a67955030fd45bfd918b0f26c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20=C3=81lvarez=20Medina?= <xavijam@gmail.com>
Date: Thu, 17 Feb 2011 15:32:01 +0100
Subject: [PATCH] mushup and bugs fixed

---
 .../admin/others/activity_indicator.gif       | Bin 0 -> 1737 bytes
 public/images/admin/others/close.png          | Bin 0 -> 762 bytes
 public/images/admin/others/corners_mashup.png | Bin 0 -> 340 bytes
 public/images/admin/others/infowindow.png     | Bin 0 -> 3018 bytes
 public/images/admin/others/logo_mashup.png    | Bin 0 -> 3079 bytes
 public/images/admin/others/marker.png         | Bin 0 -> 1176 bytes
 public/prototypes/mashup.html                 | 235 ++++++++++++++++++
 7 files changed, 235 insertions(+)
 create mode 100644 public/images/admin/others/activity_indicator.gif
 create mode 100644 public/images/admin/others/close.png
 create mode 100644 public/images/admin/others/corners_mashup.png
 create mode 100644 public/images/admin/others/infowindow.png
 create mode 100644 public/images/admin/others/logo_mashup.png
 create mode 100644 public/images/admin/others/marker.png
 create mode 100644 public/prototypes/mashup.html

diff --git a/public/images/admin/others/activity_indicator.gif b/public/images/admin/others/activity_indicator.gif
new file mode 100644
index 0000000000000000000000000000000000000000..08fca6b68f35c50573cfc876729e274e6fe54174
GIT binary patch
literal 1737
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

literal 0
HcmV?d00001

diff --git a/public/images/admin/others/close.png b/public/images/admin/others/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d0bf175c5fc8cc881da8838f976f4a567932fa9
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq000#L001fo1^@s6Tssi%00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5FEKYS
zF)=_}BfS6s0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0#ivu
zK~zYI<&~jw>Od5RKbTGwnTl07)VeA#Wh$aTv?v@8K&KY^0C@p;fJ`+nkX#?pp(ZF4
zQ7BNEp;HVodqo>21eyfMRrhzhIp^E6dp7$+OiHOorIe$T+NgZm{KP+UN=m7>oS@(I
zRy6PcTvFeqJJAC3`JCBoMi_=CcNCYVY1Hd=?(Xj5(@!_ROC0#|@sSCO6o%nGJ_dd%
z0}s(?Hk;)J#+Ar>C<C|gl`l~u@3x#4ETyE?YN2Tw073{loen~X)J0OE%jFVX*J(DJ
zXqra5-6jYEf*?qR-lTmD!w}bX>2|vaA=vG9OsCUSU}mKNK@i~kK0*jw*Ubdxf(jw1
z)oN_FTbj-0^-xXIFbo6V_pxmoAw=?`pAU^H^E{8QuP<EJ<^KLYv-_!yN}l0zxx})p
zT$O%CgXlh<t3=*s8F-II^?LmxXd>_ZpS)5)@$czg1%MBMF>oOsmH9_qrNXyg0Pp~O
zbfqSf36^EC-EK2?SE*F!_xtpEz4-J~Nh#$3j}dS@9-n=5gTWvU{!>y)ZTRsi!!UAH
zc&g&qJMnp7e3t-E<fR*5r_*6H8lmet@NI;aWg(?ZT_hFix-QjfmEmxRuIr3OBNmGV
zzVD|(OG+sf4H}KcQGk?^$z-wzB|5#A=Xv=m1@L_z$8nHSVwz@Fcs{6<62mZ9uh+c3
zzFrU2bsf_*v2B~@=VzppzivM_bT}LWU|ANc)e6%z84L!Q-Op@PUL_l~H@-@xauG0*
scW8Y5e*Yq9BJbGvig=}f|JnHd0s|n>!oWix0{{R307*qoM6N<$g0726E&u=k

literal 0
HcmV?d00001

diff --git a/public/images/admin/others/corners_mashup.png b/public/images/admin/others/corners_mashup.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cba01eaa239e654eaa1d350365247bf9b0c3257
GIT binary patch
literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u@pObhHwBu4M$1`kk47*5m^jW
z^BRO1o4R?UfP$hWt`Q~9MX8A;nfZANA(^?U3`Y8f=K6+)4$;aWQ)EC2g7ec#$`gxH
z85~pclTsDjGK*5n^NX^J6`X@j3%5Qt1FBo=>Eak7F|~HWL9QkT0f+fUZm)y3H9lC%
z7rFdHn(S|u|Nk$rbI6Kub9>Fu;|#oM&DWp!jMX(#)8TQp-`9!JuNe)lO-#!cn$GAD
z7-nT=JXIsiZi2?OjWaU?!?b$WzuaYg_pww>*ZP@e``D77$IreOxu#6Q`uc|bnH?uh
zo?fduwEvp)!j13N7g)|WxOUL!{{KHa+!sYm{~34qNNPuq#3^MXr9w%j4L9X}J+Kn_
a!^x##|KdX0+*qK)89ZJ6T-G@yGywn_3w&Du

literal 0
HcmV?d00001

diff --git a/public/images/admin/others/infowindow.png b/public/images/admin/others/infowindow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8f11aa5f7fc536a358f01f1fb62d017d5ba36e7
GIT binary patch
literal 3018
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

literal 0
HcmV?d00001

diff --git a/public/images/admin/others/logo_mashup.png b/public/images/admin/others/logo_mashup.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20b3db010a834ce43ee58464ace36dd5275f08c
GIT binary patch
literal 3079
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
R$DSNusB4BQ(RuXbe*ymM#`FLH

literal 0
HcmV?d00001

diff --git a/public/images/admin/others/marker.png b/public/images/admin/others/marker.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cda19be16fe09882278f9630d233e9105f55478
GIT binary patch
literal 1176
zcmV;J1ZVq+P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|6?8>dbVG7wVRUJ4ZXi@?ZDjy5FEKYS
zF)=_}BfS6s0338hSaefwW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q1Mx{j
zK~zYIot9rrTV)u=f2XCaoc7StKhSl?fkVLrOG~*LU0SZ(k|pj^y;;?<T{>fo#yG$m
zVia+Aq~e83oR@ToUa$2+Z&m`A6qXpGq?;28ZDGW2eZ43>aA;v0PjW8KIq&y8@B4k<
z`#m2V0UzxV7i~!uH4n(a$A+4B<C^u+F?1M*h@dq3agvU+TWsGdQ0#7|nKqng*imW0
zf`u|qC{bdQ0wqfPM;Q(KeH-fK91s6EC{hP6o{1*Rl@?m$RnAD%8Ike$sLZ7^Qpgvi
zhSfh;C4DC)WAPgja`sCLRxx9)c=1deDdNFBW5OhUd=lgh`S$uZ2I9j|$QNWZ{)KeV
zE((fxaR1Oy#EWM_L6MhvNn*}(l1kovCiy|6l6U2GXRjzIQmaT8@zF74#$0K~D+BaP
zCUx(H1!`EFUlcDMF=MV6Hbg7hvK6a@2})vY`q%;@B4d|tNQi(~u}Ul2vR;LPBHg?q
zG3U9u#eLSAWak%U^24unfiOV{6O=P_iGm_NI)-rLnzeF5!UXl;8m`8!)DcD<5gCbo
zAldmv{XI-jE}p)i3xo;E0R7U8MclY%n|9b4*02K*yELp%;nG5uxpao5g)FZHd#e4@
z>8B^u%Un9c)z}pPN}DABaw|E*PE}CQ(AZ&T*tE@Kr-lZglL5^AHV44>UncZ#no}c@
znjw*zp(oU<3mgVJcD8x!Gy$lnI!O)1jUoW)J1Ks?dD}2J92+E&nqe|IWf*f1wq0J6
zAXsRs3)nw+>Z3`n4Ue$2kTt}_E)6r8oH|sb#%ltoP%&f=(6evq0Orye-VMFYczo0l
z7mf`QeJj>bq)d5FWQ%P8L#6}KF#b+I03YA{L|?C8Z~elx;SmGb!Gvlku?2uxMZNx%
zr&cEpG^fVd^LtI|?>a?iZx``T-{Z}9&a?JlO^*r31`So_R&s_40si3;CX@|av?Wi_
zEFl7N@$`jbb$NDvQA9+><D-UNv0xDwZAr5O$KM5t@7u9a-Yo0${33AsJV13L<W_Pl
zEo50^oje;jXstF>E84P3iv;MCFhM=D<5m@*Pnu}jJG-Fjgu8|#VS*BMM2;ntO5T;I
zBO-2G^`|iG`H3H&ga}B~5s};9{q$Vqg?vF0W79G~zntP^V?U|EgL`Jz*(5|jKll=3
z(+xc)le#B~v1y4qBGONvxN+5-ai+#8jV=;iJQM5WKeJ#_{P=LtimBR8hhm*Pf3b=n
z;-c-VNBsNwks?s_m~FOyEK=%j#)2I?HdO4`^xMi7Ta?(MNRcv6(6HZEQR5GI`1^jY
qy6I{p=EgN^L(MBFa`1WHd)NP_Gqxx{xo_kE0000<MNUMnLSTa8a}THh

literal 0
HcmV?d00001

diff --git a/public/prototypes/mashup.html b/public/prototypes/mashup.html
new file mode 100644
index 0000000000..5fa19abd84
--- /dev/null
+++ b/public/prototypes/mashup.html
@@ -0,0 +1,235 @@
+
+<!DOCTYPE html> 
+<html lang="en"> 
+  <head> 
+    <meta charset=utf-8 /> 
+    <title>Clubs - Mashup</title> 
+    <link rel="shortcut icon" href="/favicon/favicon_32x32.ico" /> 
+    <link href="/stylesheets/reset.css" media="screen" rel="stylesheet" type="text/css" /> 
+    
+    <style type="text/css">
+      body {position:relative; background:#2D3451;}
+      /*HEADER*/
+      header {width:900px; height:100px; margin:0 auto; padding:20px 0 50px 0; background:none;}
+      header a.logo {float:left; width:200px; height:100px; margin:21px 0 0 0; background:url('/images/admin/others/logo_mashup.png') no-repeat 0 0; text-indent:-9999px;}
+      section.map {position:relative; margin:0 auto; width:900px; height:600px; -wekit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; border:1px solid black;}
+      section.map div#map {float:left; width:900px; height:600px;}
+      section.map span.top-left {position:absolute; width:5px; height:5px; background-image:url('/images/admin/others/corners_mashup.png');top:-1px; left:-1px; background-position:0 0;}
+      section.map span.top-right {position:absolute; width:5px; height:5px; background-image:url('/images/admin/others/corners_mashup.png');top:-1px; right:-1px; background-position:-5px 0;}
+      section.map span.bottom-left {position:absolute; width:5px; height:5px; background-image:url('/images/admin/others/corners_mashup.png');bottom:-1px; left:-1px; background-position:0 -5px;}
+      section.map span.bottom-right {position:absolute; width:5px; height:5px; background-image:url('/images/admin/others/corners_mashup.png');bottom:-1px; right:-1px; background-position:-5px -5px;}
+      section.map p.loading {position:absolute; display:none; top:10px; left:50%; margin:0 0 0 -47px; padding:5px 30px 5px 10px; background:url('/images/admin/others/activity_indicator.gif') no-repeat 68px 5px rgba(0,0,0,0.9);
+       -wekit-border-radius:3px; -moz-border-radius:3px; border-radius:3px; font:normal 15px Arial; color:white;}
+      /*Infowindow*/
+      a.clubMarker {float:left; display:block; width:25px; height:25px; background:url("/images/admin/others/marker.png") no-repeat 0 0; text-indent:-9999px;}
+      a.clubMarker:hover {cursor:pointer;}
+      div.hidden {position:absolute; top:-200px; left:-105px; display:none; width:233px; height:207px; margin:0; padding:0; background:url("/images/admin/others/infowindow.png") no-repeat 0 0;} 
+      div.hidden a.close {position:absolute; right:1px; top:0px; width:21px; height:21px; background:url("/images/admin/others/close.png") no-repeat 0 0; text-indent:-9999px;}
+      div.hidden a.close:hover {background-position:0 -21px;}
+      div.hidden h3 {float:left; width:193px; margin:20px 0 0 20px; font:bold 16px "Helvetica",Arial; color:#333333; letter-spacing:-1px;}
+      div.hidden div.content {float:left; width:193px; margin:0 0 0 20px;}
+      div.hidden div.content img {float:left; width:50px; margin:10px 10px 10px 0; border:1px solid black;}
+      div.hidden div.content p {float:none; padding:8px 0 0 0; font:normal 14px Arial; color:#666666;}
+    </style>
+    
+    <script src="/javascripts/plugins/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+    <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&region=ES&language=ES"></script>
+  </head> 
+  <body> 
+    <header> 
+      <a class="logo" href="/">CartoDB</a> 
+    </header> 
+    
+    <section class="map">
+      <div id="map"></div>
+      <span class="top-right"></span>
+      <span class="top-left"></span>
+      <span class="bottom-left"></span>
+      <span class="bottom-right"></span>
+      <p class="loading">Loading</p>
+    </section>
+
+    <script type="text/javascript">
+        var map;
+        var bounds = new google.maps.LatLngBounds();
+        
+        jQuery(function($) {
+            showLoader();
+            
+            var myOptions = {
+              zoom: 6,
+              center: new google.maps.LatLng(40.4166909, -3.7003454),
+              disableDefaultUI: true,
+              mapTypeId: google.maps.MapTypeId.ROADMAP
+            }
+            map = new google.maps.Map(document.getElementById("map"),myOptions);
+            
+            var current_position;
+
+            if (google.loader.ClientLocation) {
+              current_position = new google.maps.LatLng(google.loader.ClientLocation.latitude, google.loader.ClientLocation.longitude);
+              getNearClubs(current_position);
+            } else {
+              if (navigator.geolocation){
+                navigator.geolocation.getCurrentPosition(function(position){
+                  current_position = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
+                  getNearClubs(current_position);
+                });
+              }
+            }
+            
+        });
+        
+        
+        
+        function showLoader() {
+          $('p.loading').fadeIn();
+        }
+        
+        
+        function hideLoader() {
+          $('p.loading').fadeOut();
+        }
+        
+        
+        
+        function getNearClubs(position) {
+          //Marker with user position
+          map.setCenter(position);
+          bounds.extend(position);
+          map.setZoom(15);
+          var marker = new google.maps.Marker({position: position, map: map,title:"Your position!"});
+          
+          
+          //Club Markers
+          //Get other markers
+          // example - 40.41356139992232, -3.695676326751709
+          var club_marker = new ClubMarker(new google.maps.LatLng(40.4222594, -3.6996326),'',map);
+          bounds.extend(new google.maps.LatLng(40.4222594, -3.6996326));
+          map.fitBounds(bounds);
+          
+          
+          hideLoader();
+        }
+        
+
+        
+
+        function ClubMarker(latlng, info, map) {
+          this.latlng_ = latlng;
+        	this.inf = info;
+        	this.map_ = map;
+
+          this.offsetVertical_ = -12;
+          this.offsetHorizontal_ = -13;
+          this.height_ = 25;
+          this.width_ = 25;
+
+          this.setMap(map);
+        }
+
+        ClubMarker.prototype = new google.maps.OverlayView();
+
+        ClubMarker.prototype.draw = function() {
+
+          var me = this;
+        	var num = 0;
+
+          var div = this.div_;
+          if (!div) {
+            div = this.div_ = document.createElement('DIV');
+            $(div).addClass('clubMarker');
+            div.style.border = "none";
+            div.style.position = "absolute";
+        		div.style.width = '25px';
+        		div.style.height = '25px';
+
+
+            var content = ""+
+              "<a class='clubMarker'>marker</a>"+
+              "<div class='hidden'>"+
+                "<a href='#close' class='close'>close</a>"+
+                "<h3>Bonito var gay chuequeño</h3>"+
+                "<div class='content'>"+
+                  "<img src='http://chengdu.zonalibre.org/archives/bar%20gay%20patrocinado%20por%20Barcadi.JPG'/>"+
+                  "<p>En esta pequeña y humilde oficina se va celebrar una de las mayores fiestas gay del año, como anticipo el Love Gay Parade 2011. Fiestón padre.</p>"+
+                "</div>"+
+              "</div>";
+
+            $(div).append(content);
+            
+            $('a.close').live('click',function(ev){
+              ev.stopPropagation();
+              ev.preventDefault();
+              $('div.hidden').hide();
+            });
+            
+            
+            $('a.clubMarker').live('click',function(ev){
+              ev.stopPropagation();
+              ev.preventDefault();
+              me.moveMaptoOpen();
+              $('div.hidden').hide();
+              $(this).parent().children('div.hidden').show();
+            });
+
+
+            var panes = this.getPanes();
+            panes.floatPane.appendChild(div);
+          }
+
+        	var pixPosition = me.getProjection().fromLatLngToDivPixel(me.latlng_);
+          if (pixPosition) {
+        	  div.style.width = me.width_ + 'px';
+        	  div.style.left = (pixPosition.x + me.offsetHorizontal_) + 'px';
+        	  div.style.height = me.height_ + 'px';
+        	  div.style.top = (pixPosition.y + me.offsetVertical_) + 'px';
+          }
+
+        };
+
+        ClubMarker.prototype.remove = function() {
+          if (this.div_) {
+            this.div_.parentNode.removeChild(this.div_);
+            this.div_ = null;
+          }
+        };
+
+        ClubMarker.prototype.hide = function() {
+          if (this.div_) {
+            $(this.div_).find('div').fadeOut();
+          }
+        };
+
+        ClubMarker.prototype.getPosition = function() {
+         return this.latlng_;
+        };
+
+
+        ClubMarker.prototype.moveMaptoOpen = function() {
+        	var left = 0;
+        	var top = 0;
+
+          var pixPosition = this.getProjection().fromLatLngToContainerPixel(this.latlng_);
+
+
+          if ((pixPosition.x + this.offsetHorizontal_) < 110) {
+           left = (pixPosition.x + this.offsetHorizontal_ - 110);
+          }
+
+          if (($('div#map').width() - pixPosition.x + this.offsetHorizontal_) < 105) {
+           left = 105 - $('div#map').width() + pixPosition.x - this.offsetHorizontal_;
+          }
+
+        	if ((pixPosition.y + this.offsetVertical_) < 205) {
+        		top = pixPosition.y + this.offsetVertical_ -205;
+        	}
+
+        	this.map_.panBy(left,top);
+        }
+
+    </script>
+    
+  </body> 
+</html>
\ No newline at end of file