[donrails commit] r393 - in trunk: . app/views/notes app/views/notes/MT app/views/notes/default app/views/shared/MT

1 view
Skip to first unread message

codesite...@google.com

unread,
Dec 25, 2008, 4:49:38 PM12/25/08
to donr...@googlegroups.com
Author: yasuhiro
Date: Thu Dec 25 13:14:04 2008
New Revision: 393

Modified:
trunk/ChangeLog
trunk/app/views/notes/MT/noteslist.rhtml
trunk/app/views/notes/MT/show_enrollment.rhtml
trunk/app/views/notes/MT/show_title.rhtml
trunk/app/views/notes/comment_form.rhtml
trunk/app/views/notes/comment_form_a.rhtml
trunk/app/views/notes/default/noteslist.rhtml
trunk/app/views/notes/default/show_enrollment.rhtml
trunk/app/views/notes/default/show_title.rhtml
trunk/app/views/notes/pick_article_a2.rhtml
trunk/app/views/notes/pick_enrollment_a.rhtml
trunk/app/views/notes/recent_category_a.rhtml
trunk/app/views/notes/recent_category_title_a.rhtml
trunk/app/views/shared/MT/title-articles2no.rhtml

Log:
Change "render :template =>.." to "render :file =>.." for applying
rails2.2.2

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Thu Dec 25 13:14:04 2008
@@ -1,3 +1,7 @@
+2008-12-26 ARAKI Yasuhiro <a...@debian.org>
+
+ * Change "render :template =>.." to "render :file =>.." for applying
rails 2.2.2.
+
2008-12-25 ARAKI Yasuhiro <a...@debian.org>

* Change article order at showing category and subcategories. Now shows
reverse id.

Modified: trunk/app/views/notes/MT/noteslist.rhtml
==============================================================================
--- trunk/app/views/notes/MT/noteslist.rhtml (original)
+++ trunk/app/views/notes/MT/noteslist.rhtml Thu Dec 25 13:14:04 2008
@@ -24,12 +24,12 @@
</div><!-- the end of 'entry-body' -->
</div><!-- the end of 'entry-content' -->
<p class="entry-footer">
- <%= render :template =>
don_get_theme("shared/simple-category"), :locals => {:article => article} %>
- <%= render :template => don_get_theme("shared/post-footer"), :locals
=> {:article => article} %>
+ <%= render :file => don_get_theme("shared/simple-category"), :locals
=> {:article => article} %>
+ <%= render :file => don_get_theme("shared/post-footer"), :locals =>
{:article => article} %>
<span class="separator">|</span>
- <%= render :template => don_get_theme("shared/permlink"), :locals =>
{:article => article} %> |
- <%= render :template =>
don_get_theme("shared/simple-comment"), :locals => {:article => article} %>
|
- <%= render :template =>
don_get_theme("shared/simple-trackback"), :locals => {:article => article}
+ <%= render :file => don_get_theme("shared/permlink"), :locals =>
{:article => article} %> |
+ <%= render :file => don_get_theme("shared/simple-comment"), :locals =>
{:article => article} %> |
+ <%= render :file => don_get_theme("shared/simple-trackback"), :locals
=> {:article => article}
%>
</p><!-- the end of 'entry-footer' -->
</div><!-- the end of 'entry' -->

Modified: trunk/app/views/notes/MT/show_enrollment.rhtml
==============================================================================
--- trunk/app/views/notes/MT/show_enrollment.rhtml (original)
+++ trunk/app/views/notes/MT/show_enrollment.rhtml Thu Dec 25 13:14:04 2008
@@ -13,17 +13,17 @@
</div><!-- the end of 'entry-body' -->
</div><!-- the end of 'entry-content' -->
<p class="entry-footer">
- <%= render :template =>
don_get_theme("shared/simple-category"), :locals => {:article => article}
+ <%= render :file => don_get_theme("shared/simple-category"), :locals
=> {:article => article}
%>
- <%= render :template => don_get_theme("shared/post-footer"), :locals
=> {:article => article}
+ <%= render :file => don_get_theme("shared/post-footer"), :locals =>
{:article => article}
%>
<span class="separator">|</span>
- <%= render :template => don_get_theme("shared/permlink"), :locals =>
{:article => article}
+ <%= render :file => don_get_theme("shared/permlink"), :locals =>
{:article => article}
%>
</p><!-- the end of 'entry-footer' -->
</div><!-- the end of 'entry' -->

