From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 24 Aug 2011 00:04:57 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/common/_calendar.rhtml.
X-Git-Tag: 1.3.0~1416
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=86c8ae68dabc3746387f89ff092a078a7326ee17;p=redmine.git

rename .rhtml to .html.erb of app/views/common/_calendar.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@6545 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
new file mode 100644
index 000000000..14d26badd
--- /dev/null
+++ b/app/views/common/_calendar.html.erb
@@ -0,0 +1,32 @@
+<table class="cal">
+<thead>
+<tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
+</thead>
+<tbody>
+<tr>
+<% day = calendar.startdt
+while day <= calendar.enddt %>
+<%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
+<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
+<p class="day-num"><%= day.day %></p>	
+<% 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 %>
+  <%= 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 %>
+    <%= link_to_version i%>
+  </span>
+  <% end %>
+<% end %>
+</td>
+<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
+<% day = day + 1
+end %>
+</tr>
+</tbody>
+</table>
diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml
deleted file mode 100644
index 14d26badd..000000000
--- a/app/views/common/_calendar.rhtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<table class="cal">
-<thead>
-<tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
-</thead>
-<tbody>
-<tr>
-<% day = calendar.startdt
-while day <= calendar.enddt %>
-<%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
-<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
-<p class="day-num"><%= day.day %></p>	
-<% 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 %>
-  <%= 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 %>
-    <%= link_to_version i%>
-  </span>
-  <% end %>
-<% end %>
-</td>
-<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
-<% day = day + 1
-end %>
-</tr>
-</tbody>
-</table>