From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 10:45:51 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/my/blocks/_timelog.rhtml.
X-Git-Tag: 1.3.0~992
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e673c5d13c871f6a660a44b5dd8fb9c0b8dcac58;p=redmine.git

rename .rhtml to .html.erb of app/views/my/blocks/_timelog.rhtml.

:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6971 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
new file mode 100644
index 000000000..e3735357e
--- /dev/null
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -0,0 +1,52 @@
+<h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
+<% 
+entries = TimeEntry.find(:all,
+				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
+				:include => [:activity, :project, {:issue => [:tracker, :status]}],
+				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
+entries_by_day = entries.group_by(&:spent_on)
+%>
+
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
+</div>
+
+<% if entries.any? %>
+<table class="list time-entries">
+<thead><tr>
+<th><%= l(:label_activity) %></th>
+<th><%= l(:label_project) %></th>
+<th><%= l(:field_comments) %></th>
+<th><%= l(:field_hours) %></th>
+<th></th>
+</tr></thead>
+<tbody>
+<% entries_by_day.keys.sort.reverse.each do |day| %>
+    <tr class="odd">
+    <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
+    <td colspan="2"></td>
+    <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
+    <td></td>
+    </tr>
+    <% entries_by_day[day].each do |entry| -%>
+    <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
+    <td class="activity"><%=h entry.activity %></td>
+    <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
+    <td class="comments"><%=h entry.comments %></td>
+    <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
+    <td align="center">
+    <% if entry.editable_by?(@user) -%>
+        <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+                                           :title => l(:button_edit) %>
+        <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+                                             :confirm => l(:text_are_you_sure),
+                                             :method => :delete,
+                                             :title => l(:button_delete) %>
+    <% end -%>
+    </td>
+    </tr>
+    <% end -%>
+<% end -%>
+</tbody>
+</table>
+<% end %>
diff --git a/app/views/my/blocks/_timelog.rhtml b/app/views/my/blocks/_timelog.rhtml
deleted file mode 100644
index e3735357e..000000000
--- a/app/views/my/blocks/_timelog.rhtml
+++ /dev/null
@@ -1,52 +0,0 @@
-<h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
-<% 
-entries = TimeEntry.find(:all,
-				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
-				:include => [:activity, :project, {:issue => [:tracker, :status]}],
-				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
-entries_by_day = entries.group_by(&:spent_on)
-%>
-
-<div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
-</div>
-
-<% if entries.any? %>
-<table class="list time-entries">
-<thead><tr>
-<th><%= l(:label_activity) %></th>
-<th><%= l(:label_project) %></th>
-<th><%= l(:field_comments) %></th>
-<th><%= l(:field_hours) %></th>
-<th></th>
-</tr></thead>
-<tbody>
-<% entries_by_day.keys.sort.reverse.each do |day| %>
-    <tr class="odd">
-    <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
-    <td colspan="2"></td>
-    <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
-    <td></td>
-    </tr>
-    <% entries_by_day[day].each do |entry| -%>
-    <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
-    <td class="activity"><%=h entry.activity %></td>
-    <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
-    <td class="comments"><%=h entry.comments %></td>
-    <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
-    <td align="center">
-    <% if entry.editable_by?(@user) -%>
-        <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
-                                           :title => l(:button_edit) %>
-        <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
-                                             :confirm => l(:text_are_you_sure),
-                                             :method => :delete,
-                                             :title => l(:button_delete) %>
-    <% end -%>
-    </td>
-    </tr>
-    <% end -%>
-<% end -%>
-</tbody>
-</table>
-<% end %>