Add link to process on legislation processes proposals

This commit is contained in:
decabeza
2019-05-30 00:31:49 +02:00
parent b810d6b6b9
commit 5fd493cd2c
6 changed files with 50 additions and 2 deletions

View File

@@ -83,7 +83,7 @@
} }
.legislation-calendar { .legislation-calendar {
background: #e5ecf2; background: $highlight;
padding-top: 1rem; padding-top: 1rem;
h4 { h4 {

View File

@@ -212,7 +212,7 @@
} }
.quiz-title { .quiz-title {
background: #e5ecf2; background: $highlight;
.quiz-header-title { .quiz-header-title {
font-size: $small-font-size; font-size: $small-font-size;
@@ -982,3 +982,27 @@
margin-top: 0; margin-top: 0;
} }
} }
.process-proposal {
margin-bottom: $line-height;
.header {
background: $highlight;
padding: $line-height;
@include breakpoint(medium) {
height: $line-height * 4;
}
}
.process-title {
font-size: $small-font-size;
margin-bottom: 0;
text-transform: uppercase;
}
.process-link {
font-size: rem-calc(19);
font-weight: bold;
}
}

View File

@@ -10,6 +10,17 @@
<%= render "shared/canonical", href: legislation_process_proposal_url(process_id: @process) %> <%= render "shared/canonical", href: legislation_process_proposal_url(process_id: @process) %>
<% end %> <% end %>
<div class="row process-proposal">
<div class="small-12 column">
<div class="header">
<p class="process-title">
<strong><%= t("legislation.proposals.process_title") %></strong>
</p>
<%= link_to @process.title, @process, class: "process-link" %>
</div>
</div>
</div>
<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @legislation_proposal_votes] do %> <% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @legislation_proposal_votes] do %>
<div class="proposal-show legislation-proposal-show"> <div class="proposal-show legislation-proposal-show">
<div id="<%= dom_id(@proposal) %>" class="row"> <div id="<%= dom_id(@proposal) %>" class="row">

View File

@@ -123,3 +123,4 @@ en:
form: form:
tags_label: "Categories" tags_label: "Categories"
not_verified: "For vote proposals %{verify_account}." not_verified: "For vote proposals %{verify_account}."
process_title: Collaborative legislation process

View File

@@ -123,3 +123,4 @@ es:
form: form:
tags_label: "Categorías" tags_label: "Categorías"
not_verified: "Para votar propuestas %{verify_account}." not_verified: "Para votar propuestas %{verify_account}."
process_title: Proceso de legislación colaborativa

View File

@@ -190,4 +190,15 @@ describe "Legislation Proposals" do
visit legislation_process_proposal_path(process, legislation_proposal_negative) visit legislation_process_proposal_path(process, legislation_proposal_negative)
expect(page).to have_content("-6 votes") expect(page).to have_content("-6 votes")
end end
scenario "Show link to process on show" do
create(:legislation_proposal, legislation_process_id: process.id)
visit legislation_process_proposal_path(proposal.process, proposal)
within(".process-proposal") do
expect(page).to have_content("Collaborative legislation process")
expect(page).to have_link(process.title)
end
end
end end