-<%= render :template => don_get_theme("shared/trackback"), "enrollment" =>
@enrollment, :locals => {:article => article}
+<%= render :file => don_get_theme("shared/trackback"), "enrollment" =>
@enrollment, :locals => {:article => article}
%>
-<%= render :template => don_get_theme("shared/comment"), :locals =>
{:enrollment => @enrollment}
+<%= render :file => don_get_theme("shared/comment"), :locals =>
{:enrollment => @enrollment}
%>

Modified: trunk/app/views/notes/MT/show_title.rhtml
==============================================================================
--- trunk/app/views/notes/MT/show_title.rhtml (original)
+++ trunk/app/views/notes/MT/show_title.rhtml Thu Dec 25 13:14:04 2008
@@ -13,17 +13,17 @@
</div><!-- the end of 'entry-body' -->
</div><!-- the end of 'entry-content' -->
<p class="entry-footer">
- <%= render :template =>
don_get_theme("shared/simple-category"), :locals => {:article => article}
+ <%= render :file => don_get_theme("shared/simple-category"), :locals
=> {:article => article}
%>
- <%= render :template => don_get_theme("shared/post-footer"), :locals
=> {:article => article}
+ <%= render :file => don_get_theme("shared/post-footer"), :locals =>
{:article => article}
%>
<span class="separator">|</span>
- <%= render :template => don_get_theme("shared/permlink"), :locals =>
{:article => article}
+ <%= render :file => don_get_theme("shared/permlink"), :locals =>
{:article => article}
%>
</p><!-- the end of 'entry-footer' -->
</div><!-- the end of 'entry' -->

-<%= render :template => don_get_theme("shared/trackback"), "enrollment" =>
article.enrollment, :locals => {:article => article}
+<%= render :file => don_get_theme("shared/trackback"), :locals =>
{:enrollment => article.enrollment, :article => article}
%>
-<%= render :template => don_get_theme("shared/comment"), :locals =>
{:enrollment => article.enrollment}
+<%= render :file => don_get_theme("shared/comment"), :locals =>
{:enrollment => article.enrollment}
%>

Modified: trunk/app/views/notes/comment_form.rhtml
==============================================================================
--- trunk/app/views/notes/comment_form.rhtml (original)
+++ trunk/app/views/notes/comment_form.rhtml Thu Dec 25 13:14:04 2008
@@ -15,6 +15,6 @@

<hr>
<h2>コメントをどうぞ</h2>
-<%= render :template => "shared/comment-form", :locals => {:article =>
@article}
+<%= render :file => "shared/comment-form", :locals => {:article =>
@article}
%>
<% end %>

Modified: trunk/app/views/notes/comment_form_a.rhtml
==============================================================================
--- trunk/app/views/notes/comment_form_a.rhtml (original)
+++ trunk/app/views/notes/comment_form_a.rhtml Thu Dec 25 13:14:04 2008
@@ -1 +1 @@
-<%= render(:template => "shared/comment-form", :locals => {:article =>
@article}) if @article %>
+<%= render(:file => "shared/comment-form", :locals => {:article =>
@article}) if @article %>

Modified: trunk/app/views/notes/default/noteslist.rhtml
==============================================================================
--- trunk/app/views/notes/default/noteslist.rhtml (original)
+++ trunk/app/views/notes/default/noteslist.rhtml Thu Dec 25 13:14:04 2008
@@ -51,10 +51,10 @@
<%= display_article_attachments(article) %>
<%= article.body_to_html %>
</div>
- <%= render :template => don_get_theme("shared/comment2"), :locals =>
{:article => article}
+ <%= render :file => don_get_theme("shared/comment2"), :locals =>
{:article => article}
%>
<div class="nndate">
- <%= render :template => don_get_theme("shared/authorhead"), :locals =>
{:article => article}
+ <%= render :file => don_get_theme("shared/authorhead"), :locals =>
{:article => article}
%>
</div>
</div> <!-- end section -->
@@ -65,7 +65,7 @@

<% if params['action'] =~ /(show_date|show_nnen)/ %>
<div class="pagelink">
- <%= render :template => don_get_theme("shared/nextlink2"), :locals =>
{:articles => @articles}
+ <%= render :file => don_get_theme("shared/nextlink2"), :locals =>
{:articles => @articles}
%>
</div> <!-- end pagelink -->
<% end %>

Modified: trunk/app/views/notes/default/show_enrollment.rhtml
==============================================================================
--- trunk/app/views/notes/default/show_enrollment.rhtml (original)
+++ trunk/app/views/notes/default/show_enrollment.rhtml Thu Dec 25 13:14:04
2008
@@ -36,7 +36,7 @@
</div>

