Commit Graph

6186 Commits

Author SHA1 Message Date
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
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
decabeza
f5c7065d90 Remove help and recommendations on legislation proposal new form 2019-01-22 11:52:25 +01: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
Javi Martín
8a643c72e7 Use I18n for card notice messages 2019-01-21 10:39:42 -05:00
Manu
bff3a3b379 use relation between cards and page models 2019-01-18 09:54:43 -05:00
Manu
238ddc2595 fixed trailing whitespace hound alert 2019-01-18 09:54:43 -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
5627d2cf23 added associations between cards and pages models 2019-01-18 09:54:43 -05:00
Manu
2dd953bdfd added hound corrections and removed wrong tables form the schema.rb 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
fb72fc48fd Simplify milestones styles for small devices
The selector `nth-child(even)` didn't need specific rules, and it's
easier to understand the code for the selector `nth-child(odd)` if all
breakpoints are grouped together.
2019-01-18 14:26:17 +01:00
Javi Martín
46296b702e Group milestone content CSS rules together 2019-01-18 14:26:11 +01:00
Javi Martín
39c8d431f8 Group milestones timeline li CSS rules together 2019-01-18 14:26:08 +01:00
Javi Martín
cb92d29ddc Simplify nth-child selectors
Using `nth-child(odd), nth-child(even)` is the same as selecting all
the elements.
2019-01-18 14:26:05 +01:00
Javi Martín
51a4ca98ad Move milestone styles to their own sheet 2019-01-18 14:26:02 +01:00
Javi Martín
789476e6ab Synchronize percentage for new progress bars
According to the HTML specification:

> The default value is the minimum plus half the difference between the
> minimum and the maximum, unless the maximum is less than the minimum,
> in which case the default value is the minimum.

So for new progress bars, we had a numeric value of `nil` and a range
value of `50`, meaning the input fields weren't in sync.

Manually triggering the event on the progress, while not an ideal
solution (ideally we would be able to define `0` as default), sets the
value of the numeric field.
2019-01-18 14:17:53 +01: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
dfdf0b0636 Hide title field for primary progress bars
These bars don't have a title.
2019-01-18 14:17:37 +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
Javi Martín
eaea95ccfb Add progress bar model 2019-01-18 14:17:12 +01:00
Julian Nicolas Herrero
db404429fc Merge pull request #3190 from consul/release_0.18.1
Release 0.18.1
2019-01-18 10:43:43 +01:00
Javi Martín
f2210bc5b5 Update changelog for release 0.18.1 2019-01-17 13:17:38 +01:00