From 9bc94cba283d1999b6ed9b31194be7a986d56809 Mon Sep 17 00:00:00 2001
From: tohosaku <tohosaku@users.osdn.me>
Date: Sat, 15 Jan 2022 12:59:30 +0000
Subject: [PATCH 5/5] Replace tags with helper

---
 app/views/activities/_activities.html.erb            | 12 ++++++------
 app/views/admin/info.html.erb                        |  2 +-
 app/views/attachments/edit_all.html.erb              |  2 +-
 app/views/boards/show.html.erb                       |  2 +-
 app/views/common/_calendar.html.erb                  |  4 ++--
 app/views/custom_field_enumerations/index.html.erb   |  2 +-
 app/views/issue_statuses/index.html.erb              |  4 ++--
 app/views/issues/_attributes.html.erb                |  2 +-
 app/views/issues/index.html.erb                      |  4 ++--
 app/views/messages/show.html.erb                     |  2 +-
 app/views/projects/_members_box.html.erb             |  2 +-
 app/views/projects/index.html.erb                    |  4 ++--
 app/views/projects/settings/_members.html.erb        |  2 +-
 app/views/projects/settings/_versions.html.erb       |  2 +-
 app/views/projects/show.html.erb                     | 12 ++++++------
 app/views/roles/index.html.erb                       |  4 ++--
 app/views/search/index.html.erb                      |  4 ++--
 app/views/settings/_repositories.html.erb            |  2 +-
 app/views/trackers/index.html.erb                    |  4 ++--
 app/views/versions/index.html.erb                    |  4 +++-
 .../app/views/example/say_goodbye.html.erb           |  2 +-
 .../app/views/example/say_hello.html.erb             |  2 +-
 22 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/app/views/activities/_activities.html.erb b/app/views/activities/_activities.html.erb
index aaeea76bc..9eacf6d27 100644
--- a/app/views/activities/_activities.html.erb
+++ b/app/views/activities/_activities.html.erb
@@ -3,12 +3,12 @@
 <h3><%= format_activity_day(day) %></h3>
 <dl>
 <% sort_activity_events(events_by_day[day]).each do |e, in_group| -%>
-  <dt class="<%= e.event_type %> icon icon-<%= 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) if e.respond_to?(:event_author) %>
-  <span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= 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>
+  <%= tag.dt class: [e.event_type, :icon, "icon-#{e.event_type}", ("grouped" if in_group), (User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author) ? 'me' : nil] do %>
+    <%= avatar(e.event_author) if e.respond_to?(:event_author) %>
+    <span class="time"><%= format_time(e.event_datetime, false) %></span>
+    <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
+    <%= link_to format_activity_title(e.event_title), e.event_url %>
+  <% end %>
   <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
   <span class="author"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %></span></dd>
 <% end -%>
diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb
index 2ff8de50d..2a342e643 100644
--- a/app/views/admin/info.html.erb
+++ b/app/views/admin/info.html.erb
@@ -6,7 +6,7 @@
 <% @checklist.each do |label, result| %>
   <tr>
     <td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td>
-    <td class="tick"><span class="icon-only <%= (result ? 'icon-ok' : 'icon-error') %>"></span></td>
+    <td class="tick"><%= tag.span class: ['icon-only', result ? 'icon-ok' : 'icon-error' ] %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/attachments/edit_all.html.erb b/app/views/attachments/edit_all.html.erb
index 47ecc6a02..c2cfe132c 100644
--- a/app/views/attachments/edit_all.html.erb
+++ b/app/views/attachments/edit_all.html.erb
@@ -11,7 +11,7 @@
   <% @attachments.each do |attachment| %>
     <tr>
       <td colspan="2">
-        <span class="icon icon-attachment"><%= attachment.filename_was %></span>
+        <%= tag.span attachment.filename_was, class: 'icon icon-attachment' %>
         <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
         <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
       </td>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index bc8c24c3d..f0e6db163 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -38,7 +38,7 @@
   <tbody>
   <% @topics.each do |topic| %>
     <tr id="message-<%= topic.id %>" class="message <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject icon <%= 'icon-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
+      <%= tag.td link_to(topic.subject, board_message_path(@board, topic)), class: ['subject', 'icon', ('icon-sticky' if topic.sticky?), ('icon-locked' if topic.locked?)] %>
       <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>
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 63cb43c97..61f475f25 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -29,10 +29,10 @@
   <%= check_box_tag 'ids[]', i.id, false, :style => 'display:none;', :id => nil %>
   </div>
   <% else %>
-  <span class="icon icon-package">
+  <%= tag.span(class: 'icon icon-package') do %>
     <%= "#{i.project} -" unless @project && @project == i.project %>
     <%= link_to_version i %>
-  </span>
+  <% end %>
   <% end %>
 <% end %>
 </td>
diff --git a/app/views/custom_field_enumerations/index.html.erb b/app/views/custom_field_enumerations/index.html.erb
index 83e9d59c9..fb942ded5 100644
--- a/app/views/custom_field_enumerations/index.html.erb
+++ b/app/views/custom_field_enumerations/index.html.erb
@@ -6,7 +6,7 @@
   <ul id="custom_field_enumerations" class="flat">
   <% @custom_field.enumerations.each_with_index do |value, position| %>
     <li>
-      <span class="icon-only icon-sort-handle sort-handle"></span>
+      <%= tag.span class: 'icon-only icon-sort-handle sort-handle' %>
       <%= hidden_field_tag "custom_field_enumerations[#{value.id}][position]", position, :class => 'position' %>
       <%= text_field_tag "custom_field_enumerations[#{value.id}][name]", value.name, :size => 40 %>
       <%= hidden_field_tag "custom_field_enumerations[#{value.id}][active]", 0 %>
diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb
index c9f120cbd..03e10ed31 100644
--- a/app/views/issue_statuses/index.html.erb
+++ b/app/views/issue_statuses/index.html.erb
@@ -25,9 +25,9 @@
   <td><%= checked_image status.is_closed? %></td>
   <td>
     <% unless WorkflowTransition.where('old_status_id = ? OR new_status_id = ?', status.id, status.id).exists? %>
-      <span class="icon icon-warning">
+      <%= tag.span(class: 'icon icon-warning') do %>
         <%= l(:text_status_no_workflow) %> (<%= link_to l(:button_edit), edit_workflows_path(:used_statuses_only => 0) %>)
-      </span>
+      <% end %>
     <% end %>
   </td>
   <td class="buttons">
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index b5003c436..895bfa953 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -7,7 +7,7 @@
   <%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
                 :onchange => "updateIssueFrom('#{escape_javascript(update_issue_form_path(@project, @issue))}', this)" %>
   <% if @issue.transition_warning %>
-    <span class="icon-only icon-warning" title="<%= @issue.transition_warning %>"><%= @issue.transition_warning %></span>
+    <%= tag.span @issue.transition_warning, class: 'icon-only icon-warning', title: @issue.transition_warning %>
   <% end %>
 </p>
 <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 5a4d6b2c4..2c2b10e04 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -59,9 +59,9 @@
   <% end %>
   <%= export_csv_encoding_select_tag %>
   <% if @issue_count > Setting.issues_export_limit.to_i %>
-  <p class="icon icon-warning">
+  <%= tag.p(class: 'icon icon-warning') do %>
     <%= l(:setting_issues_export_limit) %>: <%= Setting.issues_export_limit.to_i %>
-  </p>
+  <% end %>
   <% end %>
   <p class="buttons">
     <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);", :data => { :disable_with => false } %>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 6c902d087..0f0409d9f 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -35,7 +35,7 @@
 
 <% unless @replies.empty? %>
 <div id="replies">
-<h3 class="comments icon icon-comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
+<%= tag.h3 "#{l(:label_reply_plural)}(#{@reply_count})", class: 'comments icon icon-comments' %>
 <% if !@topic.locked? && authorize_for('messages', 'reply') && @replies.size >= 3 %>
   <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content', :scroll => "message_content" %></p>
 <% end %>
diff --git a/app/views/projects/_members_box.html.erb b/app/views/projects/_members_box.html.erb
index b5bb46e3a..449bb8517 100644
--- a/app/views/projects/_members_box.html.erb
+++ b/app/views/projects/_members_box.html.erb
@@ -1,6 +1,6 @@
   <% if @principals_by_role.any? %>
   <div class="members box">
-    <h3 class="icon icon-group"><%=l(:label_member_plural)%></h3>
+    <%= tag.h3 l(:label_member_plural), class: 'icon icon-group' %>
     <% @principals_by_role.keys.sort.each do |role| %>
       <p><span class="label"><%= role %>:</span> <%= @principals_by_role[role].sort.collect{|p| link_to_principal(p, :class => p.is_a?(Group) ? 'icon icon-group' : nil)}.join(", ").html_safe %></p>
     <% end %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 3bd665640..4d6ca05a6 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -20,8 +20,8 @@
 
 <% if User.current.logged? %>
 <p style="text-align:right;">
-<span class="icon icon-user my-project"><%= l(:label_my_projects) %></span>
-<span class="icon icon-bookmarked-project"><%= l(:label_my_bookmarks) %></span>
+<%= tag.span l(:label_my_projects), class: 'icon icon-user my-project' %>
+<%= tag.span l(:label_my_bookmarks), class: 'icon icon-bookmarked-project' %>
 </p>
 <% end %>
 
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index 811b0051c..b59d4009b 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -19,7 +19,7 @@
   <% members.each do |member| %>
   <% next if member.new_record? %>
   <tr id="member-<%= member.id %>" class="member">
-  <td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+  <%= tag.td link_to_user(member.principal), class: "name icon icon-#{member.principal.class.name.downcase}" %>
   <td class="roles">
     <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
     <div id="member-<%= member.id %>-form"></div>
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
index 80d67cc24..0f763acdd 100644
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -34,7 +34,7 @@
   <tbody>
 <% @versions.each do |version| %>
     <tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>">
-    <td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
+    <%= tag.td link_to_version(version), :class => ['name', ('icon icon-shared' if version.project != @project)] %>
     <td class="tick"><%= checked_image(version.id == @project.default_version_id) %></td>
     <td class="date"><%= format_date(version.effective_date) %></td>
     <td class="description"><%= version.description %></td>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 5c7ef440c..8e4faa94b 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -24,7 +24,7 @@
 <h2><%=l(:label_overview)%></h2>
 
 <% unless @project.active? %>
-  <p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
+  <p class="warning"><%= tag.span l(:text_project_closed), class: 'icon icon-lock' %></p>
 <% end %>
 
 <div class="splitcontent">
@@ -47,13 +47,13 @@
 
   <% if User.current.allowed_to?(:view_issues, @project) %>
   <div class="issues box">
-    <h3 class="icon icon-issue">
+    <%= tag.h3(class: 'icon icon-issue') do %>
       <%=l(:label_issue_tracking)%>&nbsp;
       <%= link_to l(:label_details),
             project_issues_report_details_path(@project, :detail => 'tracker'),
             :class => 'icon-only icon-zoom-in',
             :title => l(:label_details) %>
-    </h3>
+    <% end %>
     <% if @trackers.present? %>
     <table class="list issue-report">
       <thead>
@@ -99,7 +99,7 @@
 
   <% if User.current.allowed_to?(:view_time_entries, @project) %>
   <div class="spent_time box">
-    <h3 class="icon icon-time"><%= l(:label_time_tracking) %></h3>
+    <%= tag.h3 l(:label_time_tracking), class: 'icon icon-time' %>
     <ul>
       <% if @total_estimated_hours.present? %>
         <li><%= l(:field_estimated_hours) %>: <%= l_hours(@total_estimated_hours) %>
@@ -123,7 +123,7 @@
 <div class="splitcontentright">
   <% if @news.any? && authorize_for('news', 'index') %>
   <div class="news box">
-    <h3 class="icon icon-news"><%=l(:label_news_latest)%></h3>
+    <%= tag.h3 l(:label_news_latest), class: 'icon icon-news' %>
     <%= render :partial => 'news/news', :collection => @news %>
     <p><%= link_to l(:label_news_view_all), project_news_index_path(@project) %></p>
   </div>
@@ -133,7 +133,7 @@
 
   <% if @subprojects.any? %>
   <div class="projects box">
-    <h3 class="icon icon-projects"><%=l(:label_subproject_plural)%></h3>
+    <%= tag.h3 l(:label_subproject_plural), class: 'icon icon-projects' %>
 	<ul class="subprojects">
 	  <% @subprojects.each do |project| %>
 	  <li><%= link_to(project.name, project_path(project), :class => project.css_classes).html_safe %></li>
diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
index f76e90466..208fabf5e 100644
--- a/app/views/roles/index.html.erb
+++ b/app/views/roles/index.html.erb
@@ -17,9 +17,9 @@
   <td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, edit_role_path(role))) %></td>
   <td>
     <% unless role.builtin? || role.workflow_rules.exists? %>
-      <span class="icon icon-warning">
+      <%= tag.span(class: 'icon icon-warning') do %>
         <%= l(:text_role_no_workflow) %> (<%= link_to l(:button_edit), edit_workflows_path(:role_id => role) %>)
-      </span>
+      <% end %>
     <% end %>
   </td>
   <td class="buttons">
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index a9eb6cce1..10fbe0959 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -48,10 +48,10 @@
     <h3><%= l(:label_result_plural) %> (<%= @result_count %>)</h3>
     <dl id="search-results">
       <% @results.each do |e| %>
-        <dt class="<%= e.event_type %> icon icon-<%= e.event_type %>">
+        <%= tag.dt class: "#{e.event_type} icon icon-#{e.event_type}" do %>
           <%= content_tag('span', e.project, :class => 'project') unless @project == e.project %>
           <%= link_to(highlight_tokens(e.event_title.truncate(255), @tokens), e.event_url) %>
-        </dt>
+        <% end %>
         <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
         <span class="author"><%= format_time(e.event_datetime) %></span></dd>
       <% end %>
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
index adac52fc7..48108dab1 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -23,7 +23,7 @@
       </td>
       <td>
         <% if enabled %>
-          <span class="icon <%= (scm_class.scm_available ? 'icon-ok' : 'icon-error') %>"></span>
+          <%= tag.span class: ['icon', (scm_class.scm_available ? 'icon-ok' : 'icon-error')] %>
           <%= scm_class.scm_command %>
         <% end %>
       </td>
diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb
index 84093e943..7d46669c4 100644
--- a/app/views/trackers/index.html.erb
+++ b/app/views/trackers/index.html.erb
@@ -21,9 +21,9 @@
   <td class="description"><%= tracker.description %></td>
   <td>
     <% unless tracker.workflow_rules.exists? %>
-      <span class="icon icon-warning">
+      <%= tag.span(class: 'icon icon-warning') do %>
         <%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), edit_workflows_path(:tracker_id => tracker) %>)
-      </span>
+      <% end %>
     <% end %>
   </td>
   <td class="buttons">
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 382133e93..2f2f67c30 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -22,7 +22,9 @@
       </div>
     <% end %>
     <header>
-      <h3 class="icon icon-package version inline-flex"><%= link_to_version version, :name => version_anchor(version) %></h3>
+      <%= tag.h3(class: 'icon icon-package version inline-flex') do %>
+        <%= link_to_version version, :name => version_anchor(version) %>
+      <% end %>
       <span class="badge badge-status-<%= version.status %>"><%= l("version_status_#{version.status}") %></span>
     </header>
     <%= render :partial => 'versions/overview', :locals => {:version => version} %>
diff --git a/extra/sample_plugin/app/views/example/say_goodbye.html.erb b/extra/sample_plugin/app/views/example/say_goodbye.html.erb
index 3307e8770..69ccf2854 100644
--- a/extra/sample_plugin/app/views/example/say_goodbye.html.erb
+++ b/extra/sample_plugin/app/views/example/say_goodbye.html.erb
@@ -1,6 +1,6 @@
 <h2>Good Bye</h2>
 
-<p class="icon icon-example-works"><%= l(:text_say_goodbye) %></p>
+<%= tag.p l(:text_say_goodbye), :class => 'icon icon-example-works' %>
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'example', :plugin => 'sample_plugin', :media => "screen" %>
diff --git a/extra/sample_plugin/app/views/example/say_hello.html.erb b/extra/sample_plugin/app/views/example/say_hello.html.erb
index 505bd2f70..9f7e9c9c2 100644
--- a/extra/sample_plugin/app/views/example/say_hello.html.erb
+++ b/extra/sample_plugin/app/views/example/say_hello.html.erb
@@ -1,6 +1,6 @@
 <h2>Hello</h2>
 
-<p class="icon icon-example-works"><%= l(:text_say_hello) %></p>
+<%= tag.p l(:text_say_hello), :class => 'icon icon-example-works' %>
 
 <p><label>Example setting</label>: <%= @value %></p>
 
-- 
2.30.2