Commit c113c394 authored by jplang's avatar jplang
Browse files

Removed unneeded #h calls in views.

git-svn-id: https://svn.redmine.org/redmine/trunk@14043 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e3498243
......@@ -9,7 +9,7 @@
<dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
<%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
<span class="time"><%= format_time(e.event_datetime, false) %></span>
<%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
<%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
<%= link_to format_activity_title(e.event_title), e.event_url %>
</dt>
<dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
......
......@@ -4,11 +4,11 @@
<table class="list plugins">
<% @plugins.each do |plugin| %>
<tr id="plugin-<%= plugin.id %>" class="<%= cycle('odd', 'even') %>">
<td class="name"><span class="name"><%=h plugin.name %></span>
<%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %>
<%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
<td class="name"><span class="name"><%= plugin.name %></span>
<%= content_tag('span', plugin.description, :class => 'description') unless plugin.description.blank? %>
<%= content_tag('span', link_to(plugin.url, plugin.url), :class => 'url') unless plugin.url.blank? %>
</td>
<td class="author"><%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %></td>
<td class="author"><%= plugin.author_url.blank? ? plugin.author : link_to(plugin.author, plugin.author_url) %></td>
<td class="version"><span class="icon"><%= plugin.version %></span></td>
<td class="configure"><%= link_to(l(:button_configure), plugin_settings_path(plugin)) if plugin.configurable? %></td>
</tr>
......
......@@ -11,7 +11,7 @@
:controller => 'attachments', :action => 'show',
:id => attachment, :filename => attachment.filename %>
<% end %>
<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
<%= " - #{attachment.description}" unless attachment.description.blank? %>
<span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
<% if options[:deletable] %>
<%= link_to image_tag('delete.png'), attachment_path(attachment),
......@@ -21,7 +21,7 @@
:title => l(:button_delete) %>
<% end %>
<% if options[:author] %>
<span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
<span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
<% end %>
</p>
<% end %>
......
<h2><%=h @attachment.filename %></h2>
<div class="attachments">
<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
<span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
......
......@@ -11,7 +11,7 @@
<td colspan="2">
<span class="icon icon-attachment"><%= attachment.filename_was %></span>
<span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
<span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
<span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
</td>
</tr>
<tr id="attachment-<%= attachment.id %>">
......
<h2><%=h @attachment.filename %></h2>
<div class="attachments">
<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
<span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
......
......@@ -15,10 +15,10 @@
<tbody>
<% for source in @auth_sources %>
<tr id="auth-source-<%= source.id %>" class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to(h(source.name), :action => 'edit', :id => source)%></td>
<td><%= h source.auth_method_name %></td>
<td><%= h source.host %></td>
<td><%= h source.users.count %></td>
<td class="name"><%= link_to(source.name, :action => 'edit', :id => source)%></td>
<td><%= source.auth_method_name %></td>
<td><%= source.host %></td>
<td><%= source.users.count %></td>
<td class="buttons">
<%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-test' %>
<%= delete_link auth_source_path(source) %>
......
......@@ -11,7 +11,7 @@
<% Board.board_tree(@boards) do |board, level| %>
<tr class="<%= cycle 'odd', 'even' %>">
<td class="name" style="padding-left: <%= level * 18 %>px;">
<%= link_to h(board.name), project_board_path(board.project, board), :class => "board" %><br />
<%= link_to board.name, project_board_path(board.project, board), :class => "board" %><br />
<%=h board.description %>
</td>
<td class="topic-count"><%= board.topics_count %></td>
......
......@@ -10,7 +10,7 @@
<div id="add-message" style="display:none;">
<% if User.current.allowed_to?(:add_messages, @board.project) %>
<h2><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h2>
<h2><%= link_to @board.name, project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h2>
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'messages/form', :locals => {:f => f} %>
<p><%= submit_tag l(:button_create) %>
......@@ -21,8 +21,8 @@
<% end %>
</div>
<h2><%=h @board.name %></h2>
<p class="subtitle"><%=h @board.description %></p>
<h2><%= @board.name %></h2>
<p class="subtitle"><%= @board.description %></p>
<% if @topics.any? %>
<table class="list messages">
......@@ -36,7 +36,7 @@
<tbody>
<% @topics.each do |topic| %>
<tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
<td class="subject"><%= link_to h(topic.subject), board_message_path(@board, topic) %></td>
<td class="subject"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
<td class="author"><%= link_to_user(topic.author) %></td>
<td class="created_on"><%= format_time(topic.created_on) %></td>
<td class="reply-count"><%= topic.replies_count %></td>
......
<h2><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
<h2><%= @query.new_record? ? l(:label_calendar) : @query.name %></h2>
<%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
:method => :get, :id => 'query_form') do %>
......
......@@ -12,13 +12,13 @@ while day <= calendar.enddt %>
<% calendar.events_on(day).each do |i| %>
<% if i.is_a? Issue %>
<div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
<%= h("#{i.project} -") unless @project && @project == i.project %>
<%= "#{i.project} -" unless @project && @project == i.project %>
<%= link_to_issue i, :truncate => 30 %>
<span class="tip"><%= render_issue_tooltip i %></span>
</div>
<% else %>
<span class="icon icon-package">
<%= h("#{i.project} -") unless @project && @project == i.project %>
<%= "#{i.project} -" unless @project && @project == i.project %>
<%= link_to_version i%>
</span>
<% end %>
......
<h2><%=h @status %></h2>
<h2><%= @status %></h2>
<% if @message.present? %>
<p id="errorExplanation"><%=h @message %></p>
<p id="errorExplanation"><%= @message %></p>
<% end %>
<p><a href="javascript:history.back()"><%= l(:button_back) %></a></p>
......
......@@ -14,7 +14,7 @@
<a href="#" class="submenu"><%= l(:field_status) %></a>
<ul>
<% @allowed_statuses.each do |s| -%>
<li><%= context_menu_link h(s.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {:status_id => s}, :back_url => @back), :method => :post,
<li><%= context_menu_link s.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {:status_id => s}, :back_url => @back), :method => :post,
:selected => (@issue && s == @issue.status), :disabled => !@can[:edit] %></li>
<% end -%>
</ul>
......@@ -26,7 +26,7 @@
<a href="#" class="submenu"><%= l(:field_tracker) %></a>
<ul>
<% @trackers.each do |t| -%>
<li><%= context_menu_link h(t.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'tracker_id' => t}, :back_url => @back), :method => :post,
<li><%= context_menu_link t.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'tracker_id' => t}, :back_url => @back), :method => :post,
:selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
<% end -%>
</ul>
......@@ -38,7 +38,7 @@
<a href="#" class="submenu"><%= l(:field_priority) %></a>
<ul>
<% @priorities.each do |p| -%>
<li><%= context_menu_link h(p.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'priority_id' => p}, :back_url => @back), :method => :post,
<li><%= context_menu_link p.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'priority_id' => p}, :back_url => @back), :method => :post,
:selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
<% end -%>
</ul>
......@@ -68,7 +68,7 @@
:disabled => !@can[:edit] %></li>
<% end %>
<% @assignables.each do |u| -%>
<li><%= context_menu_link h(u.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'assigned_to_id' => u}, :back_url => @back), :method => :post,
<li><%= context_menu_link u.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'assigned_to_id' => u}, :back_url => @back), :method => :post,
:selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:edit] %></li>
<% end -%>
<li><%= context_menu_link l(:label_nobody), bulk_update_issues_path(:ids => @issue_ids, :issue => {'assigned_to_id' => 'none'}, :back_url => @back), :method => :post,
......@@ -82,7 +82,7 @@
<a href="#" class="submenu"><%= l(:field_category) %></a>
<ul>
<% @project.issue_categories.each do |u| -%>
<li><%= context_menu_link h(u.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'category_id' => u}, :back_url => @back), :method => :post,
<li><%= context_menu_link u.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'category_id' => u}, :back_url => @back), :method => :post,
:selected => (@issue && u == @issue.category), :disabled => !@can[:edit] %></li>
<% end -%>
<li><%= context_menu_link l(:label_none), bulk_update_issues_path(:ids => @issue_ids, :issue => {'category_id' => 'none'}, :back_url => @back), :method => :post,
......@@ -105,7 +105,7 @@
<% @options_by_custom_field.each do |field, options| %>
<li class="folder cf_<%= field.id %>">
<a href="#" class="submenu"><%= h(field.name) %></a>
<a href="#" class="submenu"><%= field.name %></a>
<ul>
<% options.each do |text, value| %>
<li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
......
......@@ -14,7 +14,7 @@
<a href="#" class="submenu"><%= l(:field_activity) %></a>
<ul>
<% @activities.each do |u| -%>
<li><%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post,
<li><%= context_menu_link u.name, {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post,
:selected => (@time_entry && u == @time_entry.activity), :disabled => !@can[:edit] %></li>
<% end -%>
<li><%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post,
......@@ -25,7 +25,7 @@
<% @options_by_custom_field.each do |field, options| %>
<li class="folder cf_<%= field.id %>">
<a href="#" class="submenu"><%= h(field.name) %></a>
<a href="#" class="submenu"><%= field.name %></a>
<ul>
<% options.each do |text, value| %>
<li><%= bulk_update_time_entry_custom_field_context_menu_link(field, text, value || text) %></li>
......
......@@ -94,7 +94,7 @@ when "IssueCustomField" %>
(@custom_field.trackers.include? tracker),
:id => "custom_field_tracker_ids_#{tracker.id}" %>
<label class="no-css" for="custom_field_tracker_ids_<%=tracker.id%>">
<%= h(tracker.name) %>
<%= tracker.name %>
</label>
<% end %>
<%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
......@@ -103,7 +103,7 @@ when "IssueCustomField" %>
<fieldset class="box" id="custom_field_project_ids"><legend><%= l(:label_project_plural) %></legend>
<%= render_project_nested_lists(Project.all) do |p|
content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, @custom_field.projects.to_a.include?(p), :id => nil) + ' ' + h(p))
content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, @custom_field.projects.to_a.include?(p), :id => nil) + ' ' + p)
end %>
<%= hidden_field_tag('custom_field[project_ids][]', '', :id => nil) %>
<p><%= check_all_links 'custom_field_project_ids' %></p>
......
......@@ -13,7 +13,7 @@
<tbody>
<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %></td>
<td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
<td><%= l(custom_field.format.label) %></td>
<td><%= checked_image custom_field.is_required? %></td>
<% if tab[:name] == 'IssueCustomField' %>
......
<h4><%= link_to h(document.title), document_path(document) %></h4>
<h4><%= link_to document.title, document_path(document) %></h4>
<p><em><%= format_time(document.updated_on) %></em></p>
<div class="wiki">
......
......@@ -7,9 +7,9 @@
<% end %>
</div>
<h2><%=h @document.title %></h2>
<h2><%= @document.title %></h2>
<p><em><%=h @document.category.name %><br />
<p><em><%= @document.category.name %><br />
<%= format_date @document.created_on %></em></p>
<% if @document.custom_field_values.any? %>
......
......@@ -15,7 +15,7 @@
</tr></thead>
<% enumerations.each do |enumeration| %>
<tr class="<%= cycle('odd', 'even') %>">
<td class="name"><%= link_to h(enumeration), edit_enumeration_path(enumeration) %></td>
<td class="name"><%= link_to enumeration, edit_enumeration_path(enumeration) %></td>
<td class="tick"><%= checked_image enumeration.is_default? %></td>
<td class="tick"><%= checked_image enumeration.active? %></td>
<td class="reorder"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %></td>
......
......@@ -21,7 +21,7 @@
<% if container.is_a?(Version) -%>
<tr>
<th colspan="6">
<%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
<%= link_to(container, {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
</th>
</tr>
<% end -%>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment