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

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

diff --git a/app/views/my/_sidebar.html.erb b/app/views/my/_sidebar.html.erb
new file mode 100644
index 000000000..407fe990f
--- /dev/null
+++ b/app/views/my/_sidebar.html.erb
@@ -0,0 +1,33 @@
+<h3><%=l(:label_my_account)%></h3>
+
+<p><%=l(:field_login)%>: <strong><%= link_to_user(@user, :format => :username) %></strong><br />
+<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
+
+
+<h4><%= l(:label_feeds_access_key) %></h4>
+
+<p>
+<% if @user.rss_token %>
+<%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
+<% else %>
+<%= l(:label_missing_feeds_access_key) %>
+<% end %>
+(<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
+</p>
+
+<% if Setting.rest_api_enabled? %>
+<h4><%= l(:label_api_access_key) %></h4>
+<div>
+  <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%>
+  <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre>
+</div>
+<%= javascript_tag("$('api-access-key').hide();") %>
+<p>
+<% if @user.api_token %>
+<%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %>
+<% else %>
+<%= l(:label_missing_api_access_key) %>
+<% end %>
+(<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
+</p>
+<% end %>
diff --git a/app/views/my/_sidebar.rhtml b/app/views/my/_sidebar.rhtml
deleted file mode 100644
index 407fe990f..000000000
--- a/app/views/my/_sidebar.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<h3><%=l(:label_my_account)%></h3>
-
-<p><%=l(:field_login)%>: <strong><%= link_to_user(@user, :format => :username) %></strong><br />
-<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
-
-
-<h4><%= l(:label_feeds_access_key) %></h4>
-
-<p>
-<% if @user.rss_token %>
-<%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
-<% else %>
-<%= l(:label_missing_feeds_access_key) %>
-<% end %>
-(<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
-</p>
-
-<% if Setting.rest_api_enabled? %>
-<h4><%= l(:label_api_access_key) %></h4>
-<div>
-  <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%>
-  <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre>
-</div>
-<%= javascript_tag("$('api-access-key').hide();") %>
-<p>
-<% if @user.api_token %>
-<%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %>
-<% else %>
-<%= l(:label_missing_api_access_key) %>
-<% end %>
-(<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
-</p>
-<% end %>