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

[rails.git] / app / views / site / index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 7450eb2bae5ff10ecbe069d2998d4178c423faed..27ecf1fa79d6bb7ab610fe5fe11af5b88f300c34 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="javascript:void()" id="ReportBug">Report a problem</a>      
+  <a href="javascript:void();" id="ReportBug">Report a problem</a>     
 </div>
 
 <div id="attribution">
@@ -129,10 +129,9 @@ end
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
-  function createBugCallBack() {
-       map.osbControl.deactivate();
-       document.getElementById("OpenLayers.Map_18_OpenLayers_Container").style.cursor = "default";
-  }
+  <% if @user %>
+    var loginName = "<%= @user.display_name %>"
+  <% end %>
 
   function mapInit(){
     map = createMap("map");
@@ -144,14 +143,14 @@ end
 
       map.osbLayer = new OpenLayers.Layer.OpenStreetBugs("OpenStreetBugs", {
           serverURL : "/api/0.6/",
-          iconOpen : new OpenLayers.Icon("http://openstreetbugs.schokokeks.org/client/open_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
-          iconClosed : new OpenLayers.Icon("http://openstreetbugs.schokokeks.org/client/closed_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
+          iconOpen : new OpenLayers.Icon("/images/open_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
+          iconClosed : new OpenLayers.Icon("/images/closed_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
           readonly : false,
           setCookie : false,
           cookieLifetime : 1000, 
           cookiePath : "/my/map/", 
           permalinkURL : "http://www.openstreetmap.org/", 
-          theme : "http://osm.cdauth.de/map/openstreetbugs.css" 
+          theme : "/stylesheets/openstreetbugs.css" 
       });
 
       map.addLayer(map.osbLayer);