Commit Graph

5602 Commits

Author SHA1 Message Date
decabeza
ecb0041b7f Adds recommended index partial and styles 2018-07-15 21:28:56 -04:00
Alberto
38916deb0b Merge pull request #2765 from consul/budgets-polls-ui
Polls UI
2018-07-13 20:01:40 +02:00
decabeza
bbaec57c8a Adds message in budget investment show if project is winner 2018-07-13 18:37:16 +02:00
decabeza
1116340f99 Removes participate in other polls button 2018-07-13 18:27:32 +02:00
iagirre
0d9da5398b Fix banners in user pages
Banners were not been shown in certain pages; now
they are.

Spec to check if the banner is been shown correctly
added. Before it was in admins specs, now it has it's
own spec out of admins folder.
2018-07-12 10:17:25 -04:00
iagirre
82cb8d4c52 Changes suggested in PR:
* Delete all things related to banner images and styles (in code)
* Add a new test to check that the banner is showing correctly
* Update the specs accordingly to match the changes

Update dev_seed to set a random background_color and a font_color for banners (and remove everything about image and style)
Add a rake task to migrate the banner style to backgroun_color and font_color (so that the banners have the same colors than before)
2018-07-12 10:17:24 -04:00
iagirre
58caf167f6 Make color-pickers smaller 2018-07-12 10:16:47 -04:00
iagirre
3690cae458 Apply banner style to the new banners
Banner sections can be saved (one banner can appear in several sections)
If the hex color is changed in the textfield, the color of the color picker changes.
2018-07-12 10:16:47 -04:00
iagirre
6d6da8affc Add form fields to set the colours and the sections for the banner
Add migrations to store the information in the database
2018-07-12 10:16:47 -04:00
Raimond Garcia
3e4d095e6f Merge pull request #2719 from javierv/2718-fix_flaky_milestone_spec
Fix flaky spec: Budget Investments Show milestones
2018-07-12 16:07:48 +02:00
Raimond Garcia
e370069804 Merge pull request #2708 from javierv/fix_suggestions_keyup
Fix suggestions being requested with every keystroke
2018-07-12 16:05:09 +02:00
Raimond Garcia
a3a5971cbf Merge pull request #2696 from javierv/2573-fix_flaky_budgets_spec
Fix flaky spec: Admin budgets Manage groups and headings Create group
2018-07-12 16:04:06 +02:00
Raimond Garcia
eb13c83a95 Merge pull request #2695 from javierv/2446_and_2519-fix_flaky_emails_spec
Fix flaky specs: Emails Budgets Selected/Unselected investment
2018-07-12 16:02:28 +02:00
Alberto
c5c611837d Merge pull request #2732 from consul/legislation-help-gif
Legislation help gif
2018-07-11 17:44:12 +02:00
decabeza
334e567d0d Adds generic annotator help gif 2018-07-11 14:37:27 +02:00
Alberto
b8396135e9 Merge pull request #2752 from consul/following-hidden-proposals
Deal gracefully with hidden followable in my activity
2018-07-10 18:44:34 +02:00
rgarcia
88cde6d018 Deal gracefully with hidden followable in my activity
We were seeing an exception when a user was following a proposal and
that proposal becomes hidden

With this commit we are skipping this proposals and hopefully fixing
this exception

We are also adjusting the count of followed proposals, without
including hidden proposals. It might be cleaner, to remove a `Follow`
when its `Followable` becomes hidden. But then we should probably
activate the `Follow` again if the `Followable` becomes non-hidden…

For now this commit should suffice 😌
2018-07-10 17:50:51 +02:00
rgarcia
f670019325 Deal gracefully with recommendations of hidden proposals
We were seeing an exceptions in the home page when displaying
recommendations. This was due to trying to load tags of hidden proposals

With this commit we are skipping proposals that that have been hidden,
which will hopefully solve this exception
2018-07-10 17:47:28 +02:00
decabeza
9ecb4f4f22 Fixes heading name on budgets index view 2018-07-05 18:14:15 +02:00
decabeza
2b958de992 Fixes valuation budget investments ui 2018-07-05 18:14:08 +02:00
decabeza
3dc469ad2d Adss image height to recommendations on homepage 2018-07-05 18:13:45 +02:00
decabeza
a6ce928bc6 Fixes images size on help pages 2018-07-05 18:13:38 +02:00
decabeza
6f4f161076 Adds help gif on legislation processes with texts 2018-07-05 18:10:06 +02:00
Alberto
95f66aefe6 Merge pull request #2726 from consul/officing-no-vote
Officing not to vote
2018-07-05 17:07:10 +02:00
decabeza
2f922e1adb Adds button to officing voters if person decided not to vote 2018-07-05 14:12:22 +02:00
Alberto
e201de6ac9 Merge pull request #2725 from consul/officer-shifts
Officing sidebar menu
2018-07-05 11:08:42 +02:00
decabeza
16ff5c4400 Hides sidebar menus if officer has no shifts assigned 2018-07-04 17:22:03 +02:00
decabeza
8900b1ffce Shows flag actions div only if user can hide 2018-07-04 17:14:29 +02:00
decabeza
abf0fe992e Removes tablist and tab roles 2018-07-04 17:14:24 +02:00
Javier Martín
37eaf29517 Fix flaky emails spec.
These tests were failing randomly because there is no guarantee
the methods `Budget#email_selected` and `Budget#email_unselected` will
always send the emails in the same order, because `investments.selected`
and `investments.unselected` don't necessarily return the records in the
order they were created.

