Commit 733814ea4658e164cb6e46ae7d28e583ccea43b3
Exists in
profile_api_improvements
and in
1 other branch
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
Showing
3 changed files
with
4 additions
and
5 deletions
Show diff stats
plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
| 1 | <% min_rate = env_organization_ratings_config.minimum_ratings %> | 1 | <% min_rate = env_organization_ratings_config.minimum_ratings %> |
| 2 | <% default_rating = env_organization_ratings_config.default_rating %> | 2 | <% default_rating = env_organization_ratings_config.default_rating %> |
| 3 | 3 | ||
| 4 | -<div class="star-page-title"> | ||
| 5 | - <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %> | ||
| 6 | -</div> | ||
| 7 | - | ||
| 8 | <div class="star-rate-data"> | 4 | <div class="star-rate-data"> |
| 9 | 5 | ||
| 10 | <div class="star-profile-information"> | 6 | <div class="star-profile-information"> |
plugins/organization_ratings/views/organization_ratings_plugin_profile/new_rating.html.erb
| 1 | <%= error_messages_for 'rating' %> | 1 | <%= error_messages_for 'rating' %> |
| 2 | 2 | ||
| 3 | <% config = env_organization_ratings_config %> | 3 | <% config = env_organization_ratings_config %> |
| 4 | +<div class="star-page-title"> | ||
| 5 | + <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %> | ||
| 6 | +</div> | ||
| 4 | <% if logged_in? %> | 7 | <% if logged_in? %> |
| 5 | <%= render :partial => "new_rating_fields" %> | 8 | <%= render :partial => "new_rating_fields" %> |
| 6 | <% else %> | 9 | <% else %> |
plugins/organization_ratings/views/shared/_make_report_block.html.erb
| 1 | <% logged_in_image = link_to profile_image(current_user.person, :portrait), current_user.person.url if current_user %> | 1 | <% logged_in_image = link_to profile_image(current_user.person, :portrait), current_user.person.url if current_user %> |
| 2 | <% logged_in_name = link_to current_user.person.name, current_user.person.url if current_user %> | 2 | <% logged_in_name = link_to current_user.person.name, current_user.person.url if current_user %> |
| 3 | -<% logged_out_image = image_tag('plugins/organization_ratings/public/images/user-not-logged.png') %> | 3 | +<% logged_out_image = image_tag('plugins/organization_ratings/images/user-not-logged.png') %> |
| 4 | 4 | ||
| 5 | <div class="make-report-block"> | 5 | <div class="make-report-block"> |
| 6 | <div class="star-profile-information"> | 6 | <div class="star-profile-information"> |