consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt public views for flagging/unflagging investments

Browse Source
This commit is contained in:
Angel Perez
2018-06-13 13:54:18 -04:00
parent bcb0b9fbfa
commit 8ef3e81e03
5 changed files with 215 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/stats_controller.rb
View File

@@ -14,6 +14,7 @@ class StatsController < ApplicationController
@debate_votes = daily_cache('debate_votes') { Vote.where(votable_type: 'Debate').count } @debate_votes = daily_cache('debate_votes') { Vote.where(votable_type: 'Debate').count }
@proposal_votes = daily_cache('proposal_votes') { Vote.where(votable_type: 'Proposal').count } @proposal_votes = daily_cache('proposal_votes') { Vote.where(votable_type: 'Proposal').count }
@comment_votes = daily_cache('comment_votes') { Vote.where(votable_type: 'Comment').count } @comment_votes = daily_cache('comment_votes') { Vote.where(votable_type: 'Comment').count }
@investment_votes = daily_cache('budget_investment_votes') { Vote.where(votable_type: 'Budget::Investment').count }
@votes = daily_cache('votes') { Vote.count } @votes = daily_cache('votes') { Vote.count }
@verified_users = daily_cache('verified_users') { User.with_hidden.level_two_or_three_verified.count } @verified_users = daily_cache('verified_users') { User.with_hidden.level_two_or_three_verified.count }

10
app/views/budgets/investments/_actions.html.erb Normal file
View File

@@ -0,0 +1,10 @@
<% if can? :hide, investment %>
<%= link_to t("admin.actions.hide").capitalize, hide_moderation_budget_investment_path(investment),
method: :put, remote: true, data: { confirm: t("admin.actions.confirm") } %>
<% end %>
<% if can? :hide, investment.author %>
&nbsp;|&nbsp;
<%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(investment.author_id),
method: :put, data: { confirm: t("admin.actions.confirm") } %>
<% end %>

25
app/views/budgets/investments/_flag_actions.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<span class="flag-content">
<% if show_flag_action? investment %>
<a id="flag-expand-investment-<%= investment.id %>" data-toggle="flag-drop-investment-<%= investment.id %>" title="<%= t('shared.flag') %>">
<span class="icon-flag flag-disable"></span>
</a>
<span class="dropdown-pane" id="flag-drop-investment-<%= investment.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.flag'), flag_budget_investment_path(investment.budget, investment.id),
method: :put,
remote: true,
id: "flag-investment-#{ investment.id }" %>
</span>
<% end %>
<% if show_unflag_action? investment %>
<a id="unflag-expand-investment-<%= investment.id %>" data-toggle="unflag-drop-investment-<%= investment.id %>" title="<%= t('shared.unflag') %>">
<span class="icon-flag flag-active"></span>
</a>
<span class="dropdown-pane" id="unflag-drop-investment-<%= investment.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.unflag'), unflag_budget_investment_path(investment.budget, investment.id),
method: :put,
remote: true,
id: "unflag-investment-#{ investment.id }" %>
</span>
<% end %>
</span>

341
app/views/budgets/investments/_investment_show.html.erb
View File

