[Git][noosfero/noosfero][cherry-pick-733814ea] Merge branch 'organization_ratings_improvements' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch cherry-pick-733814ea at Noosfero / noosfero


Commits:
42edc709 by Marcos Ronaldo Pereira Junior at 2016-06-08T18:57:06+00:00
Merge branch 'organization_ratings_improvements' into 'master'

Minor fixes for OrganizationRatings plugin

- Fixes broken url image for not logged users
- Shows ratings title to not logged users

See merge request !953
- - - - -


3 changed files:

- plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
- plugins/organization_ratings/views/organization_ratings_plugin_profile/new_rating.html.erb
- plugins/organization_ratings/views/shared/_make_report_block.html.erb


Changes:

=====================================
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
@@ -1,10 +1,6 @@
 <% min_rate = env_organization_ratings_config.minimum_ratings %>
 <% default_rating = env_organization_ratings_config.default_rating %>
 
-<div class="star-page-title">
-  <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %>
-</div>
-
 <div class="star-rate-data">
 
   <div class="star-profile-information">


=====================================
plugins/organization_ratings/views/organization_ratings_plugin_profile/new_rating.html.erb
=====================================
--- a/plugins/organization_ratings/views/organization_ratings_plugin_profile/new_rating.html.erb
+++ b/plugins/organization_ratings/views/organization_ratings_plugin_profile/new_rating.html.erb
@@ -1,4 +1,7 @@
 <% config = env_organization_ratings_config %>
+<div class="star-page-title">
+  <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %>
+</div>
 <% if logged_in? %>
   <%= render :partial => "new_rating_fields" %>
 <% else %>


=====================================
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,6 +1,6 @@
 <% 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') %>
+<% logged_out_image = image_tag('plugins/organization_ratings/images/user-not-logged.png') %>
 
 <div class="make-report-block">
   <div class="star-profile-information">



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/42edc7090ce1460869f186e3c5d936214fed4466
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160608/a4c19bbe/attachment-0001.html>