Commit Graph

3400 Commits

Author SHA1 Message Date
Alberto
f9940980b0 Merge pull request #2645 from wairbut-m2c/admin-form-improvements-backport
Admin form improvements
2018-06-07 17:44:38 +02:00
Alberto
d8d97b30db Merge pull request #2663 from consul/homepage-custom
Homepage layout
2018-06-06 19:31:51 +02:00
Alberto
88ff6560ee Merge pull request #2620 from consul/budgets-see-results
Budgets see results
2018-06-06 19:21:04 +02:00
decabeza
ee0bbe42fd Improves homepage layout 2018-06-06 17:42:54 +02:00
decabeza
1fb3c16efe Adds see results button on budget investment admin 2018-06-06 17:41:30 +02:00
decabeza
47050292b2 Shows see results button only if budget finished 2018-06-06 17:40:49 +02:00
decabeza
b2015312d8 Moves mailer header and footer to partials
This prevent use the entire HTML layout, an HTML inside another HTML
without using an iframe create some validation errors and break layout
details
2018-06-06 17:33:15 +02:00
decabeza
be8bcf9269 Adds missing i18n on welcome recommendations 2018-06-06 17:33:15 +02:00
decabeza
4556a97c7f Removes custom content on debates index 2018-06-06 17:32:17 +02:00
decabeza
fbf917d9b0 Fixes headings height on budgets index 2018-06-06 17:32:17 +02:00
decabeza
0bf31bde6c Updates all active to is-active classes 2018-06-06 12:02:13 +02:00
decabeza
6a812659c3 Adds missing tablist and tab roles 2018-06-06 12:01:17 +02:00
decabeza
ee884ed998 Updates active to is-active class for menus 2018-06-06 12:01:16 +02:00
decabeza
94087d0453 Updates tabs component for legislation proposals 2018-06-06 12:01:16 +02:00
decabeza
7ea85ec2ab Updates tabs component for budget investments 2018-06-06 12:01:16 +02:00
decabeza
18f8e35df3 Updates tabs component for proposals 2018-06-06 12:01:16 +02:00
decabeza
55c3c79879 Updates admin top bar html and styles 2018-06-06 12:01:16 +02:00
decabeza
fcae2c0ac2 Updates top bar html and styles 2018-06-06 12:00:39 +02:00
Alberto
a05f6ac61a Merge pull request #2641 from consul/homepage
Add customization of homepage from admin section
2018-06-01 19:18:44 +02:00
Alberto
ec58ada817 Merge pull request #2650 from aamarill/2586-split_admin_settings
Split admin settings
2018-06-01 19:18:14 +02:00
decabeza
8664ac887a Expands proposals content if there no have image 2018-06-01 18:01:01 +02:00
decabeza
ef57396f9d Fixes styles for admin homepage 2018-06-01 18:00:19 +02:00
decabeza
a9eca180a4 Adds missing label for header card 2018-06-01 17:01:10 +02:00
decabeza
f2c18c3812 Adds styles to admin homepage feeds 2018-05-30 11:58:43 +02:00
rgarcia
b672a4550d Add option to configure feed items displayed in homepage 2018-05-29 19:58:04 +02:00
decabeza
304143d051 Updates localization and home specs 2018-05-29 13:22:23 +02:00
decabeza
316c816836 Expands cards if feed processes is not enabled 2018-05-28 18:52:59 +02:00
decabeza
7732a6704c Adds styles and i18n for homepage 2018-05-28 18:17:26 +02:00
rgarcia
ad181b0e10 Add label to cards
Also removes unused fields related to buttons and alignment
2018-05-28 18:17:26 +02:00
rgarcia
eaebf349df Fix specs
Regarding the feature ‘Carousel size’:
There is no need to test styling in specs, it changes too often
There are nice ways to test it, but it seems a little too much right
Review later on
2018-05-28 18:17:26 +02:00
decabeza
0ac6531612 Adds styles for homepage users view 2018-05-28 18:17:26 +02:00
decabeza
50fd540797 Adds styles and missing i18n for admin homepage 2018-05-28 18:17:26 +02:00
rgarcia
0e097973cc Add widget feeds to homepage
Note there is some funkiness going on with class loadings
Had to create a `feed` and `widget_feed` table even though in this
first version the Widget::Feed includes only uses ActiveModel instead
of ActiveRecord, otherwise some specs failed

We’ll figure it out and clean up 😌
2018-05-28 18:17:26 +02:00
rgarcia
c7f85c4173 Add widget header to homepage 2018-05-28 18:17:26 +02:00
rgarcia
664e77305c Add widget cards to homepage 2018-05-28 18:17:26 +02:00
rgarcia
85c08da7a6 Add homepage admin section 2018-05-28 18:17:26 +02:00
iagirre
2821985552 Change 'Calculate Winners button' to budget_investments index.
Move the button so that it appears in the Winners tab of the
budget_investments index.

When the budget is in "Balloting projects", "Reviewing Ballots"
or "Finished budget" phases, the button will appear as a button
(clickable). If there are no winners calculated yet, the text
will be "Calculate winner investments"; if there are, the text
will be "Recalculate winner investments".

If the budget is in another phase, the button will be
disabled and a message will appear: 'The budget has to stay on
phase "Balloting projects", "Reviewing Ballots" or
"Finished budget" in order to calculate winners projects'
2018-05-28 15:12:28 +02:00
Adan Amarillas
361518b57c Modify tests to reflect the new navigation on admin configuration settings 2018-05-24 14:49:31 -07:00
Adan Amarillas
60bc3f663a Make tabs i18n-friendly 2018-05-24 09:57:28 -07:00
Adan Amarillas
2c5cefcfdd Adjust tests to new navigation. Add id tag to map tab so it can be found by id 2018-05-24 09:55:51 -07:00
Adan Amarillas
7f0bfd44b7 Split configuration settings into tabs 2018-05-24 09:55:51 -07:00
Adan Amarillas
b59af89c09 Add 'settings' link to side menu on Admin's panel. 2018-05-24 09:55:51 -07:00
decabeza
608f1996ce Fixes admin layout 2018-05-23 08:08:54 -04:00
Angel Perez
2c37702298 Sort booths by name and enable pagination 2018-05-23 08:08:54 -04:00
Angel Perez
f220c477c1 Remove proposals_description attr from Admin::Legislation::Processes module 2018-05-23 08:08:54 -04:00
Angel Perez
9a326d4987 Use 'drafting' as default value when creating a new budget 2018-05-23 07:27:12 -04:00
Angel Perez
4c0deb0eca Remove video_url attr from Admin::Poll::Question form 2018-05-23 07:27:12 -04:00
Angel Perez
44b1eb929a Move 'Show stats and results' form to Admin::Poll#results tab 2018-05-23 07:27:12 -04:00
Raúl Fuentes
376ce443ef Add logic to user verification
changed functions on verification.rb, the first thing they do is
return true whene skip_user_verification is active.
changed show_welcome_screen? on user.rb, now its shows the welcome
page even with te option active.
changed welcome.html.erb, now if the user see this view and the
option is activated, all 4 checks are green, not only 2.
2018-05-22 15:02:35 +02:00
Antonis Tzorvas
c21d806ecc Refs #2603 Show 'See Results' button in admin panel 2018-05-19 13:38:02 +03:00