Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index 41881cfb79577ed0dc1a46b10e95de9bfccc3063..bbde2148f3cfd0fa20972c3642c45651e333e69f 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -206,7 +206,7 @@ class MapBugsController < ApplicationController
   def my_bugs
  
     if params[:display_name] 
-      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :visible => true }) 
+      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] }) 
  
       if @user2  
         if @user2.data_public? or @user2 == @user 

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 70402a1c94014a89fcb9e72e49fd4d2bd929d727..7450eb2bae5ff10ecbe069d2998d4178c423faed 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -25,7 +25,7 @@
 <div id="permalink">
   <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
   <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a><br/>
-  <a href="/" id="ReportBug">Report a problem</a>      
+  <a href="javascript:void()" id="ReportBug">Report a problem</a>      
 </div>
 
 <div id="attribution">
@@ -131,7 +131,7 @@ end
 
   function createBugCallBack() {
        map.osbControl.deactivate();
-       document.getElementById("map_OpenLayers_Container").style.cursor = "default";
+       document.getElementById("OpenLayers.Map_18_OpenLayers_Container").style.cursor = "default";
   }
 
   function mapInit(){
@@ -157,11 +157,12 @@ end
       map.addLayer(map.osbLayer);
 
       map.osbControl = new OpenLayers.Control.OpenStreetBugs(map.osbLayer); 
+         
       map.addControl(map.osbControl);
                
          var lBug = document.getElementById('ReportBug');
       lBug.addEventListener('click',function (e) {
-               map.osbControl.activate(); document.getElementById("map_OpenLayers_Container").style.cursor = "crosshair"; if (e.stopPropagation) e.stopPropagation(); },false);
+               map.osbControl.activate(); document.getElementById("OpenLayers.Map_18_OpenLayers_Container").style.cursor = "crosshair" },false);
 
 
     <% end %>