Changeset 22703 for trunk/admin

Timestamp:

May 16, 2013, 10:46:21 PM (11 years ago)

Author:

rvelices

Message:

feature 2885: Add geoip info in the stats / history page - fixes and add a location map image

Location:

trunk/admin/themes/default

Files:

• js/jquery.geoip.js (modified) (3 diffs)
• template/history.tpl (modified) (3 diffs)

trunk/admin/themes/default/js/jquery.geoip.js

@@ -10 +10 @@
                         if (cache) {
                                 cache = JSON.parse(cache);
-                                for (var ip in cache) {
-                                        var data = cache[ip];
+                                for (var key in cache) {
+                                        var data = cache[key];
                                         if ( (new Date()).getTime() - data.reqTime > 36 * 3600000)
-                                                delete cache[ip];
+                                                delete cache[key];
                                 }
                                 GeoIp.cache = cache;
@@ -32 +32 @@
                                 dataType: "jsonp",
                                 cache: true,
+                                timeout: 5000,
                                 success: function(data) {
                                         data.reqTime = (new Date()).getTime();
@@ -48 +49 @@
 
                                 error: function() {
-                                        var data = {ip:ip, fullName:"", reqTime: (new Date()).getTime()};
+                                        var data = {ip:ip, reqTime: (new Date()).getTime()};
 
                                         GeoIp.cache[ip] = data;

trunk/admin/themes/default/template/history.tpl

@@ -139 +139 @@
 
 {footer_script}{literal}
+jQuery(document).ready( function(){
 jQuery(".IP").one( "mouseenter", function(){
         var that = $(this);
@@ -148 +149 @@
         GeoIp.get( that.text(), function(data) {
                 if (!data.fullName) return;
+                var content = data.fullName;
+                if (data.latitude && data.region_name) {
+                        content += "<br><img width=300 height=220 src=\"http://maps.googleapis.com/maps/api/staticmap?sensor=false&size=300x220&zoom=6"
+                                + "&markers=size:tiny%7C" + data.latitude + "," + data.longitude
+                                + "\">";
+                }
                 that.tipTip( {
-                        content: data.fullName
+                        content: content,
+                        maxWidth: 320
                         }       );
                 if (that.data("isOver"))
@@ -155 +163 @@
         });
 } );
+});
 {/literal}{/footer_script}