[Git][noosfero/noosfero][master] 2 commits: Link to profile on organization ratings

[Joenio Costa]

Joenio Costa pushed to branch master at Noosfero / noosfero


Commits:
b14fdbaf by Álvaro Fernando at 2016-01-18T12:34:30-02:00
Link to profile on organization ratings

- - - - -
6e4a6911 by Joenio Costa at 2016-01-18T20:07:08+00:00
Merge branch 'organization_ratings_link_to_profile' into 'master'

Link to profile on organization ratings

Name and image of the user in the organization ratings.

Mapping in: https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/514

See merge request !758
- - - - -


5 changed files:

- plugins/organization_ratings/features/rate_community.feature
- plugins/organization_ratings/public/style.css
- plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
- plugins/organization_ratings/views/shared/_make_report_block.html.erb
- plugins/organization_ratings/views/shared/_user_rating_container.html.erb


Changes:

=====================================
plugins/organization_ratings/features/rate_community.feature
=====================================
--- a/plugins/organization_ratings/features/rate_community.feature
+++ b/plugins/organization_ratings/features/rate_community.feature
@@ -28,3 +28,9 @@ Feature: rate_community
   Scenario: display rate button inside communities ratings block
     Given I am on mycommunity's homepage
     Then I should see "Rate Community" within ".make-report-block"
+
+  Scenario: redirect to profile page
+    Given I am on mycommunity's homepage
+    When I follow "Rate this Community"
+    Then I should see "Joao Silva" within ".star-profile-name"
+    And I should see Joao Silva's profile image
\ No newline at end of file


=====================================
plugins/organization_ratings/public/style.css
=====================================
--- a/plugins/organization_ratings/public/style.css
+++ b/plugins/organization_ratings/public/style.css
@@ -122,6 +122,10 @@
   width: 66px;
 }
 
+.star-profile-name a:link {
+  text-decoration: none;
+}
+
 .star-rate-data .star-rate-form .star-comment-container .formfield textarea {
   width: 361px;
 }


=====================================
plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
=====================================
--- a/plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
+++ b/plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
@@ -9,11 +9,11 @@
 
   <div class="star-profile-information">
     <div class="star-profile-image">
-      <%= profile_image(current_user.person, :portrait) %>
+      <%= link_to profile_image(current_user.person, :portrait), current_user.person.url %>
     </div>
 
     <div class="star-profile-name">
-      <%= current_user.name %>
+      <%= link_to current_user.person.name,  current_user.person.url %>
     </div>
   </div>
 


=====================================
plugins/organization_ratings/views/shared/_make_report_block.html.erb
=====================================
--- a/plugins/organization_ratings/views/shared/_make_report_block.html.erb
+++ b/plugins/organization_ratings/views/shared/_make_report_block.html.erb
@@ -1,4 +1,5 @@
-<% logged_in_image = profile_image(current_user.person, :portrait) if current_user %>
+<% logged_in_image = link_to profile_image(current_user.person, :portrait), current_user.person.url if current_user %>
+<% logged_in_name = link_to current_user.person.name,  current_user.person.url if current_user %>
 <% logged_out_image = image_tag('plugins/organization_ratings/public/images/user-not-logged.png') %>
 
 <div class="make-report-block">
@@ -8,7 +9,7 @@
     </div>
 
     <div class="star-profile-name">
-      <%= logged_in? ? current_user.person.name : _('User not logged') %>
+      <%= logged_in? ? logged_in_name : _('User not logged') %>
     </div>
   </div>
 


=====================================
plugins/organization_ratings/views/shared/_user_rating_container.html.erb
=====================================
--- a/plugins/organization_ratings/views/shared/_user_rating_container.html.erb
+++ b/plugins/organization_ratings/views/shared/_user_rating_container.html.erb
@@ -1,11 +1,11 @@
 <div class="user-rating-block">
   <div class="star-profile-information">
     <div class="star-profile-image">
-      <%= profile_image(user_rate.person, :portrait) %>
+      <%= link_to profile_image(user_rate.person, :portrait), user_rate.person.url %>
     </div>
 
     <div class="star-profile-name">
-      <%= user_rate.person.name %>
+      <%= link_to user_rate.person.name,  user_rate.person.url %>
     </div>
   </div>
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/4b71cdfa375f1813c001d62f9a3265af663217fa...6e4a69110e62a14c4cf5265ccc4a3719bf5d58bd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160118/578afdb3/attachment-0001.html>