Merge branch 'master' into openstreetbugs

Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb

diff --cc app/views/browse/_map.html.erb
index dd4ec74df1a6d57a507a98e07958bc89493e3af1,1ff86cd4efa52468240a57e5e0c7fdfdeebe10c8..d2695ebe6f98d35c1900fc173874b9c5eccf6863
--- 1/app/views/browse/_map.html.erb
--- 2/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@@ -34,20 -82,23 +82,32 @@@
          setMapExtent(bbox);
          addBoxToMap(bbox);
  
-         $("loading").innerHTML = "";
+         $("loading").style.display = "none";
+ 
+         $$("#browse_map .geolink").each(function (link) {
+           link.style.display = "inline";
+         });
  
-         $("area_larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
-         $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
+         $("remote_area_edit").observe("click", function (event) {
+           remoteEditHandler(event, bbox);
+         });
+ 
+         <% if preferred_editor == "remote" %>
+           $("area_edit").observe("click", function (event) {
+             remoteEditHandler(event, bbox);
+           });
+         <% end %>
+ 
+         updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
 +      <% elsif map.instance_of? Note %>
 +        var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
 +
 +        setMapCenter(centre, 16);
 +        addMarkerToMap(centre);
 +
-         $("loading").innerHTML = "";
++        $("loading").style.display = "none";
 +
-         $("area_larger_map").href = '/?mlon=<%= map.lon %>&mlat=<%=map.lat %>';
-         $("area_larger_map").innerHTML = "<%= t 'browse.map.larger.area' %>";
++        updatelinks(centre.lon, centre.lat, 16, null, null, null, null, null)
        <% else %>
          var obj_type = "<%= map.class.name.downcase %>";
          var obj_id = <%= map.id %>;

diff --cc app/views/site/index.html.erb
index a61baca811fb8e0b590ecf566fbb40c0d7d7288a,c4d990618af9a4163372bb561220565d2c2775ae..340570f6d2f1751c87cbc17e48c5eb7279345372
--- 1/app/views/site/index.html.erb
--- 2/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -17,6 -17,10 +17,11 @@@
  </noscript>
  
  <div id="map">
+   <div id="permalink">
+     <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a><br/>
+     <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
++    <a href="#" id="reportbuganchor">Report a problem</a>     
+   </div>
  </div>
  
  <iframe id="linkloader" style="display: none">
@@@ -116,12 -122,11 +123,12 @@@ en
  
  <%= javascript_include_tag '/openlayers/OpenLayers.js' %>
  <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 +<%= javascript_include_tag 'openstreetbugs.js' %>
  <%= javascript_include_tag 'map.js' %>
  
- <script type="text/javascript" defer="defer">
-   <!--
-   var brokenContentSize = $("content").offsetWidth == 0;
+ <%= render :partial => 'resize' %>
+ 
+ <script type="text/javascript">
    var marker;
    var map;
  
@@@ -320,24 -267,18 +292,31 @@@
      <% end %>
    }
  
-   mapInit();
 +  function addBug() {
 +    map.osbControl.activate();
 +    map.osbControl.addTemporaryMarker(map.getCenter());
 +  }
 +
 +  function allowBugReports() { 
 +    if (map.getZoom() > 11) {
 +      $("reportbuganchor").style.visibility = "visible";
 +    } else {
 +      $("reportbuganchor").style.visibility = "hidden";
 +    }
 +  }
 +
+   document.observe("dom:loaded", mapInit);
+   document.observe("dom:loaded", installEditHandler);
+   document.observe("dom:loaded", handleResize);
+ 
+   Event.observe(window, "resize", function() {
+     var centre = map.getCenter();
+     var zoom = map.getZoom();
  
-   Event.observe(window, "load", installEditHandler);
-   Event.observe(window, "load", handleResize);
-   Event.observe(window, "resize", handleResize);
+     handleResize();
+ 
+     map.setCenter(centre, zoom);
+   });
  
    <% if params['action'] == 'export' %>
    <%= remote_function :url => { :controller => 'export', :action => 'start' } %>

diff --cc app/views/user/view.html.erb
Simple merge

diff --cc config/example.application.yml
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc public/stylesheets/large.css
Simple merge