- <%=
- t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
+ <%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
:time => distance_of_time_in_words_to_now(common_details.timestamp),
:user => changeset_user_link(common_details.changeset),
- :title => l(common_details.timestamp)
- %>
+ :title => l(common_details.timestamp) %>
diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index 1dca0c26e..b3cb90cec 100644
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,9 +1,7 @@
-
<%=
- linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
- if containing_relation.member_role.blank?
- raw t ".entry", :relation_name => linked_name
- else
- raw t ".entry_role", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
- end
- %>
+<%= linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
+ if containing_relation.member_role.blank?
+ raw t ".entry", :relation_name => linked_name
+ else
+ raw t ".entry_role", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+ end %>
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index a707c3ba1..bb37bdf21 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,14 +1,10 @@
-<%
- member_class = link_class(relation_member.member_type.downcase, relation_member.member)
- linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
- type_str = t ".type." + relation_member.member_type.downcase
-%>
+<% member_class = link_class(relation_member.member_type.downcase, relation_member.member)
+ linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
+ type_str = t ".type." + relation_member.member_type.downcase %>
- <%=
- if relation_member.member_role.blank?
- raw t ".entry", :type => type_str, :name => linked_name
- else
- raw t ".entry_role", :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
- end
- %>
+ <%= if relation_member.member_role.blank?
+ raw t ".entry", :type => type_str, :name => linked_name
+ else
+ raw t ".entry_role", :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+ end %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index f39d8263f..0ec89da9d 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -127,10 +127,8 @@
<%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %>
·
<% end %>
- <%=
- user = (@prev_by_user || @next_by_user).user.display_name
- link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user
- %>
+ <%= user = (@prev_by_user || @next_by_user).user.display_name
+ link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %>
<% if @next_by_user %>
·
<%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index e4d229f9a..56726e2d9 100644
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -1,5 +1,4 @@
-<%
- changeset_data = { :id => changeset.id }
+<% changeset_data = { :id => changeset.id }
if changeset.has_valid_bbox?
bbox = changeset.bbox.to_unscaled
@@ -9,8 +8,7 @@
:maxlon => bbox.max_lon,
:maxlat => bbox.max_lat
}
- end
-%>
+ end %>
<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data } do %>
diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index 55a137f59..e3df87490 100644
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -4,14 +4,12 @@
<% end -%>
<% end -%>
-<%
- set_title(changeset_index_title(params, current_user))
+<% set_title(changeset_index_title(params, current_user))
@heading = if params[:display_name]
t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
else
@title
- end
-%>
+ end %>
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 6e3f69a7d..aaf24ac1a 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,4 +1,2 @@
-<%
- set_title
- content_for(:content_class) { "overlay-sidebar" }
-%>
+<% set_title
+ content_for(:content_class) { "overlay-sidebar" } %>
diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index d75e717ad..9950da0f8 100644
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -1,11 +1,9 @@
-<%
- user_data = {
+<% user_data = {
:lon => contact.home_lon,
:lat => contact.home_lat,
:icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"),
:description => render(:partial => "popup", :object => contact, :locals => { :type => type })
- }
-%>
+ } %>
<%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %>
<%= user_thumbnail contact %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 28dc07e0d..5090cbee0 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -185,14 +185,12 @@
<% content_for :head do %>
<%= javascript_include_tag "user" %>
<% end %>
- <%
- user_data = {
- :lon => current_user.home_lon,
- :lat => current_user.home_lat,
- :icon => image_path("marker-red.png"),
- :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
- }
- %>
+ <% user_data = {
+ :lon => current_user.home_lon,
+ :lat => current_user.home_lat,
+ :icon => image_path("marker-red.png"),
+ :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
+ } %>
<%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
<% end %>