From: Kai Krueger Date: Sun, 2 May 2010 10:42:58 +0000 (+0100) Subject: Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs X-Git-Tag: live~5705^2~215 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5898b494df440ba9659ac8fbe2e150285a9a85a6?hp=-c Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs --- 5898b494df440ba9659ac8fbe2e150285a9a85a6 diff --combined app/views/browse/_map.html.erb index 5d7285840,f41deff95..0b7f76f23 --- a/app/views/browse/_map.html.erb +++ b/app/views/browse/_map.html.erb @@@ -1,22 -1,20 +1,20 @@@ <%= javascript_include_tag '/openlayers/OpenLayers.js' %> <%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> <%= javascript_include_tag 'map.js' %> - -
- <% if map.instance_of? Changeset or map.visible %> -
-
- <%= t 'browse.map.loading' %> - - <% unless map.instance_of? Changeset %> -
- - <% end %> - <% else %> - <%= t 'browse.map.deleted' %> - <% end %> +
+ <% if map.instance_of? Changeset or map.visible %> +
- + <%= t 'browse.map.loading' %> + + <% unless map.instance_of? Changeset %> +
+ + <% end %> + <% else %> + <%= t 'browse.map.deleted' %> + <% end %> +
<% if map.instance_of? Changeset or map.visible %>