Ordering by id is certainly not very elegant; however, ordering by
another field like `created_at` is dangerous because the record could be
created at (almost) the exact same time.

Related to issue #2446 and issue #2519.
2018-07-03 23:59:20 +02:00
Alberto
1de0cf083f Merge pull request #2717 from consul/allow-author-notifications-to-be-moderated
Allow author notifications to be moderated
2018-07-03 11:21:26 +02:00
Alberto
ff4c72987f Merge pull request #2716 from consul/admin-booths-menu
Adds ballot booths menu on admin
2018-07-03 11:20:42 +02:00
Javier Martín
f2ef27d3ae Always set Globalize.locale after I18n.locale.
The test "Budget Investments Show milestones" was failing in certain
cases where `Globalize.locale` had been changed in a previous test.

Since having different values in `Globalize.locale` and `I18n.locale`
has proven to be an issue on the test enviroment, this commit also
changes application code in order to avoid similar situations on
production.

See issue #2718.
2018-07-03 00:52:20 +02:00
iagirre
894c5d1eca Fix restore notifications from admins page
The restore feature was not working properly. When pushed, the button
was removing the notification from the admins panel, but it was not
restoring in the proposal.

I added an `after_restore` function (that I missed in the first PR)
so that the notification is unmarked as moderated.
2018-07-02 18:19:49 +02:00
iagirre
0fb7d13229 Add admin UI to Restore/Confirm moderation of notifications
Add the admin UI needed to restore the hidden proposal notifications
when hidden by moderator. The admin can restore them or confirm
the moderation made by moderator, just like proposals.
2018-07-02 18:19:19 +02:00
iagirre
88a8aaa083 Add hide button in the user interface
The little menu with the hide notification link and block user link
has been added to each proposal notification.

JS for adding the fade efect has also been added.
2018-07-02 18:19:08 +02:00
iagirre
12ccf466f9 Add the index to moderate the notifications
Add the index for moderating the notifications. The tranlations needed
have also been added, along with the JS to make it disappear at that moment.
2018-07-02 18:18:01 +02:00
iagirre
f58bc5d886 Add the menu entry for prop. notifications
A new menu for the sidebar has been added, so that the moderator
can access to the index from the menu.
2018-07-02 18:17:56 +02:00
iagirre
21b1d00205 Add backend for the moderators
Add new routes for the proposal notifications edition and
abilities to let moderators edit it (mark as ignored, hide, etc.).

The notifications are not flaggable because they doesn't work like that,
but in a similar way. The moderator/administrator is in charge of hidding
them through the UI, so the normal users don't flag it as inappropriate.

New controller Moderation::ProposalNotification to manage the moderators
work.
2018-07-02 18:17:45 +02:00
decabeza
0a58e72edb Adds ballot booths menu on admin 2018-07-02 17:57:27 +02:00
decabeza
2e8fe65b3d Cleans and improves management views layout 2018-07-02 17:41:39 +02:00
decabeza
3b9b9c5c8f Updates styles for management section 2018-07-02 17:41:29 +02:00
decabeza
57a0aaba97 Reorganizes manager menu and creates helper 2018-07-02 17:41:22 +02:00
Javier Martín
e655c3c958 Fix suggestions keyup timeout.
The browser was generating one AJAX request per keystroke, ignoring the
timeout. The clearTimeout() function needs to be called with the ID
value returned by setTimeout().
2018-06-28 21:06:32 +02:00
decabeza
d683a6cd6b Adds styles to budget investment milestone status and fixes spec 2018-06-27 19:28:43 +02:00
María Checa
a5d0c2f6c8 Changed Budget::Investment::Milestone views 2018-06-27 18:23:34 +02:00
María Checa
551e2bb1c4 Changed Budget::Investment::Milestones model
Added relation with Status and set condition to validate milestone's description presence if there's no status set.
2018-06-27 18:19:33 +02:00
María Checa
29dadc91ac Change Budget::Investment::Milestones controller
Added `:status_id` to valid params and new method to get all statuses defined for the budget.
2018-06-27 18:19:29 +02:00
María Checa
3a163b39c8 Add Budget::Investment::Statuses views 2018-06-27 16:45:44 +02:00
María Checa
2cb59260e9 Add Budget::Investment::Statuses controller and routes 2018-06-27 16:44:58 +02:00