@@ -7,180 +7,195 @@
og_image_url: (investment.image.present? ? investment.image_url(:thumb) : nil) %> og_image_url: (investment.image.present? ? investment.image_url(:thumb) : nil) %>
<% end %> <% end %>
<section class="budget-investment-show" id="<%= dom_id(investment) %>"> <% cache [locale_and_user_status(investment),
investment,
investment.author,
Flag.flagged?(current_user, investment),
@investment_votes] do %>
<section class="budget-investment-show" id="<%= dom_id(investment) %>">
<div class="row"> <div class="row">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<%= back_link_to budget_investments_path(investment.budget, heading_id: investment.heading) %> <%= back_link_to budget_investments_path(investment.budget, heading_id: investment.heading) %>
<h1><%= investment.title %></h1> <h1><%= investment.title %></h1>
<div class="budget-investment-info"> <div class="budget-investment-info">
<%= render '/shared/author_info', resource: investment %> <%= render '/shared/author_info', resource: investment %>
<span class="bullet">&nbsp;&bull;&nbsp;</span> <span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= l investment.created_at.to_date %> <%= l investment.created_at.to_date %>
<span class="bullet">&nbsp;&bull;&nbsp;</span> <span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= investment.heading.name %> <%= investment.heading.name %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<span class="js-flag-actions">
<%= render 'budgets/investments/flag_actions', investment: @investment %>
</span>
</div>
<br>
<%= render_image(investment.image, :large, true) if investment.image.present? %>
<p id="investment_code">
<%= t("budgets.investments.show.code_html", code: investment.id) %>
</p>
<%= safe_html_with_links investment.description.html_safe %>
<% if feature?(:map) && map_location_available?(@investment.map_location) %>
<div class="margin">
<%= render_map(@investment.map_location, "budget_investment", false, nil) %>
</div>
<% end %>
<% if investment.location.present? %>
<p>
<%= t("budgets.investments.show.location_html", location: investment.location) %>
</p>
<% end %>
<% if investment.organization_name.present? %>
<p>
<%= t("budgets.investments.show.organization_name_html", name: investment.organization_name) %>
</p>
<% end %>
<% if feature?(:allow_attached_documents) %>
<%= render 'documents/documents',
documents: investment.documents,
max_documents_allowed: Budget::Investment.max_documents_allowed %>
<% end %>
<%= render 'shared/tags', taggable: investment %>
<% if investment.external_url.present? %>
<div class="document-link">
<%= text_with_links investment.external_url %>
</div>
<% end %>
<% if investment.should_show_unfeasibility_explanation? %>
<h2><%= t('budgets.investments.show.unfeasibility_explanation') %></h2>
<p><%= investment.unfeasibility_explanation %></p>
<% end %>
<% if investment.should_show_price_explanation? %>
<h2><%= t('budgets.investments.show.price_explanation') %></h2>
<p><%= investment.price_explanation %></p>
<% end %>
<%= render 'relationable/related_content', relationable: @investment %>
<div class="js-moderator-investment-actions margin">
<%= render "budgets/investments/actions", investment: @investment %>
</div>
</div> </div>
<br> <aside class="small-12 medium-3 column">
<% if can_destroy_image?(investment) %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.author") %></h2>
<div class="show-actions-menu">
<%= link_to image_path(investment.image, from: request.url),
method: :delete,
class: 'button hollow alert expanded' do %>
<span class="icon-image"></span>
<%= t("images.remove_image") %>
<% end %>
</div>
<% end %>
<%= render_image(investment.image, :large, true) if investment.image.present? %> <% if investment.should_show_aside? %>
<% if investment.should_show_votes? %>
<p id="investment_code"> <div class="sidebar-divider"></div>
<%= t("budgets.investments.show.code_html", code: investment.id) %> <h2><%= t("budgets.investments.show.supports") %></h2>
</p> <div class="text-center">
<div id="<%= dom_id(investment) %>_votes">
<%= safe_html_with_links investment.description.html_safe %> <%= render partial: '/budgets/investments/votes', locals: {
investment: investment,
<% if feature?(:map) && map_location_available?(@investment.map_location) %> investment_votes: investment_votes,
<div class="margin"> vote_url: vote_budget_investment_path(investment.budget, investment, value: 'yes')
<%= render_map(@investment.map_location, "budget_investment", false, nil) %> } %>
</div> </div>
<% end %> </div>
<% elsif investment.should_show_vote_count? %>
<% if investment.location.present? %> <div class="sidebar-divider"></div>
<p> <h2><%= t("budgets.investments.show.supports") %></h2>
<%= t("budgets.investments.show.location_html", location: investment.location) %> <div class="text-center">
</p> <span class="total-supports">
<% end %> <strong>
<%= t("budgets.investments.investment.supports",
<% if investment.organization_name.present? %> count: investment.total_votes) %>
<p> </strong>
<%= t("budgets.investments.show.organization_name_html", name: investment.organization_name) %> </span>
</p> </div>
<% end %> <% elsif investment.should_show_ballots? %>
<div class="sidebar-divider"></div>
<% if feature?(:allow_attached_documents) %> <h2><%= t("budgets.investments.show.votes") %></h2>
<%= render 'documents/documents', <div class="text-center">
documents: investment.documents, <div id="<%= dom_id(investment) %>_ballot">
max_documents_allowed: Budget::Investment.max_documents_allowed %> <%= render partial: 'ballot', locals: {
<% end %> investment: investment,
investment_ids: investment_ids,
<%= render 'shared/tags', taggable: investment %> ballot: ballot,
} %>
<% if investment.external_url.present? %> </div>
<div class="document-link"> </div>
<%= text_with_links investment.external_url %>
</div>
<% end %>
<% if investment.should_show_unfeasibility_explanation? %>
<h2><%= t('budgets.investments.show.unfeasibility_explanation') %></h2>
<p><%= investment.unfeasibility_explanation %></p>
<% end %>
<% if investment.should_show_price_explanation? %>
<h2><%= t('budgets.investments.show.price_explanation') %></h2>
<p><%= investment.price_explanation %></p>
<% end %>
<%= render 'relationable/related_content', relationable: @investment %>
</div>
<aside class="small-12 medium-3 column">
<% if can_destroy_image?(investment) %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.author") %></h2>
<div class="show-actions-menu">
<%= link_to image_path(investment.image, from: request.url),
method: :delete,
class: 'button hollow alert expanded' do %>
<span class="icon-image"></span>
<%= t("images.remove_image") %>
<% end %> <% end %>
</div> <% else %>
<% end %> <% if investment.unfeasible? %>
<div class="callout warning">
<% if investment.should_show_aside? %> <%= t("budgets.investments.show.project_unfeasible_html") %>
<% if investment.should_show_votes? %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.supports") %></h2>
<div class="text-center">
<div id="<%= dom_id(investment) %>_votes">
<%= render partial: '/budgets/investments/votes', locals: {
investment: investment,
investment_votes: investment_votes,
vote_url: vote_budget_investment_path(investment.budget, investment, value: 'yes')
} %>
</div> </div>
</div> <% elsif investment.winner? %>
<% elsif investment.should_show_vote_count? %> <div class="callout success">
<div class="sidebar-divider"></div> <strong><%= t("budgets.investments.show.project_winner") %></strong>
<h2><%= t("budgets.investments.show.supports") %></h2>
<div class="text-center">
<span class="total-supports">
<strong>
<%= t("budgets.investments.investment.supports",
count: investment.total_votes) %>
</strong>
</span>
</div>
<% elsif investment.should_show_ballots? %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.votes") %></h2>
<div class="text-center">
<div id="<%= dom_id(investment) %>_ballot">
<%= render partial: 'ballot', locals: {
investment: investment,
investment_ids: investment_ids,
ballot: ballot,
} %>
</div> </div>
</div> <% elsif investment.selected? %>
<div class="callout success">
<%= t("budgets.investments.show.project_selected_html") %>
</div>
<% elsif !investment.selected? %>
<div class="callout warning">
<%= t("budgets.investments.show.project_not_selected_html") %>
</div>
<% else %>
<br>
<div class="float-right">
<span class="label-budget-investment float-left">
<%= t("budgets.investments.show.title") %>
</span>
<span class="icon-budget"></span>
</div>
<% end %>
<% if investment.should_show_price? %>
<div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.price") %></h2>
<div class="supports text-center">
<p class="investment-project-amount">
<%= investment.formatted_price %>
</p>
</div>
<% end %>
<% end %> <% end %>
<% else %> <%= render partial: 'shared/social_share', locals: {
<div class="float-right"> share_title: t("budgets.investments.show.share"),
<span class="label-budget-investment float-left"> title: investment.title,
<%= t("budgets.investments.show.title") %> image_url: image_absolute_url(investment.image, :thumb),
</span> url: budget_investment_url(investment.budget, investment),
<span class="icon-budget"></span> description: investment.title
</div> } %>
<br>
<% if investment.unfeasible? %> <% if current_user %>
<div class="callout warning">
<%= t("budgets.investments.show.project_unfeasible_html") %>
</div>
<% elsif investment.winner? %>
<div class="callout success">
<strong><%= t("budgets.investments.show.project_winner") %></strong>
</div>
<% elsif investment.selected? %>
<div class="callout success">
<%= t("budgets.investments.show.project_selected_html") %>
</div>
<% elsif !investment.selected? %>
<div class="callout warning">
<%= t("budgets.investments.show.project_not_selected_html") %>
</div>
<% end %>
<% if investment.should_show_price? %>
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2><%= t("budgets.investments.show.price") %></h2> <p class="sidebar-title"><%= t("shared.follow") %></p>
<div class="supports text-center">
<p class="investment-project-amount"> <%= render 'follows/follow_button', follow: find_or_build_follow(current_user, investment) %>
<%= investment.formatted_price %>
</p>
</div>
<% end %> <% end %>
<% end %>
<%= render partial: 'shared/social_share', locals: {
share_title: t("budgets.investments.show.share"),
title: investment.title,
image_url: image_absolute_url(investment.image, :thumb),
url: budget_investment_url(investment.budget, investment),
description: investment.title
} %>
<% if current_user %> <%= render 'communities/access_button', community: investment.community %>
<div class="sidebar-divider"></div>
<p class="sidebar-title"><%= t("shared.follow") %></p>
<%= render 'follows/follow_button', follow: find_or_build_follow(current_user, investment) %> </aside>
<% end %> </div>
</section>
<%= render 'communities/access_button', community: investment.community %> <% end %>
</aside>
</div>
</section>

1
app/views/budgets/investments/_refresh_flag_actions.js.erb Normal file
View File

@@ -0,0 +1 @@
App.Flaggable.update("<%= dom_id(@investment) %>", "<%= j render("budgets/investments/flag_actions", investment: @investment) %>")