Commit Graph

10117 Commits

Author SHA1 Message Date
Alberto
093a8cdb10 Merge pull request #3261 from Platoniq/dashboard-poster-email-styles
Dashboard poster email styles
2019-03-19 16:21:20 +01:00
Alberto
501f6257bf Merge pull request #3260 from Platoniq/dashboard-actions-for-published-proposals
Dashboard actions for published proposals
2019-03-19 16:20:47 +01:00
Alberto
f9586bc97c Merge pull request #3259 from Platoniq/dashboard-fix-counter-design
Dashboard fix counter design
2019-03-19 16:20:28 +01:00
Raimond Garcia
087faa15e8 Merge pull request #3258 from Platoniq/dashboard-wrong-calculate-week
Dashboard wrong calculate week
2019-02-28 13:37:46 +01:00
Raimond Garcia
117b7c848d Merge pull request #3257 from Platoniq/dashboard-actions-attachments
Dashboard actions attachments
2019-02-28 13:33:38 +01:00
Raimond Garcia
273241a184 Merge pull request #3256 from Platoniq/dashboard-progress-page
Dashboard progress page
2019-02-28 13:31:37 +01:00
Raimond Garcia
d775d118cb Merge pull request #3255 from Platoniq/dashboard-admin-pending-tasks
Dashboard admin pending tasks
2019-02-28 13:30:37 +01:00
Raimond Garcia
2d04ecfb61 Merge pull request #3254 from Platoniq/dashboard-wrong-schema
Dashboard wrong schema
2019-02-28 13:29:03 +01:00
taitus
9fac661f0c Create scope by_proposal
Add to active_for class method and to active_resources controller method the new scope by_proposal.
 - Published proposal: display all actions.
 - Draft proposal: only display actions for draft proposals.
2019-02-10 00:18:50 +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
taitus
a6d822cc7a Add zoom and dpi values to correct the pdf display when environment is not development. 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
Alessandro Cuoghi
8064ac3779 Converted the tag image into background image
- Converted the TAG image into background image inside an overflow container because the height of the image in the pdf pushes to create 2 pages.

- Remove unused css
-
2019-02-02 19:18:26 +01:00
Alessandro Cuoghi
1d910c0073 Style PDF
- Added icon finger
- Chnage color quote
- Add class icon-finger
- Add some style
- Remove Open Sans
- Arranged the content in the A4
- Remove some style css
2019-02-02 19:18:24 +01:00
Alessandro Cuoghi
981e718a48 Style Generate Pdf
- Change some style
- Fixing the bug to the svg that was not rendered
- Change some rem  to cm
- The Lato font does not render well while Open Sans is correct. Strong and normal weight.
2019-02-02 19:17:59 +01:00
Alessandro Cuoghi
667039b127 Style Preview Pdf
- Customized the preview as shown by email
- Added two svg for quote icons. (Need convert to font)
- Ceate two class for quote icons.
- Added tag strong into yml for text decoration
- Customize css
2019-02-02 19:17:33 +01:00
taitus
082cc41a1e Allow admin set published_proposal field 2019-02-02 17:45:55 +01:00
taitus
3048578c53 Add new boolean field published_proposal to Dashboard::Action
Need differentiate between an action in a published proposal and an action in a draft proposal
2019-02-02 17:45:55 +01:00
Alessandro Cuoghi
5c6abce8ee Fixed css order and depth
- Reordered the properties of the css to pass houndci-bot verification
2019-02-02 17:33:55 +01:00
Alessandro Cuoghi
36abba15e6 Dashboard proposals stats V.2
- Found new solution to show dashboard proposals stats
- Added new class for behaviour change in the medium version
- Moved the progress bar to the bottom
- Moved below by adding counter-label class to the text support
- Added class to support text to push under the counter
2019-02-02 17:33:55 +01:00
Alessandro Cuoghi
e0fa82a533 Change layout dashboard proposals stats
Created new layout to avoid text jump support
2019-02-02 17:33:55 +01:00
taitus
7d910ed502 Fix wrong iteration.
Explained on Notes from PR
2019-02-02 17:19:46 +01:00
taitus
ead765a9c1 The value of cweek did not manage well the last week of the year
grouping_key_for method when params[:group] == "week" always returned "#{date.cweek}/#{date.year}" but that not always is true.
When a date belongs to the first_week/last_week of the year we have exceptions for example "31/12/2018".  His cweek is equal to "1", old code returned "1/2018" value but correct result would be "1/2019".
2019-02-02 17:18:02 +01:00
taitus
a4673c8b3e Add shared nested_documentable specs to admin dashboard actions specs.
Not render Documents count on dashboard actions views.
Add skips on nested_documentable when factory_name is equal to dashboard_actions.
2019-02-02 15:30:35 +01:00
taitus
931bf18562 Adds styles (direct-uploads) to admin dashboard actions form 2019-02-02 15:30:35 +01:00
taitus
054bbc5d7b Allow zip, png and jpeg on dashboard action. 2019-02-02 15:30:33 +01:00
taitus
aa908d8d60 Add progress tab as initial page on Dashboard. 2019-02-02 14:49:28 +01:00
taitus
959fe67bf9 Bug fixes: Wrong html.
Add form into <td>
2019-02-02 14:05:34 +01:00
taitus
b6b49c435c Add .hound.yml, .rubocop_basic.yml and update .rubocop.yml 2019-02-02 13:50:54 +01:00
taitus
573495d208 BugFixes: generate new schema according to migrations. 2019-01-08 13:20:28 +01:00
Alberto
a1decd3092 Merge pull request #2984 from consul/dashboard-master
Dashboard master
2018-10-19 13:18:47 +02:00
decabeza
546105d989 Merge branch 'master' into dashboard-master 2018-10-19 01:48:37 +02:00
Alberto
5bb9225c52 Merge pull request #2979 from consul/dashboard-clean
Dashboard clean
2018-10-18 23:26:45 +02:00
Alberto
3878946c9e Merge pull request #2823 from consul/remove-guides
Removes guide feature
2018-10-18 13:19:33 +02:00
decabeza
4db54092e6 Removes unrelated dashboard changes 2018-10-18 01:26:07 +02:00
Raimond Garcia
e2e9d8ed60 Merge pull request #2973 from consul/i18n_defensive_spec
[Backport] Fix pluralization spec when using different default locale
2018-10-17 20:26:26 +02:00
Javier Martín
e117218d68 Merge pull request #2977 from consul/backport-reenable_ckeditor_images
Bring back CKEditor images button
2018-10-17 20:21:18 +02:00
Javi Martín
6f96265a0b Bring back CKEditor images button
It was accidentally deleted in commit 914bfa6.

Note the following spec passes on my machine if we add a `sleep 0.1`
call in the `:wait_readable` part of ruby's `Net::Protocol#rbuf_fill`.
Otherwise, it hangs forever after clicking the `.fileupload-file` div,
which closes its window. It might be solved when upgrading rails,
capybara, selenium or chromedriver.

scenario "Allows images in CKEditor", :js do
  visit edit_admin_site_customization_page_path(custom_page)

  within(".ckeditor") do
    within_frame(0) { expect(page).not_to have_css("img") }

    expect(page).to have_css(".cke_toolbar .cke_button__image_icon")
    find(".cke_toolbar .cke_button__image_icon").click
  end

  within_window(window_opened_by { click_link "Browse Server" }) do
    attach_file :file,
                Rails.root.join('spec/fixtures/files/clippy.jpg'),
                visible: false
    find(".fileupload-file").click
  end

  click_link "OK"

  within(".ckeditor") do
    within_frame(0) { expect(page).to have_css("img") }
  end
end
2018-10-17 19:39:37 +02:00
Javier Martín
4f831b9e1d Merge pull request #2976 from consul/backport-1603-fix_flaky_legislation_questions_spec
Fix flaky spec: Admin legislation questions Update Valid legislation question
2018-10-17 19:18:54 +02:00
Alberto
938494aef5 Merge pull request #2972 from consul/dashboard-pdf
Dashboard PDF
2018-10-17 17:19:29 +02:00
Javi Martín
893f29a27a Fix flaky legislation question spec
The test was failing sometimes because of the sequence:

within('#side_menu') do
  click_link "Collaborative Legislation"
end

click_link "All"
expect(page).to have_content 'An example legislation process'
click_link 'An example legislation process'

Right after clicking the "Collaborative Legislation" link, the link 'An
example legislation process' is already available. So sometimes Capybara
might click the links "All" and 'An example legislation process' at more
or less the same time, causing the second link not to be correctly
clicked.

Making sure the "All" link doesn't exist anymore we guarantee Capybara
will wait for the previous AJAX request to finish before clicking the
next link.

Note the test to "Create Valid legislation question" is almost identical
but it doesn't fail because it doesn't use Capybara's JavaScript driver.
2018-10-17 15:54:59 +02:00
decabeza
dbf41421ed Removes guide feature 2018-10-17 14:58:29 +02:00