summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-11-30 11:18:22 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-11-30 11:18:22 +0000
commitfce4615f10ad81b9070e65a45f9d37b1c571ccd7 (patch)
treeb922752605cd207cf51e72866f435af8427ea468 /app/helpers
parentb5fcea9e7414647533ee333485ed8c93b9cff82f (diff)
downloadredmine-fce4615f10ad81b9070e65a45f9d37b1c571ccd7.tar.gz
redmine-fce4615f10ad81b9070e65a45f9d37b1c571ccd7.zip
Display latest user's activity on account/show view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2066 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb12
-rw-r--r--app/helpers/projects_helper.rb12
2 files changed, 12 insertions, 12 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 248704609..5995187d7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -105,6 +105,18 @@ module ApplicationHelper
@time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
end
+
+ def format_activity_title(text)
+ h(truncate_single_line(text, 100))
+ end
+
+ def format_activity_day(date)
+ date == Date.today ? l(:label_today).titleize : format_date(date)
+ end
+
+ def format_activity_description(text)
+ h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
+ end
def distance_of_date_in_words(from_date, to_date = 0)
from_date = from_date.to_date if from_date.respond_to?(:to_date)
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index cd2e743fe..6f5e03349 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -21,18 +21,6 @@ module ProjectsHelper
link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
end
- def format_activity_title(text)
- h(truncate_single_line(text, 100))
- end
-
- def format_activity_day(date)
- date == Date.today ? l(:label_today).titleize : format_date(date)
- end
-
- def format_activity_description(text)
- h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
- end
-
def project_settings_tabs
tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
{:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},