Commit Graph

4653 Commits

Author SHA1 Message Date
decabeza
ccee843da7 Remove unused settings
These settings are customised for Madrid's fork. On CONSUL any user can include new links using site customisation content blocks from admin panel.
2019-02-18 15:40:11 +01:00
Julian Herrero
884274c4ad Add a description for open polls 2019-02-18 13:34:07 +01:00
Javier Martín
b330de01f6 Merge pull request #3148 from matisnape/budget_investments_sorting_columns
Add sort links to admin tables
2019-02-15 19:19:11 +01:00
Julian Nicolas Herrero
4a12425987 Merge pull request #3296 from consul/make_budgets_translatable
[Backport] Make budgets translatable
2019-02-13 19:01:13 +01:00
Alberto
fad65b621a Merge pull request #3291 from consul/total-votes
[Backport] Use votes score instead of total votes on debates and legislation proposals
2019-02-13 17:15:39 +01:00
Alberto
eacf740087 Merge pull request #3290 from consul/budget-heading-alert
[Backport] Include heading names in "headings limit reached" alert
2019-02-13 17:10:38 +01:00
Julian Herrero
a963a99c55 Use correct scope to sort headings by name 2019-02-13 13:35:09 +01:00
Julian Herrero
922600252c Make budget headings translatable 2019-02-13 13:35:07 +01:00
Julian Herrero
1c35ec99c1 Make budget groups translatable 2019-02-13 12:30:37 +01:00
Julian Herrero
90d0a6e416 Make budget phases translatable 2019-02-13 11:44:56 +01:00
Julian Herrero
d76782f150 Make budgets translatable 2019-02-13 11:41:58 +01:00
Alberto
938d5eba43 Merge pull request #3191 from consul/ui-i18n-details
Fix i18n and UI minor details
2019-02-13 10:55:03 +01:00
decabeza
6b62ba0e91 Show cached_votes_score on admin legislation proposals 2019-02-12 18:42:44 +01:00
decabeza
0ae1cdfc8c Replace total votes to cached_votes_score on legislation proposals
This show votes_score as result of votes_up minus votes_down
2019-02-12 18:42:41 +01:00
decabeza
4e4804e180 Replace total votes to cached_votes_score on debates
This show votes_score as result of votes_up minus votes_down
2019-02-12 18:42:35 +01:00
Marko Lovic
4a2fae5e90 Add headings to "headings limit reached" alert msg 2019-02-12 17:16:40 +01:00
Alberto
f9b18667e6 Merge pull request #3280 from consul/next-filters
[Backport] Removes next/incoming filters
2019-02-11 20:43:09 +01:00
decabeza
6df471d082 Change layout on admin settings to prevent broken buttons 2019-02-11 15:41:52 +01:00
decabeza
b4ecd07f1f Refactor social share messages 2019-02-11 15:41:35 +01:00
Julian Nicolas Herrero
5a50992773 Merge pull request #3275 from consul/legacy_legislation_cleanup
LegacyLegislation migration cleanup
2019-02-08 20:04:19 +01:00
Alberto
73ecdb13ea Merge pull request #3278 from consul/budget-alert
[Backport] Do not display alert when supporting in a group with a single heading
2019-02-08 15:36:33 +01:00
decabeza
bc1679550b Remove incoming polls filter 2019-02-08 14:28:19 +01:00
decabeza
e68f5c0b77 Use labels for type text inputs 2019-02-08 12:29:00 +01:00
decabeza
8b295b14a3 Improve legislation processes form colors layout and add help text 2019-02-08 12:19:41 +01:00
rgarcia
55fb14ac14 do not display alert when supporting for whole city 2019-02-07 16:55:24 +01:00
Julian Herrero
54e59a8a58 LegacyLegislation migration cleanup
These legacy models are not used anymore.
2019-02-06 17:07:38 +01:00
Alberto
14e73e9086 Merge pull request #3269 from consul/homepage-feeds
[Backport] Change layout on homepage if feed debates and proposals are enabled
2019-02-06 14:32:46 +01:00
Alberto
6a7fcde9a6 Merge pull request #3268 from consul/budget-polish
[Backport] Budgets UI minor fixes
2019-02-06 14:31:26 +01:00
Alberto
282ae61139 Merge pull request #3252 from consul/custom-pages-cards
Allow select column width for widget cards
2019-02-05 17:37:46 +01:00
decabeza
218c8e1ae7 Change layout on homepage if feed debates and proposals are enabled 2019-02-05 17:28:57 +01:00
decabeza
5c7cc5a20f Improve space for links on budget index 2019-02-05 17:16:10 +01:00
decabeza
a2161f3ace Hide voted group css class if current filter is unfeasible 2019-02-05 17:16:04 +01:00
decabeza
025bcedce9 Show project winner label only if budget is finished 2019-02-05 17:15:40 +01:00
decabeza
5974b7ee84 Update calculate winners button on budgets form 2019-02-05 17:15:26 +01:00
Alessandro Cuoghi
2e9973cd4a Add new texts
- Changed texts
- Fixed Spec
2019-02-04 16:20:44 +01:00
Alessandro Cuoghi
af71ef0c35 Add style
- Inverted h2 with h3
- Add strong tag
2019-02-04 16:20:35 +01:00
Alessandro Cuoghi
980f0d4283 Allow toggle for pending proposal and done proposal 2019-02-04 16:14:58 +01:00
Alessandro Cuoghi
4d242bf50d Add toggle description to proposed action 2019-02-04 16:14:50 +01:00
taitus
487c485fe0 Add new section on sidebar menu for recommended proposals
- Display recommended_proposals on new section as goals with toogle.
- Divide recommended actions into actions done and actions pending to clarify the information to the user as summary_recomended_actions.
2019-02-04 11:48:47 +01:00
taitus
45afbc0b10 New summary for recommended actions section on progress page
- Divide recommended actions into actions done and actions pending.
- Display recomended actions as goals (diplay four by defalut) without toggle but with link to new recommended actions page.
- Display description over short_description
2019-02-04 11:39:04 +01:00
Alessandro Cuoghi
d81d1537d0 Created new quotes
- Created blue images quotes
- Added quotes images to preview poster
- Added quotes images to download poster
- Removed reference to Decide Madrid and use %{org}
- Removed reference to decide.madrid.es and use %{link}
- FIxed some style (font, padding, maring) in PDF
- Passed scss-lint
2019-02-02 19:18:27 +01:00
Alessandro Cuoghi
44964c35f9 Added quotes images
- Created white quote images png (before and after)
- Added images quotes to preview email and email.
- Added max width to images quotes png
2019-02-02 19:18:27 +01:00
Alessandro Cuoghi
56dadcb701 Changed logo image
- The original logo is white. Created black version for white background.
- Added logo in preview email and send email.
2019-02-02 19:18:27 +01:00
Alessandro Cuoghi
394a7e55ee Fixed some style preview email and email
- Removed class large-7
- Changed font size preview-email and email
- Changed text color in the email
- Changed some font size and padding in the email
- Added some padding in preview email
- Pass scss-lint
- Changed padding and added font size.
2019-02-02 19:18:27 +01:00
Alessandro Cuoghi
70171b0e17 Fix PDF and email
- Inserted normal quotation marks
- Remove class quote
- Added max width mail preview
- Added some styles in the email
- Added image decide_madrid at the end of the email
- Added cover to the image preview poster and PDF
- Passed scss lint
2019-02-02 19:18:27 +01:00
Alessandro Cuoghi
003d3e82b0 Convert Color to Variables
- Added two temporal variables for colors. (Deciding how to call these new variables)
- Replaced hexadecimal with variable
- Remove white space in the html
2019-02-02 19:18:26 +01:00
Alessandro Cuoghi
145e0ae659 Show Preview only in Large version
- Add class Foundation show-for-large
- Fixed width Preview so as not to make it responsive
2019-02-02 19:18:26 +01:00
Alessandro Cuoghi
f317514258 Change Finger icon SVG to PNG
- Suggestion DeCabeza until FontAwesome is inserted.
- Remove SVG and convert to PNG
2019-02-02 19:18:26 +01:00
Alessandro Cuoghi
5fd9b2b633 Change quote and fix font
- Created new quotation marks without svg - Greater flexibility

- Fix font Lato in PDF - change font family in pdf_font
2019-02-02 19:18:26 +01:00
Alessandro Cuoghi
4ec858f1a0 Email Style
- Added style as per email sent
- Change color
- Changed alignment title
- Added image decide madrid
- Added Shadow to image
2019-02-02 19:18:26 +01:00