Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Legislation proposals #979

Merged
merged 27 commits into from
Oct 30, 2017
Merged

[WIP] Legislation proposals #979

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7f0bbce
changes placeholder text on legislation proposals form
decabeza Oct 28, 2017
7da8554
moves custom documents to a partial
decabeza Oct 28, 2017
61f22b6
adds documents partial to process 26
decabeza Oct 28, 2017
a9a6553
adds label with proposal type on index view
decabeza Oct 28, 2017
a9a20ed
translates form and changes label depending of proposal type
decabeza Oct 28, 2017
b32bb3b
improves font sizes and styles for labels
decabeza Oct 28, 2017
8e471f1
uses methods is_proposal? & is_question?
decabeza Oct 28, 2017
15ebf20
shows proposals type only for process 24
decabeza Oct 29, 2017
b8980fc
removes process proposal description
decabeza Oct 29, 2017
0bc0497
hides proposal code on questions
decabeza Oct 29, 2017
60a5bb3
improves translations
decabeza Oct 29, 2017
2d5a578
removes more info proposals link on new form
decabeza Oct 29, 2017
b64e443
changes title max length to 200
decabeza Oct 29, 2017
51ea4c5
shows labels only on process 24
decabeza Oct 29, 2017
acd8876
removes sidebar recommendations on new form
decabeza Oct 29, 2017
66710a0
Add factory and model spec for Legislation Proposal
bertocq Oct 30, 2017
d8025f3
Move on to constants title and description limits, and ruby syntax cl…
bertocq Oct 30, 2017
faece63
Create legislation proposal rake to load new Pleno Abierto ones
bertocq Oct 30, 2017
c80aa21
display proposal_type for all legislation proposals
voodoorai2000 Oct 30, 2017
c17c434
Merge branch 'legislation-proposals' of github.com:AyuntamientoMadrid…
voodoorai2000 Oct 30, 2017
d03ee9d
reactivates hardcoded Open Plenary id
voodoorai2000 Oct 30, 2017
fc5961c
Removes incomplete official position badge
voodoorai2000 Oct 30, 2017
b9553a2
hides category title from sidebar
voodoorai2000 Oct 30, 2017
03cf8a3
Show proposal_type tag for every Legislation Proposal with this value
MariaCheca Oct 30, 2017
e762f7e
Merge branch 'legislation-proposals' of https://github.com/Ayuntamien…
MariaCheca Oct 30, 2017
a3f578c
display official position badge in index
voodoorai2000 Oct 30, 2017
e407f61
Merge branch 'legislation-proposals' of github.com:AyuntamientoMadrid…
voodoorai2000 Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removes sidebar recommendations on new form
  • Loading branch information
@decabeza
decabeza committed Oct 29, 2017
commit acd8876d0b2610a661f4c7d65353bda5f13149d9
12 changes: 1 addition & 11 deletions app/views/legislation/proposals/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
<div class="proposal-form row">

<div class="small-12 medium-9 column">
<div class="small-12 column">
<%= back_link_to %>

<h1><%= t("proposals.new.start_new") %></h1>

<%= render "legislation/proposals/form", form_url: legislation_process_proposals_url, id: @proposal.id %>
</div>

<div class="small-12 medium-3 column">
<span class="icon-proposals float-right"></span>
<h2><%= t("proposals.new.recommendations_title") %></h2>
<ul class="recommendations">
<li><%= t("proposals.new.recommendation_one") %></li>
<li><%= t("proposals.new.recommendation_two") %></li>
<li><%= t("proposals.new.recommendation_three") %></li>
</ul>
</div>
</div>