Commit Graph

1086 Commits

Author SHA1 Message Date
Alberto
41fe1e3922 Merge pull request #3152 from NahiaSolutions/add_image_to_legislation_processes
Add image to legislation processes and banner colors
2019-01-29 16:06:54 +01:00
Alberto
ebe5bf13e7 Merge pull request #3149 from NahiaSolutions/add_cards_to_custom_pages
Add cards to custom pages
2019-01-29 16:05:47 +01:00
Alberto
78479ff0e7 Merge pull request #3228 from consul/milestones_public_progress_bar
[Backport] Add progress bars to milestones public view
2019-01-29 14:12:08 +01:00
Alberto
bd4826b25e Merge branch 'master' into add_cards_to_custom_pages 2019-01-28 14:49:39 +01:00
Alberto
c297595e49 Merge branch 'master' into add_image_to_legislation_processes 2019-01-28 14:49:19 +01:00
Julian Herrero
8f112cf37e Allow admins delete poll answer documents 2019-01-24 19:19:04 +01:00
Javi Martín
1962fcc2a2 Hide locale selector for primary progress bars
These progress bars don't have any translatable attributes.
2019-01-24 17:34:55 +01:00
decabeza
045c4eca64 Allow change map image from admin site customization
Also adds on site customization image.rb jpeg content type to allow replace this image.
2019-01-24 14:55:01 +01:00
Alberto
227f496f6d Merge pull request #3195 from consul/milestone_progress_bar
[Backport] Manage milestone progress bars
2019-01-24 11:59:24 +01:00
decabeza
75531c6c80 Show current phase as selected on phase select on admin budgets form 2019-01-23 14:30:35 +01:00
Manu
d08fc08769 added i18n to process form 2019-01-21 12:02:27 -05:00
Manu
37edfb94a4 changed h4 instead of h3 2019-01-21 12:02:27 -05:00
Manu
1e020f4df8 use banners js in new legislative process 2019-01-21 12:02:27 -05:00
Manu
bd4e12112d Add image to legislation processes and banner colors 2019-01-21 12:02:27 -05:00
Manu
86d75767e8 change h3 tag to h2 and added title of the custom page which we are adding the cards 2019-01-18 09:54:43 -05:00
Manu
26db37a17f fixed wrong menu selection inside site content 2019-01-18 09:54:43 -05:00
Manu
7657a0e0b4 added i18n text to custom pages cards 2019-01-18 09:54:43 -05:00
Manu
722a431b54 Add cards to custom pages 2019-01-18 09:54:43 -05:00
Javi Martín
fff5673ec0 Simplify hiding/showing progress bar type field
With a parent element for just input and label, there aren't conflicts
with the globalize tabs code anymore.
2019-01-18 14:17:48 +01:00
Javi Martín
96454a41f0 Use I18n keys instead of human_attribute_name
Even if it means duplicating the translations in many cases, it's
consistent with the rest of the application.
2019-01-18 14:17:45 +01:00
decabeza
7c0fb96b02 Adds styles to admin progress bars views 2019-01-18 14:17:40 +01:00
Javi Martín
c5d32c5ab9 Manage progress bars in the admin area 2019-01-18 14:17:33 +01:00
Javi Martín
4f25581636 Add progress bar polymorphic views 2019-01-18 14:17:29 +01:00
Julian Herrero
d77183ee09 Improvement - CRUD budgets and content blocks 2019-01-14 12:59:48 +01:00
Julian Nicolas Herrero
702dc2bef5 Merge pull request #3154 from consul/backport-check_for_deleted_proposals
[Backport] checks for deleted proposals
2019-01-09 17:57:01 +01:00
Julian Nicolas Herrero
08a692341a Merge pull request #3150 from consul/backport-1769-crud_budget_and_usa
[Backport] new CRUD budgets, content blocks and heading map
2019-01-09 17:35:46 +01:00
rgarcia
e3eb87addb checks for deleted proposals 2019-01-04 15:25:13 +01:00
Julian Herrero
c5a7492128 add some improvements on budget headings
Show information about longitude and latitude in a budget heading
Show information about custom content in a budget heading
Fix render of map (zoom scrollable and points clickable)
Fix typo in app/models/map_location.rb
2019-01-02 10:46:46 +01:00
decabeza
6a580ede5b Improves layout of admin legislation homepage form 2018-12-28 18:23:12 +01:00
Alberto
63f7c18399 Merge pull request #3123 from consul/admin-questions
[Backport] Admin poll questions index
2018-12-26 11:32:28 +01:00
decabeza
9c827d6ce0 Adds poll name on admin poll questions index 2018-12-19 21:00:09 +01:00
decabeza
aebd29f7e2 Adds create question button to admin proposals show 2018-12-19 16:08:57 +01:00
Raimond Garcia
a8de5306c8 Merge pull request #3091 from dpgigorro/2791-homepage-for-legislation-process
add homepage for legislation processes
2018-12-19 11:14:24 +01:00
Julian Nicolas Herrero
2175339609 Merge pull request #3106 from consul/2918-crud_budget_groups_headings
Change CRUD for budget groups and headings
2018-12-18 10:23:24 +01:00
dperez
ff9a32c0a5 code reviewed 2018-12-15 18:04:24 +01:00
dperez
bef404c443 add homepage for legislation processes 2018-12-15 18:04:24 +01:00
Julian Herrero
6439be44f1 change CRUD for budget groups and headings
To make it more consistent with the rest of the Admin panel,
the CRUD for budget groups and headings has been changed
from the old "all-in-one" form to a separate form for each resource.
2018-12-14 16:34:54 +01:00
Julian Herrero
8fb8f70efd cleanup (due to new CRUD for budget groups and headings) 2018-12-14 15:37:25 +01:00
Javi Martín
449f810255 Edit only existing languages in milestones summary
Adding languages using this form would result in validation errors since
there's no way to fill in the title for the new translation.
2018-12-12 15:15:01 +01:00
Javi Martín
70b4225542 Extract partial to display language tabs 2018-12-12 15:15:00 +01:00
Javier Martín
8bcf713d10 Merge pull request #3100 from consul/backport-2743-add_milestones_to_legislation_processes
Add milestones to legislation processes
2018-12-12 15:12:36 +01:00
Javi Martín
a42f5fab37 Add milestones summary to legislation processes 2018-12-11 20:19:48 +01:00
Javi Martín
03dc43a500 Manage legislation process milestones 2018-12-11 20:18:53 +01:00
Javi Martín
2fcbee6261 Manage proposal milestones 2018-12-11 20:09:47 +01:00
Javi Martín
8c45be7887 Show proposal info in admin 2018-12-11 20:09:30 +01:00
Javi Martín
d3f11c3b55 Add search form to proposals admin index 2018-12-11 20:09:30 +01:00
Javi Martín
4770217373 Add proposals index in admin 2018-12-11 20:09:30 +01:00
Javi Martín
64d6b7491a Make partial listing milestones reusable
So it isn't specific to budget investments anymore.
2018-12-11 19:22:55 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
2018-12-11 18:21:14 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00