diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
| commit | fe28193e4eb9af2dc5262535a29ffde5249568fc (patch) | |
| tree | bd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /app/views/common | |
| parent | 9a986ac0a51fe844eee816325e6a6d4122136d9a (diff) | |
| download | redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip | |
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/common')
| -rw-r--r-- | app/views/common/_calendar.rhtml | 2 | ||||
| -rw-r--r-- | app/views/common/feed.atom.rxml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml index 1095cd501..6ac9ddce6 100644 --- a/app/views/common/_calendar.rhtml +++ b/app/views/common/_calendar.rhtml @@ -20,7 +20,7 @@ while day <= calendar.enddt %> image_tag('arrow_to.png') end %> <%= h("#{i.project} -") unless @project && @project == i.project %> - <%= link_to_issue i %>: <%= h(truncate(i.subject, 30)) %> + <%= link_to_issue i %>: <%= h(truncate(i.subject, :length => 30)) %> <span class="tip"><%= render_issue_tooltip i %></span> </div> <% else %> diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml index 8d07cf208..811140152 100644 --- a/app/views/common/feed.atom.rxml +++ b/app/views/common/feed.atom.rxml @@ -1,6 +1,6 @@ xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do - xml.title truncate_single_line(@title, 100) + xml.title truncate_single_line(@title, :length => 100) xml.link "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false})) xml.link "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false) xml.id url_for(:controller => 'welcome', :only_path => false) @@ -11,9 +11,9 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do xml.entry do url = url_for(item.event_url(:only_path => false)) if @project - xml.title truncate_single_line(item.event_title, 100) + xml.title truncate_single_line(item.event_title, :length => 100) else - xml.title truncate_single_line("#{item.project} - #{item.event_title}", 100) + xml.title truncate_single_line("#{item.project} - #{item.event_title}", :length => 100) end xml.link "rel" => "alternate", "href" => url xml.id url |