Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop

app/assets/javascripts/src/Metamaps.Router.js

@@ -225,7 +225,6 @@
 
             if (href.attr === "") Metamaps.Router.home();
             else {
-                console.log(segments);
                 Metamaps.Router[segments[0]](segments[1], segments[2]);
             }
         }

app/assets/javascripts/src/Metamaps.Views.js

@@ -9,7 +9,7 @@ Metamaps.Views.init = function () {
 
         template: Hogan.compile( $('#mapperCardTemplate').html() ),
 
-        tagName: "div",
+        tagNamea: "div",
 
         className: "mapper",
 
@@ -91,8 +91,10 @@ Metamaps.Views.init = function () {
             }
 
             Metamaps.Loading.hide();
-            setTimeout(function(){
-                var path = Metamaps.currentSection == "" ? "" : "/explore/" + Metamaps.currentPage;
+
+            clearTimeout(Metamaps.routerTimeoutFunctionIds);
+            Metamaps.routerTimeoutId = setTimeout((function(localCurrentPage){ return function(){
+                var path = (Metamaps.currentSection == "") ? "" : "/explore/" + localCurrentPage;
 
                 // alter url if for mapper profile page
                 if (that.collection && that.collection.mapperId) {
@@ -100,7 +102,7 @@ Metamaps.Views.init = function () {
                 }
 
                 Metamaps.Router.navigate(path);
-            }, 500);
+            }})(Metamaps.currentPage), 500);
         },
         handleSuccess: function () {
             var that = this;
@@ -133,4 +135,4 @@ Metamaps.Views.init = function () {
     Metamaps.Views.exploreMaps = new mapsWrapper();
 };
 
-})();
+})();

app/assets/javascripts/src/Metamaps.js

@@ -4765,6 +4765,8 @@ Metamaps.Map.InfoBox = {
         $('.mapContributors .tip').unbind().click(function(event){
             event.stopPropagation();
         });
+        $('.mapContributors .tip li a').click(Metamaps.Router.intercept);
+
         $('.mapInfoBox').unbind('.hideTip').bind('click.hideTip', function(){
             $('.mapContributors .tip').hide();
         });
@@ -4778,15 +4780,15 @@ Metamaps.Map.InfoBox = {
         var self = Metamaps.Map.InfoBox;
 
         var string = ""; 
-
+        console.log("hello!!")
         string += "<ul>";
 
         Metamaps.Mappers.each(function(m){
-            string += '<li><img class="rtUserImage" width="25" height="25" src="' + m.get("image") + '" />' + m.get("name") + '</li>';
+            string += '<li><a href="/explore/mapper/' + m.get("id") + '">' + '<img class="rtUserImage" width="25" height="25" src="' + m.get("image") + '" />' + m.get("name") + '</a></li>';
         });
         
         string += "</ul>";
-
+        console.log(string);
         return string;
     },
     updateNumbers: function () {

app/assets/stylesheets/application.css

@@ -1708,6 +1708,9 @@ h3.realtimeBoxTitle {
     color: white;
 }
 
+.mapContributors .tip li a {
+    color: white;
+}
 .mapContributors div:after {
     content: '';
     position: absolute;

app/views/maps/_mapinfobox.html.erb

@@ -23,8 +23,8 @@
       <% end %>
       <span><%= @map.contributors.count %></span>
       <div class="tip"> <ul><% @map.contributors.each_with_index do |c, index| %>
-           <li > <img class="rtUserImage" width="25" height="25" src="<%= c.image.url(:thirtytwo) %>"  />
-            <%= c.name %> 
+           <li ><a href="/explore/mapper/<%= c.id %>" > <img class="rtUserImage" width="25" height="25" src="<%= c.image.url(:thirtytwo) %>"  />
+            <%= c.name %></a> 
             </li>         
         <% end %></ul></div>
     </div>