<div class="pagelink">
-<%= render :template => don_get_theme("shared/nextlink3"), :locals =>
{:article => article}
+<%= render :file => don_get_theme("shared/nextlink3"), :locals =>
{:article => article}
%>
</div> <!-- end pagelink -->


Modified: trunk/app/views/notes/default/show_title.rhtml
==============================================================================
--- trunk/app/views/notes/default/show_title.rhtml (original)
+++ trunk/app/views/notes/default/show_title.rhtml Thu Dec 25 13:14:04 2008
@@ -29,10 +29,10 @@
<%= display_article_attachments(article) %>
<%= article.body_to_html %>
</div>
- <%= render :template => don_get_theme("shared/comment2"), :locals =>
{:article => article}
+ <%= render :file => don_get_theme("shared/comment2"), :locals =>
{:article => article}
%>
<div class="nndate">
- <%= render :template => don_get_theme("shared/authorhead"), :locals =>
{:article => article}
+ <%= render :file => don_get_theme("shared/authorhead"), :locals =>
{:article => article}
%>
<br clear='all'>
</div>
@@ -48,7 +48,7 @@
</div>

<div class="pagelink">
-<%= render :template => don_get_theme("shared/nextlink3"), :locals =>
{:article => article}
+<%= render :file => don_get_theme("shared/nextlink3"), :locals =>
{:article => article}
%>
</div> <!-- end pagelink -->
<% end %>

Modified: trunk/app/views/notes/pick_article_a2.rhtml
==============================================================================
--- trunk/app/views/notes/pick_article_a2.rhtml (original)
+++ trunk/app/views/notes/pick_article_a2.rhtml Thu Dec 25 13:14:04 2008
@@ -2,7 +2,7 @@
<div class="section">
<%= display_article_images article %>
<%= article.body_to_html if article.body %>
-<%= render :template => don_get_theme("shared/comment"), :locals =>
{:article => article}
+<%= render :file => don_get_theme("shared/comment"), :locals => {:article
=> article}
%>
<br clear='all'>
</div>

Modified: trunk/app/views/notes/pick_enrollment_a.rhtml
==============================================================================
--- trunk/app/views/notes/pick_enrollment_a.rhtml (original)
+++ trunk/app/views/notes/pick_enrollment_a.rhtml Thu Dec 25 13:14:04 2008
@@ -8,7 +8,7 @@
<!-- display_article_images article % -->
<%= display_enrollment_images @enrollment %>
<%= article.body_to_html if article.body %>
-<%= render :template => "shared/comment-noadd-enrollment", :locals =>
{:enrollment => @enrollment} %>
+<%= render :file => "shared/comment-noadd-enrollment", :locals =>
{:enrollment => @enrollment} %>
<br clear='all'>
</div> <!-- end section -->


Modified: trunk/app/views/notes/recent_category_a.rhtml
==============================================================================
--- trunk/app/views/notes/recent_category_a.rhtml (original)
+++ trunk/app/views/notes/recent_category_a.rhtml Thu Dec 25 13:14:04 2008
@@ -1 +1 @@
-<%= render :template => "shared/title-articles2no", :locals => {:pages =>
@articles} %>
+<%= render :file => "shared/title-articles2no", :locals => {:pages =>
@articles} %>

Modified: trunk/app/views/notes/recent_category_title_a.rhtml
==============================================================================
--- trunk/app/views/notes/recent_category_title_a.rhtml (original)
+++ trunk/app/views/notes/recent_category_title_a.rhtml Thu Dec 25 13:14:04
2008
@@ -1,2 +1,2 @@
-<%= render :template => don_get_theme("shared/title-articles2no"), :locals
=> {:pages => @articles}
+<%= render :file => don_get_theme("shared/title-articles2no"), :locals =>
{:pages => @articles}
%>

Modified: trunk/app/views/shared/MT/title-articles2no.rhtml
==============================================================================
--- trunk/app/views/shared/MT/title-articles2no.rhtml (original)
+++ trunk/app/views/shared/MT/title-articles2no.rhtml Thu Dec 25 13:14:04
2008
@@ -20,9 +20,9 @@
<div class="odd">
<% end %>
<% if article.enrollment_id %>
- <%= link_to truncate(btmp, 76), {:action => "show_enrollment", :id =>
article.enrollment_id} %>
+ <%= link_to truncate(btmp, :length => 76), {:action
=> "show_enrollment", :id => article.enrollment_id} %>
<% else %>
- <%= link_to truncate(btmp, 76), {:action => "show_title", :id =>
article.id} %>
+ <%= link_to truncate(btmp, :length => 76), {:action => "show_title", :id
=> article.id} %>
<% end %>
</div>
<%

Reply all
Reply to author
Forward
0 new messages