Commit Graph

3821 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
rgarcia
dacc2d529d Fix destroy document specs
We were linking to the document url itself, which does not have a route
associated and so the specs fails

With this commit we are using the correct path to the destroy action of
the DocumentsController.

We are also using the referrer instead of a params[:from] attribute, as
it avoids having to pass an extra parameter, making the code prettier
and it works the same way
2019-01-24 21:39:43 +01:00
Julian Herrero
8f112cf37e Allow admins delete poll answer documents 2019-01-24 19:19:04 +01:00
Alberto
5d790eae67 Merge pull request #3230 from consul/admin-images-map
[Backport] Allow change map image from admin
2019-01-24 17:48:02 +01:00
decabeza
78d8e34415 Show following tab on process if there are progress bar
Before, this tab only was show if were some milestone
2019-01-24 17:40:09 +01:00
decabeza
b27616eeed Add styles to milestones progress bars 2019-01-24 17:40:05 +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
Javi Martín
ce0a93be58 Add styles to milestones progress bars 2019-01-24 17:33:56 +01:00
Javi Martín
84fc254e92 Extract milestones progress bars to a partial 2019-01-24 17:33:49 +01:00
Javi Martín
b552f6e70b Add heading to milestones progress bars 2019-01-24 17:33:43 +01:00
Javi Martín
e73f3bd97a Add progress bars to milestones public view 2019-01-24 17:33:34 +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
decabeza
4498c26ff7 Create helper for active menus and show stats or results on poll subnav 2019-01-24 14:44:11 +01:00
decabeza
62088bc635 Hide poll results and stats to admins 2019-01-24 14:33:41 +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
decabeza
f5c7065d90 Remove help and recommendations on legislation proposal new form 2019-01-22 11:52:25 +01:00
Manu
d08fc08769 added i18n to process form 2019-01-21 12:02:27 -05:00
Manu
b6cfe92d76 fixed banner styles issues 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
142a0403d6 added new scss class 'custom-page' 2019-01-18 09:54:43 -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
decabeza
9dfbeed140 Moves draft and final result publication dates from tabs to sidebar 2019-01-15 16:13:41 +01:00
decabeza
73637de0d0 Adds homepage phase and tab to legislation processes show 2019-01-15 16:13:38 +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
Alberto
bbcb96027b Merge pull request #3137 from consul/key-dates-processes
[Backport] Processes key dates
2019-01-08 10:51:40 +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
Julian Herrero
d2b3943968 improve rendering of map in the sidebar 2019-01-02 10:41:03 +01:00
decabeza
6a580ede5b Improves layout of admin legislation homepage form 2018-12-28 18:23:12 +01:00
decabeza
dd8e2d6311 Shows participation phases only if there is a phase enabled 2018-12-28 18:23:08 +01:00
decabeza
a982f97cbd Adds documents list on legislation process proposals phase 2018-12-28 17:22:03 +01:00
Alberto
db740df33d Merge pull request #3131 from consul/documents-title
[Backport] Documents title
2018-12-27 13:13:45 +01:00
Javier Martín
d7e41fb556 Merge pull request #3127 from consul/fix_date_order_translations
Bring back date order translations
2018-12-26 16:40:03 +01:00