--- /dev/null
+---
+linters:
+ SelfClosingTag:
+ enabled: false
+ SpaceInHtmlTag:
+ enabled: false # TODO
+ Rubocop:
+ enabled: true
+ rubocop_config:
+ inherit_from:
+ - .rubocop.yml
+ Layout/InitialIndentation:
+ Enabled: false
+ Layout/TrailingBlankLines:
+ Enabled: false
+ Layout/TrailingWhitespace:
+ Enabled: false
+ Naming/FileName:
+ Enabled: false
+ Style/FrozenStringLiteralComment:
+ Enabled: false
+ Metrics/LineLength:
+ Enabled: false
+ Lint/UselessAssignment:
+ Enabled: false
+ Rails/OutputSafety:
+ Enabled: false
+ Style/StringLiterals:
+ Enabled: false # TODO
+ Style/BracesAroundHashParameters:
+ Enabled: false # TODO
+ Rails/DynamicFindBy:
+ Enabled: false # TODO
+ Style/AndOr:
+ Enabled: false # TODO
+ Style/WordArray:
+ Enabled: false # TODO
+ Style/MethodCallWithoutArgsParentheses:
+ Enabled: false # TODO
+ Layout/LeadingBlankLines:
+ Enabled: false # TODO
+ Style/NestedParenthesizedCalls:
+ Enabled: false # TODO
+ Rails/LinkToBlank:
+ Enabled: false # TODO
+ Style/HashSyntax:
+ Enabled: false # TODO
+ Style/SymbolProc:
+ Enabled: false # TODO
+ Style/Not:
+ Enabled: false # TODO
+ Style/NegatedIf:
+ Enabled: false # TODO
+ Style/ConditionalAssignment:
+ Enabled: false # TODO
+exclude:
+ - '**/vendor/**'
script:
- bundle exec rubocop -f fuubar
- bundle exec rake jshint
+ - bundle exec erblint .
- bundle exec rake test:db
## Coding style
-When writing code it is generally a good idea to try and match your
-formatting to that of any existing code in the same file, or to other
-similar files if you are writing new code. Consistency of layout is
-far more important than the layout itself as it makes reading code
-much easier.
-
-One golden rule of formatting -- please don't use tabs in your code
-as they will cause the file to be formatted differently for different
-people depending on how they have their editor configured.
+We use [Rubocop](https://github.com/rubocop-hq/rubocop) (for ruby files)
+and [ERB Lint](https://github.com/Shopify/erb-lint) (for erb templates)
+to help maintain consistency in our code. You can run these utilities during
+development to check that your code matches our guidelines:
+
+```
+bundle exec rubocop
+bundle exec erblint .
+```
## Testing
group :development, :test do
gem "capybara", "~> 2.13"
gem "coveralls", :require => false
+ gem "erb_lint", :require => false
gem "factory_bot_rails"
gem "jshint"
gem "poltergeist"
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
+ better_html (1.0.11)
+ actionview (>= 4.0)
+ activesupport (>= 4.0)
+ ast (~> 2.0)
+ erubi (~> 1.4)
+ html_tokenizer (~> 0.0.6)
+ parser (>= 2.4)
+ smart_properties
bigdecimal (1.1.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
dry-logic (~> 0.5, >= 0.5.0)
dry-types (~> 0.14, >= 0.14)
dynamic_form (1.1.4)
+ erb_lint (0.0.28)
+ activesupport
+ better_html (~> 1.0.7)
+ html_tokenizer
+ rainbow
+ rubocop (~> 0.51)
+ smart_properties
erubi (1.8.0)
execjs (2.7.0)
exifr (1.3.6)
activesupport (>= 4.2.0)
hashdiff (0.3.8)
hashie (3.6.0)
+ html_tokenizer (0.0.7)
htmlentities (4.3.4)
http_accept_language (2.0.5)
i18n (0.9.5)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
+ smart_properties (1.13.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
dalli
delayed_job_active_record
dynamic_form
+ erb_lint
factory_bot_rails
fakefs
faraday
<% if @type == "node" and common_details.visible? %>
<div class="details geo">
<%= t 'browse.location' %>
- <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}"}) %>
+ <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), { :controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}" }) %>
</div>
<% end %>
else
raw t '.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
end
-%></li>
+ %>
+</li>
<%= render :partial => "common_details", :object => relation %>
<% unless relation.containing_relation_members.empty? %>
- <h4><%= t'browse.part_of' %></h4>
+ <h4><%= t 'browse.part_of' %></h4>
<ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
<% end %>
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
%>
- <li class="<%= member_class %>"><%=
+<li class="<%= member_class %>">
+ <%=
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
- %></li>
+ %>
+</li>
<%= render :partial => "common_details", :object => way %>
<% unless way.containing_relation_members.empty? %>
- <h4><%= t'browse.part_of' %></h4>
+ <h4><%= t 'browse.part_of' %></h4>
<ul>
<%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
</ul>
<%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) %>
<% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
<% if related_ways.size > 0 then %>
- (<%= raw t '.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
+ (<%= raw t '.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w)) }.to_sentence %>)
<% end %>
</li>
<% end %>
<li id="c<%= comment.id %>">
<small class='deemphasize'>
<%= t(".commented_by",
- :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
- :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+ :when => friendly_date(comment.created_at),
+ :exact_time => l(comment.created_at),
+ :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
<% if current_user and current_user.moderator? %>
— <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t('javascripts.changesets.show.hide_comment') %></span>
<% end %>
<li id="c<%= comment.id %>">
<small class='deemphasize'>
<%= t(".hidden_commented_by",
- :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
- :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+ :when => friendly_date(comment.created_at),
+ :exact_time => l(comment.created_at),
+ :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
— <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t('javascripts.changesets.show.unhide_comment') %></span>
</small>
<%= comment.body.to_html %>
<% unless @nodes.empty? %>
<h4>
<%= type_and_paginated_count('node', @node_pages) %>
- <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
+ <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page" } %>
</h4>
<ul>
<% @nodes.each do |node| %>
-<h2><%= t ".comment", :author => comment.author.display_name,
- :changeset_id => comment.changeset.id.to_s %></h2>
+<h2><%= t ".comment",
+ :author => comment.author.display_name,
+ :changeset_id => comment.changeset.id.to_s %></h2>
<div class="changeset-comment" style="margin-top: 5px">
<div class="changeset-comment-description" style="font-size: smaller; color: #999999"><%= t ".commented_at_by_html", :when => friendly_date(comment.created_at), :user => comment.author.display_name %></div>
<div class="changeset-comment-text"><%= comment.body %></div>
<%
- changeset_data = {:id => changeset.id}
+ changeset_data = { :id => changeset.id }
if changeset.has_valid_bbox?
bbox = changeset.bbox.to_unscaled
end
%>
-<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %>
+<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data } do %>
<h4>
<a class="changeset_id" href="<%= changeset_path(changeset) %>">
<%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
<div class="richtext"><%= diary_comment.body.to_html %></div>
<% if current_user && current_user.administrator? %>
<span>
- <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('.confirm') } %>
+ <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t('.confirm') } %>
</span>
<% end %>
</div>
</table>
<div class='secondary-actions clearfix'>
- <span><%= link_to t('.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %>
+ <span><%= link_to t('.older_comments'), { :page => @comment_pages.current.next } if @comment_pages.current.next %>
<%= link_to t('.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></span>
</div>
</fieldset>
<fieldset class='location'>
<label class="standard-label"><%= t '.location' -%></label>
- <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>
+ <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
<div class='form-row clearfix'>
<div class='form-column'>
<label class="secondary standard-label"><%= t '.latitude' -%></label>
<% if @user %>
<% if @user == current_user %>
<div>
- <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), diary_new_path, {:title => t('.new_title')} %></li>
+ <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %></li>
</div>
<% end %>
<% else %>
<% if current_user %>
<div>
- <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('.new'), diary_new_path, {:title => t('.new_title')} %></li>
+ <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, { :title => t('.new_title') } %></li>
</div>
<% end %>
<% end %>
<% if @entries.size < @page_size -%>
<%= t('.older_entries') %>
<% else -%>
- <%= link_to t('.older_entries'), @params.merge(:page => @page + 1 ) %>
+ <%= link_to t('.older_entries'), @params.merge(:page => @page + 1) %>
<% end -%>
|
<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
</div>
-
<div>
<% if current_user %>
<h3 id="newcomment"><%= t '.leave_a_comment' %></h3>
-<h1>Forbidden</h1>
+<h1>Forbidden</h1>
<p>The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)</p>
<p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.</p>
-<h1>File not found</h1>
+<h1>File not found</h1>
<p>Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)</p>
<p>Feel free to <a href="http://wiki.openstreetmap.org/wiki/Contact" title="Various contact channels explained">contact</a> the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.</p>
<head>
<meta charset="utf-8">
<title>OpenStreetMap Embedded</title>
- <%= stylesheet_link_tag "embed", :media=> "screen" %>
+ <%= stylesheet_link_tag "embed", :media => "screen" %>
<%= javascript_include_tag "embed" %>
</head>
<body>
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
- <%= t('site.sidebar.search_results') %>
+ <%= t('site.sidebar.search_results') %>
</h2>
<% @sources.each do |source| %>
<h4 class="inner12"><%= raw(t ".title.#{source}") %></h4>
<%= form_tag(issues_path, :method => :get) do %>
<p><%= t ".search_guidance" %></p>
-<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map{|state| [t(".states.#{state}"), state]}, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
+<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %>
<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
-<%= select_tag :last_updated_by, options_for_select(@users.all.collect{|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %>
+<%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %>
<%= submit_tag t(".search"), :name => nil %>
<% end %>
<br/>
<%= @issue.assigned_role %>
| <%= t ".reports", :count => @issue.reports.count %>
| <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
- <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format =>:friendly)) if @issue.resolved_at? %>
- <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name ) if @issue.user_updated %>
+ <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly)) if @issue.resolved_at? %>
+ <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name) if @issue.user_updated %>
</small>
</p>
<p>
<%= content_for :header %>
<ul>
<li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
- <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink editlink",
+ <%= link_to t('layouts.edit'),
+ edit_path,
+ :class => "tab geolink editlink",
:id => 'editanchor',
- :data => { :editor => preferred_editor }
-
%><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
+ :data => { :editor => preferred_editor } %>
+ <a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
<ul class='dropdown-menu'>
<% Editors::RECOMMENDED_EDITORS.each do |editor| %>
<li>
<% if current_user && current_user.id %>
<div class='dropdown user-menu logged-in'>
<a class='dropdown-toggle' data-toggle='dropdown' href="#">
- <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25)
- %><%= render :partial => 'layouts/inbox'
- %><span class="user-button"><span class='username'><%= current_user.display_name %></span>
- <b class="caret"></b></span>
+ <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
+ <%= render :partial => 'layouts/inbox' %>
+ <span class="user-button">
+ <span class='username'>
+ <%= current_user.display_name %>
+ </span>
+ <b class="caret"></b>
+ </span>
</a>
<ul class='dropdown-menu'>
<li>
<div class="header"><span class="icon close"></span></div>
<div class="line">
- <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type => "from" }, :draggable => "true" %>
+ <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type => "from" }, :draggable => "true" %>
<span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
</div>
<div class="line">
<%= image_tag "marker-red.png", :class => "routing_marker", :data => { :type => "to" }, :draggable => "true" %>
- <span class="force_width"><%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %></span>
+ <span class="force_width"><%= text_field_tag "route_to", params[:to], :placeholder => t('site.search.to') %></span>
</div>
<div class="line">
<select class="routing_engines" name="routing_engines"></select>
<head>
<meta charset="utf-8">
<title>OpenStreetMap</title>
- <%= stylesheet_link_tag "errors", :media=> "screen" %>
+ <%= stylesheet_link_tag "errors", :media => "screen" %>
</head>
<body>
<%= image_tag "osm_logo.png", :class => "logo" %>
<div class="close-wrap"><span class="icon close"></span></div>
<p><%= t 'layouts.intro_text' %></p>
<p><%= t 'layouts.hosting_partners_html',
- :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
- :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
- :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+ :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
+ :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
+ :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
</p>
<a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
<a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
:new_messages => t("messages.inbox.new_messages",
:count => current_user.new_messages.size),
:old_messages => t("messages.inbox.old_messages",
- :count => current_user.messages.size - current_user.new_messages.size)
-%>
+ :count => current_user.messages.size - current_user.new_messages.size) %>
</p>
<% end %>
<% content_for :heading do %>
- <h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
+ <h2><%= t '.my_inbox' %>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
<% end %>
<h4><%= render :partial => "message_count" %></h4>
<% end %>
<% content_for :heading do %>
- <h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_messages_path)) %>/<%= t'.outbox' %></h2>
+ <h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_messages_path)) %>/<%= t '.outbox' %></h2>
<% end %>
<h4><%= t '.messages', :count => current_user.sent_messages.size %></h4>
-<%= t'notifier.gpx_notification.your_gpx_file' %>
+<%= t 'notifier.gpx_notification.your_gpx_file' %>
<strong><%= @trace_name %></strong>
-<%= t'notifier.gpx_notification.with_description' %>
+<%= t 'notifier.gpx_notification.with_description' %>
<em><%= @trace_description %></em>
<% if @trace_tags.length>0 %>
- <%= t'notifier.gpx_notification.and_the_tags' %>
+ <%= t 'notifier.gpx_notification.and_the_tags' %>
<em><% @trace_tags.each do |tag| %>
<%= tag.tag.rstrip %>
<% end %></em>
<% else %>
- <%= t'notifier.gpx_notification.and_no_tags' %>
+ <%= t 'notifier.gpx_notification.and_no_tags' %>
<% end %>
<tr>
<td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
<%= link_to(
- image_tag(
- attachments["avatar.png"].url,
- alt: @author,
- title: @author,
- width: 50,
- height: 50,
- border: 0
- ),
- user_url(@author),
- :target => "_blank"
- ) %>
+ image_tag(
+ attachments["avatar.png"].url,
+ alt: @author,
+ title: @author,
+ width: 50,
+ height: 50,
+ border: 0
+ ),
+ user_url(@author),
+ :target => "_blank"
+ ) %>
</td>
<td style="text-align: left; vertical-align: top; padding-right: 10px; width: 100%">
<%= body %>
<% content_for :footer do %>
<p><%= raw t '.footer',
- :readurl => link_to(@readurl, @readurl) + tag(:br),
- :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
- :replyurl => link_to(@replyurl, @replyurl)
- %></p>
+ :readurl => link_to(@readurl, @readurl) + tag(:br),
+ :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
+ :replyurl => link_to(@replyurl, @replyurl) %>
+ </p>
<% end %>
-<p><%= t'notifier.gpx_notification.greeting' %></p>
+<p><%= t 'notifier.gpx_notification.greeting' %></p>
<p>
<%= render :partial => "gpx_description" %>
- <%= t'notifier.gpx_notification.failure.failed_to_import' %>
+ <%= t 'notifier.gpx_notification.failure.failed_to_import' %>
</p>
<blockquote>
</blockquote>
<p>
- <%= t'notifier.gpx_notification.failure.more_info_1' %>
- <%= t'notifier.gpx_notification.failure.more_info_2' %>
- <%= t'notifier.gpx_notification.failure.import_failures_url' %>
+ <%= t 'notifier.gpx_notification.failure.more_info_1' %>
+ <%= t 'notifier.gpx_notification.failure.more_info_2' %>
+ <%= t 'notifier.gpx_notification.failure.import_failures_url' %>
</p>
-<p><%= t'notifier.gpx_notification.greeting' %></p>
+<p><%= t 'notifier.gpx_notification.greeting' %></p>
<p>
<%= render :partial => "gpx_description" %>
- <%= t'notifier.gpx_notification.success.loaded_successfully', :trace_points => @trace_points, :possible_points => @possible_points %>
+ <%= t 'notifier.gpx_notification.success.loaded_successfully', :trace_points => @trace_points, :possible_points => @possible_points %>
</p>
</p>
<p>
<%= raw t '.header',
- :from_user => link_to_user(@from_user),
- :subject => content_tag("em", @title)
- %>
+ :from_user => link_to_user(@from_user),
+ :subject => content_tag("em", @title) %>
</p>
<%= message_body do %>
<p>
<%= t '.footer_html',
:readurl => link_to(@readurl, @readurl) + tag(:br),
- :replyurl => link_to(@replyurl, @replyurl)
- %>
+ :replyurl => link_to(@replyurl, @replyurl) %>
</p>
<% end %>
<table>
<tr><th><%= t '.application' %></th>
<th><%= t '.issued_at' %></th><th> </th></tr>
- <% @tokens.each do |token|%>
+ <% @tokens.each do |token| %>
<%= content_tag_for :tr, token do %>
<td><%= link_to token.client_application.name, token.client_application.url %></td>
<td><%= token.authorized_at %></td>
<td>
- <%= form_tag :controller => 'oauth', :action => 'revoke' do %>
- <%= hidden_field_tag 'token', token.token %>
- <%= submit_tag t('.revoke') %>
- <% end %>
+ <%= form_tag :controller => 'oauth', :action => 'revoke' do %>
+ <%= hidden_field_tag 'token', token.token %>
+ <%= submit_tag t('.revoke') %>
+ <% end %>
</td>
<% end %>
<% end %>
<p><%= raw(t('.no_apps', :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>
<% else %>
<p><%= t '.registered_apps' %></p>
-<% @client_applications.each do |client|%>
+<% @client_applications.each do |client| %>
<%= div_for client do %>
<%= link_to client.name, :action => :show, :id => client.id %>
<% end %>
<% end %>
<div class='prose'>
<p>
- <strong><%= t '.key' %></strong> <%=@client_application.key %>
+ <strong><%= t '.key' %></strong> <%= @client_application.key %>
</p>
<p>
- <strong><%= t '.secret' %></strong> <%=@client_application.secret %>
+ <strong><%= t '.secret' %></strong> <%= @client_application.secret %>
</p>
<p>
- <strong><%= t '.url' %></strong> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.request_token_path %>
+ <strong><%= t '.url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.request_token_path %>
</p>
<p>
- <strong><%= t '.access_url' %></strong> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.access_token_path %>
+ <strong><%= t '.access_url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.access_token_path %>
</p>
<p>
- <strong><%= t '.authorize_url' %></strong> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.authorize_path %>
+ <strong><%= t '.authorize_url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.authorize_path %>
</p>
<p><%= t '.requests' %></p>
<p><%= t '.support_notice' %></p>
</div>
<div class="buttons">
- <%= button_to t('.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class=> "oauth-edit" %>
- <%= button_to t('.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('.confirm') }, :class=> "oauth-delete deemphasize" %>
+ <%= button_to t('.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class => "oauth-edit" %>
+ <%= button_to t('.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('.confirm') }, :class => "oauth-delete deemphasize" %>
</div>
<h1><%= t '.native.title' %></h1>
<p>
<%= raw t '.native.text',
- :native_link => link_to(t('.native.native_link'),
- :controller => 'site',
- :action => 'copyright',
- :copyright_locale => nil),
- :mapping_link => link_to(t('.native.mapping_link'),
- :controller => 'site',
- :action => 'index') %>
+ :native_link => link_to(t('.native.native_link'),
+ :controller => 'site',
+ :action => 'copyright',
+ :copyright_locale => nil),
+ :mapping_link => link_to(t('.native.mapping_link'),
+ :controller => 'site',
+ :action => 'index') %>
</p>
<% end %>
<hr />
<h1><%= t '.foreign.title' %></h1>
<p>
<%= raw t '.foreign.text',
- :english_original_link => link_to(t('.foreign.english_link'),
- :controller => 'site',
- :action => 'copyright',
- :copyright_locale => 'en') %>
+ :english_original_link => link_to(t('.foreign.english_link'),
+ :controller => 'site',
+ :action => 'copyright',
+ :copyright_locale => 'en') %>
</p>
<% end %>
<hr />
<p><%= t 'layouts.osm_read_only' %></p>
<% elsif !current_user.data_public? %>
<p><%= t '.not_public' %></p>
- <p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), {:controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public'}) %></p>
+ <p><%= raw t '.not_public_description', :user_page => (link_to t('.user_page_link'), { :controller => 'user', :action => 'account', :display_name => current_user.display_name, :anchor => 'public' }) %></p>
<p><%= raw t 'site.edit.anon_edits', :link => link_to(t('.anon_edits_link_text'), t('.anon_edits_link')) %></p>
<% else %>
<%= render :partial => preferred_editor %>
<%= t '.title' %>
</h2>
-<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %>
+<%= form_tag({ :controller => "export", :action => "finish" }, :class => "export_form") do %>
<%= hidden_field_tag 'format', 'osm' %>
<div class='export_area_inputs'>
<% else %>
<p><%= t 'layouts.osm_read_only' %>
</p>
-<% end %>
+<% end %>
<td class="<%= cl %>"><%= link_to trace.name, { :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id } %>
<span class="trace_summary" title="<%= trace.timestamp %>"> ...
<% if trace.inserted %>
- (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
+ (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>)
<% end %>
... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
- <%= link_to_if trace.inserted?, t('.map'), {:controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}"}, {:title => t('.view_map')} %> /
- <%= link_to t('.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('.edit_map')} %>
+ <%= link_to_if trace.inserted?, t('.map'), { :controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t('.view_map') } %> /
+ <%= link_to t('.edit'), { :controller => 'site', :action => 'edit', :gpx => trace.id }, { :title => t('.edit_map') } %>
<span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
<br />
<%= trace.description %>
<br />
- <%= t '.by' %> <%=link_to h(trace.user.display_name), user_path(trace.user) %>
+ <%= t '.by' %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
<% if !trace.tags.empty? %>
<%= t '.in' %>
<%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
<% if @trace.inserted? %>
<div class='form-row'>
<label class='standard-label'><%= t '.points' %></label>
- <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></p>
+ <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></p>
</div>
<div class='form-row'>
<label class='standard-label'><%= t '.start_coord' %></label>
<span class="latitude"><%= @trace.latitude %></span>;
<span class="longitude"><%= @trace.longitude %></span>
</div>
- (<%=link_to t('.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
+ (<%= link_to t('.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
<% end %>
<div class='form-row'>
<label class='standard-label'><%= t '.owner' %></label>
</div>
<div class='form-row'>
<label class='standard-label'><%= t '.visibility' %></label>
- <%= f.select :visibility, [[t('traces.visibility.private'),
"private"], [t('traces.visibility.public'),"public"], [t('traces.visibility.trackable'),"trackable"], [t('traces.visibility.identifiable'),"identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)
+ <%= f.select :visibility, [[t('traces.visibility.private'),
"private"], [t('traces.visibility.public'), "public"], [t('traces.visibility.trackable'), "trackable"], [t('traces.visibility.identifiable'), "identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)
</div>
</fieldset>
</div>
<div class='form-row'>
<label class="standard-label"><%= t '.visibility' %></label>
- <%= f.select :visibility, [[t('traces.visibility.private'),"private"],[t('traces.visibility.public'),"public"],[t('traces.visibility.trackable'),"trackable"],[t('traces.visibility.identifiable'),"identifiable"]] %>
+ <%= f.select :visibility, [[t('traces.visibility.private'), "private"], [t('traces.visibility.public'), "public"], [t('traces.visibility.trackable'), "trackable"], [t('traces.visibility.identifiable'), "identifiable"]] %>
<span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
</div>
</fieldset>
<% if @trace.inserted? %>
<tr>
<td><%= t '.points' %></td>
- <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
+ <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></td></tr>
<tr>
<td><%= t '.start_coordinates' %></td>
- <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%=link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx=> @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
+ <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t('.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
</tr>
<% end %>
<tr>
<br /><br />
-<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
+<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>
<div class="buttons">
<% if current_user == @trace.user %>
<%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>
<% if show_creator_name %>
<td class="<%= c1 %>"><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>
<% end %>
- <td class="<%= c1 %>"><%=h truncate(block.reason) %></td>
- <td class="<%= c1 %>"><%=h block_status(block) %></td>
+ <td class="<%= c1 %>"><%= h truncate(block.reason) %></td>
+ <td class="<%= c1 %>"><%= h block_status(block) %></td>
<td class="<%= c1 %>">
<% if block.revoker_id.nil? %>
<%= t('.not_revoked') %>
<th></th>
<% end %>
</tr>
- <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
+ <%= render :partial => 'block', :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
</table>
<ul class='secondary-actions'>
<% @title = t '.title', :name => h(@user.display_name) %>
<% content_for :heading do %>
<h1><%= raw t('.heading',
- :name => link_to(
- h(@user.display_name),
+ :name => link_to(h(@user.display_name),
user_path(@user))) %></h1>
<% end %>
<%= form_for(@user_block) do |f| %>
</p>
<p>
<%= label_tag 'user_block_period', t('.period') %><br />
- <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period] )) %>
+ <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>
</p>
<p>
<%= f.check_box :needs_view %>
-<p><%= t'.sorry', :id => params[:id] %></p>
+<p><%= t '.sorry', :id => params[:id] %></p>
<%= link_to t('.back'), user_blocks_path %>
<% content_for :heading do %>
<h1><%= raw t('.heading',
- :block_on => link_to(
- h(@user_block.user.display_name),
+ :block_on => link_to(h(@user_block.user.display_name),
user_path(@user_block.user)),
- :block_by => link_to(
- h(@user_block.creator.display_name),
+ :block_by => link_to(h(@user_block.creator.display_name),
user_path(@user_block.creator))) %></h1>
<% end %>
<% content_for :heading do %>
<h1><%= raw t('.heading',
- :block_on => link_to(
- h(@user_block.user.display_name),
+ :block_on => link_to(h(@user_block.user.display_name),
user_path(@user_block.user)),
- :block_by => link_to(
- h(@user_block.creator.display_name),
+ :block_by => link_to(h(@user_block.creator.display_name),
user_path(@user_block.creator))) %></h1>
<ul class='secondary-actions clearfix'>
<% if @user_block.ends_at > Time.now.getutc %>
<li><%= link_to t('.edit'), edit_user_block_path(@user_block) %></li>
<% end %>
<% if current_user and current_user.moderator? %>
- <li><%= link_to(t('.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
+ <li><%= link_to(t('.revoke'), { :controller => 'user_blocks', :action => 'revoke', :id => @user_block.id }) %></li>
<% end %>
<% end %>
<li><%= link_to t('.back'), user_blocks_path %></li>
<% if @user_block.revoker %>
<p>
- <b><%= t'.revoker' %></b>
+ <b><%= t '.revoker' %></b>
<%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
</p>
<% end %>
-<p><b><%= t'.created' %></b>: <%= raw t'.ago', :time => friendly_date(@user_block.created_at) %></p>
+<p><b><%= t '.created' %></b>: <%= raw t '.ago', :time => friendly_date(@user_block.created_at) %></p>
-<p><b><%= t'.status' %></b>: <%= block_status(@user_block) %></p>
+<p><b><%= t '.status' %></b>: <%= block_status(@user_block) %></p>
-<p><b><%= t'.reason' %></b></p>
+<p><b><%= t '.reason' %></b></p>
<div class="richtext"><%= @user_block.reason.to_html %></div>
: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})
+ :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
}
%>
-<%= content_tag :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %>
+<%= content_tag :div, :class => "contact-activity clearfix", :data => { :user => user_data } do %>
<%= user_thumbnail contact %>
<div class='activity-details'>
<p class='deemphasize'>
<%= t('users.show.latest edit', :ago => t('users.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
<% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
"<%= link_to(comment,
- {:controller => 'browse', :action => 'changeset', :id => changeset.id},
- {:title => t('changesets.changeset.view_changeset_details')})
- %>"
+ { :controller => 'browse', :action => 'changeset', :id => changeset.id },
+ { :title => t('changesets.changeset.view_changeset_details') }) %>"
<% else %>
- <%= t'changesets.changeset.no_edits' %>
+ <%= t 'changesets.changeset.no_edits' %>
<% end %>
</p>
<p>
<% if user.creation_ip %>
<%= raw t 'users.index.summary',
- :name => link_to(h(user.display_name), user_path(user)),
- :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
- :date => l(user.creation_time, :format => :friendly)
- %>
+ :name => link_to(h(user.display_name), user_path(user)),
+ :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
+ :date => l(user.creation_time, :format => :friendly) %>
<% else %>
<%= raw t 'users.index.summary_no_ip',
- :name => link_to(h(user.display_name), user_path(user)),
- :date => l(user.creation_time, :format => :friendly)
- %>
+ :name => link_to(h(user.display_name), user_path(user)),
+ :date => l(user.creation_time, :format => :friendly) %>
<% end %>
</p>
<div class="richtext"><%= user.description.to_html %></div>
<fieldset>
<div class="form-row">
<label class="standard-label"><%= t 'users.new.password' %></label>
- <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
+ <%= f.password_field :pass_crypt, { :value => '', :autocomplete => :off } %>
</div>
<div class="form-row">
<label class="standard-label"><%= t 'users.new.confirm password' %></label>
- <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
+ <%= f.password_field :pass_crypt_confirmation, { :value => '', :autocomplete => :off } %>
</div>
</fieldset>
<%= f.select :auth_provider, Auth::PROVIDERS %>
<%= f.text_field :auth_uid %>
<span class="form-help deemphasize">(<a href="<%= t '.openid.link' %>" target="_new"><%= t '.openid.link text' %></a>)</span>
- </diV>
+ </div>
</fieldset>
<fieldset class="form-divider">
<fieldset class="form-divider">
<div class='form-row location clearfix'>
<label class="standard-label"><%= t '.home location' %></label>
- <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<%end%> >
+ <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<% end %> >
<p class="message form-help deemphasize"><%= t '.no home location' %></p>
<div class='form-column'>
<label class="standard-label secondary"><%= t '.latitude' %></label>
</h1>
<p class='deemphasize'><%= t ".reconfirm_html",
- :reconfirm => url_for(:action => 'confirm_resend')%></p>
+ :reconfirm => url_for(:action => 'confirm_resend') %></p>
<% end %>
<tr>
<td colspan="2">
<%= t '.showing',
- :page => @user_pages.current_page.number,
- :first_item => @user_pages.current_page.first_item,
- :last_item => @user_pages.current_page.last_item,
- :items => @user_pages.item_count,
- :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1
- %>
+ :page => @user_pages.current_page.number,
+ :first_item => @user_pages.current_page.first_item,
+ :last_item => @user_pages.current_page.last_item,
+ :items => @user_pages.item_count,
+ :count => @user_pages.current_page.last_item - @user_pages.current_page.first_item + 1 %>
<% if @user_pages.page_count > 1 %>
| <%= raw pagination_links_each(@user_pages, {}) { |n| link_to n, @params.merge(:page => n) } %>
<% end %>
<%= form_tag :action => 'lost_password' do %>
<div class="standard-form">
<label class="standard-label"><%= t '.email address' %></label>
- <%= text_field('user', 'email', { :tabindex => 1} ) %>
+ <%= text_field('user', 'email', { :tabindex => 1 }) %>
<%= submit_tag t('.new password button'), :tabindex => 2 %>
</div>
<% end %>
<div class="standard-form">
<fieldset>
<label class="standard-label"><%= t '.password' %></label>
- <%= password_field(:user, :pass_crypt, {:value => '', :tabindex => 4}) %>
+ <%= password_field(:user, :pass_crypt, { :value => '', :tabindex => 4 }) %>
</fieldset>
<fieldset>
<label class="standard-label"><%= t '.confirm password' %></label>
- <%= password_field(:user, :pass_crypt_confirmation, {:value => '', :tabindex => 5}) %>
+ <%= password_field(:user, :pass_crypt_confirmation, { :value => '', :tabindex => 5 }) %>
</fieldset>
<%= submit_tag t('.reset'), :tabindex => 6 %>
</div>
<span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
</li>
<li>
- <%= link_to t('.my notes'), :controller => 'notes', :action=> 'mine' %>
+ <%= link_to t('.my notes'), :controller => 'notes', :action => 'mine' %>
</li>
<li>
<%= link_to t('.my traces'), :controller => 'traces', :action => 'mine' %>
<span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
</li>
<li>
- <%= link_to t('.my comments' ), :controller => 'diary_entries', :action => 'comments', :display_name => current_user.display_name %>
+ <%= link_to t('.my comments'), :controller => 'diary_entries', :action => 'comments', :display_name => current_user.display_name %>
</li>
<li>
<%= link_to t('.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
<span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
</li>
<li>
- <%= link_to t('.notes'), :controller => 'notes', :action=> 'mine' %>
+ <%= link_to t('.notes'), :controller => 'notes', :action => 'mine' %>
</li>
<li>
<%= link_to t('.traces'), :controller => 'traces', :action => 'index', :display_name => @user.display_name %>
: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"})
+ :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
}
%>
- <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %>
+ <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
<% end %>
<% friends = @user.friends.collect { |f| f.befriendee } %>
<li><%= link_to t('.friends_diaries'), friend_diaries_path %></li>
</ul>
<div id="friends-container">
- <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
+ <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
</div>
<% end %>
</div>
<li><%= link_to t('.nearby_diaries'), nearby_diaries_path %></li>
</ul>
<div id="nearbyusers">
- <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>
+ <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
</div>
<% end %>
</div>
<div class='header-illustration new-user-terms'></div>
<% end %>
-<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
+<%= form_tag({ :action => "save" }, { :class => " inner22 standard-form fillL" }) do %>
<!-- legale is <%= @legale %> -->
<div class='form-row horizontal-list'>
<label class="standard-label">
<%= check_box('user', 'consider_pd') %>
<%= t '.consider_pd' %>
</label>
- <span class="minorNote">(<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new)%>)</span>
+ <span class="minorNote">(<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new) %>)</span>
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
projects / rails.git / commitdiff