Download as
Browse Code »

Commit b84467b5aacdb6d87ae97f1044383b2e77d6d9d4

Authored by Braulio Bhavamitra
2 parents f45a5570 b1e59638
Exists in master and in 21 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_pagination, api_private_token, api_tasks, article_hit_count, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings

Merge branch 'use-profile-homepage' into 'master' 

Use profile homepage

The profile homepage is not used in some places

See merge request !555
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @b84467b
... ... @@ -1185,7 +1185,7 @@ module ApplicationHelper
1185 1185 pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1186 1186 end
1187 1187  
1188   - (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
  1188 + (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
1189 1189 render_environment_features(:usermenu) +
1190 1190 admin_link +
1191 1191 manage_enterprises +
... ... @@ -1233,7 +1233,7 @@ module ApplicationHelper
1233 1233  
1234 1234 def task_information(task)
1235 1235 values = {}
1236   - values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
  1236 + values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
1237 1237 values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
1238 1238 values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
1239 1239 values.merge!(task.information[:variables]) if task.information[:variables]
... ...