consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,314 Commits 1 Branch 0 Tags
b8bfccd2bae4caaa925296a4e4f85584fb6ea0c7
Commit Graph

6211 Commits

Author SHA1 Message Date
Alberto
9475a0c6ee Merge pull request #3249 from consul/custom-pages 
Refactor processes header colors and custom pages
 2019-01-30 20:05:20 +01:00
Julian Nicolas Herrero
0e9fd645e8 Merge pull request #3234 from consul/use_find_instead_of_find_by_id 
[Backport] Use find instead of find_by_id
 2019-01-30 19:46:22 +01:00
decabeza
483182ceed Refactor scopes on site customization page model 2019-01-30 18:03:58 +01:00
decabeza
773302f0d7 Show only random order for unfeasible and unselected investments 2019-01-30 14:16:25 +01:00
decabeza
849dcb7a1a Fix map overlapping links 2019-01-30 14:16:19 +01:00
decabeza
7de846f55c Hide heading links if budget is finished 2019-01-30 14:15:49 +01:00
decabeza
9edabb5bf4 Fix links on budgets index page 2019-01-30 14:15:40 +01:00
decabeza
41f9ef167d Refactor hexadecimal color validation 2019-01-30 13:17:04 +01:00
decabeza
865dca85bf Improve layout of admin legislation process form 2019-01-30 13:16:35 +01:00
decabeza
5893ed7587 Create helper for legislation process header with custom colors 2019-01-30 13:15:42 +01:00
decabeza
2695e19e2f Fix hound warnings 2019-01-29 17:54:02 +01:00
Julian Nicolas Herrero
81b65ec821 Merge pull request #3202 from consul/sort_legislation_processes_by_start_date 
Sort Legislation Processes by descending start date
 2019-01-29 17:30:02 +01:00
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
3bf2fa1b17 Add method find_by_slug_or_id to Sluggable module 
Make it easier to find by slug or id for sluggable models. Will return
nil if resource is not found.
 2019-01-25 09:08:28 +01:00
Julian Herrero
9a23393535 Use find instead of find_by_id 
This method will raise an exception if resource is not found when
trying to call score_action on nil.
Prefer to raise a 404 HTML NotFound error instead.
 2019-01-25 09:03:56 +01:00
Julian Herrero
23b6e38915 Remove unused before_action 2019-01-25 08:54:28 +01:00
Julian Herrero
0af5972d63 Use correct param in controller 2019-01-25 08:48:44 +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
decabeza
a497e57475 Replace progress tag to div class progress 2019-01-24 17:39:56 +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
8c5907a3fb Add percentage text to progress bars 
Note we require extra <span> tags because the <progress> tag is an empty
tag (like <img>), and so it can't have ::before or ::after
pseudo-elements. There's a workaround for that, but currently it only
works on Chrome.

For some reason, the text seems to be slightly misaligned vertically in
all implementations I've tried. So the `top: -0.1rem` rule is a hack to
align it properly.
 2019-01-24 17:34:04 +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
7e89cc149f Replace default map image 2019-01-24 14:52:44 +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
25b56e84ec Merge pull request #3196 from consul/refactor_milestones_css 
[Backport] Refactor milestones css
 2019-01-24 12:02:15 +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
Julian Herrero
33d6f6c18d Sort Legislation Processes by descending start date 2019-01-22 18:51:22 +01:00
decabeza
f5c7065d90 Remove help and recommendations on legislation proposal new form 2019-01-22 11:52:25 +01:00
Manu
b462b7131e validations were added for the process banner 2019-01-21 12:02:27 -05: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
Javi Martín
2926e4e375 Fix managing widget cards for homepage 
The condition `params[:page_id] != 0` didn't work properly when editing
the homepage because in that case the parameter was `nil`, and the line
`SiteCustomization::Page.find(@card.site_customization_page_id)` raised
an exception because it couldn't find a page with a `nil` ID.

Fixing the issue while maintaining the check against `0` lead to complex
code, and so allowing `nil` in the database and assuming cards with no
`site_customization_page_id` belonged in the homepage seemed to be the
easiest solution.
 2019-01-21 10:40:14 -05:00
Javi Martín
9c050ca6bd Extract method to redirect when managing cards 2019-01-21 10:40:04 -05:00