[Git][noosfero/noosfero][master] 2 commits: Change welcome link to user.url

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
7b3f6b3a by mendesiasmin at 2017-12-06T09:29:37-02:00
Change welcome link to user.url

- - - - -
4b4d4a6a by Rodrigo Souto at 2017-12-12T14:20:26+00:00
Merge branch 'welcome_user_link_to_profile' into 'master'

Change wellcome user link to the homepage instead profile page

See merge request noosfero/noosfero!1255
- - - - -


2 changed files:

- app/helpers/application_helper.rb
- app/views/blocks/login.html.erb


Changes:

=====================================
app/helpers/application_helper.rb
=====================================
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -950,7 +950,7 @@ module ApplicationHelper
   def welcome_span
     user_identifier = "<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>"
     welcome_link = link_to(user_identifier.html_safe,
-        user.public_profile_url,
+        user.url,
         :id => "homepage-link",
         :title => _('Go to your homepage'))
     welcome_span = _("<span class='welcome'>Welcome,</span> %s") % welcome_link.html_safe


=====================================
app/views/blocks/login.html.erb
=====================================
--- a/app/views/blocks/login.html.erb
+++ b/app/views/blocks/login.html.erb
@@ -3,7 +3,7 @@
     <h2><%= _('Logged in as %s') % user.identifier %></h2>
     <ul>
       <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
-      <li><%= link_to _('Homepage'), url_for(user.public_profile_url) %></li>
+      <li><%= link_to _('Homepage'), url_for(user.url) %></li>
     </ul>
     <div class="user-actions">
       <%= button(:'menu-logout',  _('Logout'), :controller => 'account', :action => 'logout') %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/378035cec2be9275fd884502b108ea2a2e117cf1...4b4d4a6ab13acd9ebdb95c88a963d066c0538180

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/378035cec2be9275fd884502b108ea2a2e117cf1...4b4d4a6ab13acd9ebdb95c88a963d066c0538180
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20171212/ead582e8/attachment-0001.html>