From: Tom Hughes <tom@compton.nu>
Date: Sat, 2 Feb 2013 11:00:46 +0000 (+0000)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5068^2~48
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56db9ca2b7e2475cd8025630049fb4a4b824f2d9

Merge branch 'master' into notes
---

56db9ca2b7e2475cd8025630049fb4a4b824f2d9
diff --cc app/assets/javascripts/index.js
index dc5c40bf2,e96ffbf02..7c80b0108
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@@ -2,10 -2,9 +2,10 @@@
  //= require index/browse
  //= require index/export
  //= require index/key
 +//= require index/notes
  
  $(document).ready(function () {
-   var permalinks = $("#permalink").html();
+   var permalinks = $("#permalink").detach().html();
    var marker;
    var params = OSM.mapParams();
    var map = createMap("map");
diff --cc app/views/browse/_map.html.erb
index cf59a4679,c72040955..e0428b4ac
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@@ -39,20 -33,13 +39,20 @@@
  
  <ul class='secondary-actions clearfix'>
    <li>
 -    <%= link_to t("browse.map.larger.area"),
 -                root_path(:box => "yes"),
 -                :id => "area_larger_map",
 -                :class => "geolink bbox" %>
 +    <% if map.instance_of? Note -%>
 +      <%= link_to t("browse.map.larger.area"),
 +                  root_path(:notes => "yes"),
 +                  :id => "area_larger_map",
 +                  :class => "geolink bbox" %>
 +    <% else -%>
 +      <%= link_to t("browse.map.larger.area"),
 +                  root_path(:box => "yes"),
 +                  :id => "area_larger_map",
 +                  :class => "geolink bbox" %>
 +    <% end -%>
    </li>
    <li>
-     <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
+     <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▼", :class => "menuicon"),
                  edit_path,
                  :id => "area_edit",
                  :data => { :editor => preferred_editor },