consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,282 Commits 1 Branch 0 Tags
ebe5bf13e7feccfab25fe5cb8a81bfc1f211565f
Commit Graph

11282 Commits

This Branch
This Branch
All Branches
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
Alberto
4c511c534a Merge pull request #3231 from consul/poll-answer-documents 
[Backport] Allow admins delete poll answer documents
 2019-01-24 22:21:20 +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
decabeza
b588cd3a0b Add missing i18n 2019-01-24 21:39:08 +01:00
Julian Herrero
8f112cf37e Allow admins delete poll answer documents 2019-01-24 19:19:04 +01:00
decabeza
d650b90e25 Adds missing backport content on progressable specs 2019-01-24 18:33:26 +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
Alberto
45079c2963 Merge pull request #3229 from consul/polls-results-stats 
[Backport] Hide polls results and stats to admins
 2019-01-24 17:46:39 +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
97ef69ee33 Rename progressable specs to admin_progressable 
We're going to introduce progress bars in the public view as well, and
it's more consistent with "admin_milestoneable".
 2019-01-24 17:39:42 +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
ad355d4df6 Merge pull request #3197 from consul/add_progress_bar_dev_seeds 
[Backport] Add progress bar dev seeds
 2019-01-24 12:44:51 +01:00
Javi Martín
0a710a77f2 Add progress bars dev seeds 2019-01-24 12:03:02 +01:00
Javi Martín
7317238382 Reduce the number of locales for milestones seeds 
Creating records for every locale was taking too long now that CONSUL is
available in 15 languages.
 2019-01-24 12:03:02 +01:00
Javi Martín
210ab69197 Add milestone seeds to legislation processs 2019-01-24 12:03:02 +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
Alberto
c3d77820ab Merge pull request #3203 from consul/admin-budgets-form 
[Backport] Show current phase as selected on phase select on admin budgets form
 2019-01-23 15:21:19 +01:00
decabeza
75531c6c80 Show current phase as selected on phase select on admin budgets form 2019-01-23 14:30:35 +01:00
Alberto
d4eaa03c52 Merge pull request #3200 from consul/legislation-proposal-new 
Remove help and recommendations on legislation proposal new form
 2019-01-23 14:27:06 +01:00
decabeza
f5c7065d90 Remove help and recommendations on legislation proposal new form 2019-01-22 11:52:25 +01:00
Javi Martín
486100bf53 Add specs for custom page cards 2019-01-21 10:40:24 -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
Javi Martín
8a643c72e7 Use I18n for card notice messages 2019-01-21 10:39:42 -05:00
Alberto
858faa481c Merge pull request #3198 from consul/budget-text 
[Backport] Update budgets confirm group es translation
 2019-01-18 17:55:31 +01:00
decabeza
908afb5f32 Update budgets confirm group es translation 2019-01-18 17:02:32 +01:00
Manu
162b61f94c updated test file for cards 2019-01-18 09:54:43 -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